2610de0 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Docx writer: include abstract with Abstract style.

2610de0John MacFarlane12 years ago

README+2−2

compare with master

unifiedsplit

@@ -541,8 +541,8 @@ Options affecting specific writers

541 for a file `reference.docx` in the user data directory (see

542 `--data-dir`). If this is not found either, sensible defaults will be

543 used. The following styles are used by pandoc: [paragraph]

544− Normal, Compact, Title, Authors, Date, Heading 1, Heading 2, Heading 3,

544+ Normal, Compact, Title, Authors, Date, Abstract, Heading 1, Heading 2,

545− Heading 4, Heading 5, Block Quote, Definition Term, Definition,

545+ Heading 3, Heading 4, Heading 5, Block Quote, Definition Term, Definition,

546 Body Text, Table Caption, Image Caption; [character] Default

547 Paragraph Font, Body Text Char, Verbatim Char, Footnote Ref,

548 Link.

data/reference.docx

Binary file not shown.

src/Text/Pandoc/Writers/Docx.hs+8−1

@@ -481,17 +481,24 @@ writeOpenXML opts (Pandoc meta blocks) = do

481 _ -> []

482 let auths = docAuthors meta

483 let dat = docDate meta

484+ let abstract' = case lookupMeta "abstract" meta of

485+ Just (MetaBlocks bs) -> bs

486+ Just (MetaInlines ils) -> [Plain ils]

487+ Nothing -> []

484 title <- withParaProp (pStyle "Title") $ blocksToOpenXML opts [Para tit | not (null tit)]

488 title <- withParaProp (pStyle "Title") $ blocksToOpenXML opts [Para tit | not (null tit)]

485 authors <- withParaProp (pStyle "Authors") $ blocksToOpenXML opts

489 authors <- withParaProp (pStyle "Authors") $ blocksToOpenXML opts

486 [Para (intercalate [LineBreak] auths) | not (null auths)]

490 [Para (intercalate [LineBreak] auths) | not (null auths)]

487 date <- withParaProp (pStyle "Date") $ blocksToOpenXML opts [Para dat | not (null dat)]

491 date <- withParaProp (pStyle "Date") $ blocksToOpenXML opts [Para dat | not (null dat)]

492+ abstract <- if null abstract'

493+ then return []

494+ else withParaProp (pStyle "Abstract") $ blocksToOpenXML opts abstract'

488 let convertSpace (Str x : Space : Str y : xs) = Str (x ++ " " ++ y) : xs

495 let convertSpace (Str x : Space : Str y : xs) = Str (x ++ " " ++ y) : xs

489 convertSpace (Str x : Str y : xs) = Str (x ++ y) : xs

496 convertSpace (Str x : Str y : xs) = Str (x ++ y) : xs

490 convertSpace xs = xs

497 convertSpace xs = xs

491 let blocks' = bottomUp convertSpace $ blocks

498 let blocks' = bottomUp convertSpace $ blocks

492 doc' <- blocksToOpenXML opts blocks'

499 doc' <- blocksToOpenXML opts blocks'

493 notes' <- reverse `fmap` gets stFootnotes

500 notes' <- reverse `fmap` gets stFootnotes

494− let meta' = title ++ authors ++ date

501+ let meta' = title ++ authors ++ date ++ abstract

495 return (meta' ++ doc', notes')

502 return (meta' ++ doc', notes')

496

503

497-- | Convert a list of Pandoc blocks to OpenXML.

504-- | Convert a list of Pandoc blocks to OpenXML.