diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2018-01-02 11:34:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-02 11:34:30 -0700 |
| commit | 7c7f3a89d1e559b659ff75bf44a23bdbca4562e5 (patch) | |
| tree | 0d9c417385396ba76123bb50e28ef2e8612302c3 /src | |
| parent | 06a672dd4fbb3fc4c1e49b4a3a63e795c3e2e14f (diff) | |
| parent | 053a1dcd102c5198267734ce140fff3aa9c08bac (diff) | |
| download | pandoc-7c7f3a89d1e559b659ff75bf44a23bdbca4562e5.tar.gz | |
Merge pull request #4219 from stalmon/master
fixes for docx writer
Diffstat (limited to 'src')
| -rw-r--r-- | src/Text/Pandoc/Writers/Docx.hs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs index 3959585c6..6343b314e 100644 --- a/src/Text/Pandoc/Writers/Docx.hs +++ b/src/Text/Pandoc/Writers/Docx.hs @@ -763,9 +763,7 @@ makeTOC _ = return [] -- OpenXML elements (the main document and footnotes). writeOpenXML :: (PandocMonad m) => WriterOptions -> Pandoc -> WS m ([Element], [Element],[Element]) writeOpenXML opts (Pandoc meta blocks) = do - let tit = docTitle meta ++ case lookupMeta "subtitle" meta of - Just (MetaBlocks [Plain xs]) -> LineBreak : xs - _ -> [] + let tit = docTitle meta let auths = docAuthors meta let dat = docDate meta let abstract' = case lookupMeta "abstract" meta of @@ -983,7 +981,7 @@ blockToOpenXML' opts (Table caption aligns widths headers rows) = do ( mknode "w:tblPr" [] ( mknode "w:tblStyle" [("w:val","Table")] () : mknode "w:tblW" [("w:type", "pct"), ("w:w", show rowwidth)] () : - mknode "w:tblLook" [("w:firstRow","1") | hasHeader ] () : + mknode "w:tblLook" [("w:firstRow",if hasHeader then "1" else "0") ] () : [ mknode "w:tblCaption" [("w:val", captionStr)] () | not (null caption) ] ) : mknode "w:tblGrid" [] |