diff options
author | John MacFarlane <fiddlosopher@gmail.com> | 2013-11-07 08:46:52 -0800 |
---|---|---|
committer | John MacFarlane <fiddlosopher@gmail.com> | 2013-11-07 08:48:59 -0800 |
commit | 2efd0951d3d560a159f92df4730e2cee26978698 (patch) | |
tree | e2209e5e95566babc69261da3fd20caaa1e1db59 /src/Text/Pandoc | |
parent | 5b99112f229db1fcbe82943678f9f55c1ead8f11 (diff) | |
download | pandoc-2efd0951d3d560a159f92df4730e2cee26978698.tar.gz |
Docx writer: fixed core metadata.
- Don't create empty date nodes if no date given.
- Don't create multiple dc:creator nodes; instead separate by
semicolons.
Closes #1046.
Diffstat (limited to 'src/Text/Pandoc')
-rw-r--r-- | src/Text/Pandoc/Writers/Docx.hs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs index f1276c831..5d1647844 100644 --- a/src/Text/Pandoc/Writers/Docx.hs +++ b/src/Text/Pandoc/Writers/Docx.hs @@ -231,10 +231,11 @@ writeDocx opts doc@(Pandoc meta _) = do ,("xmlns:dcmitype","http://purl.org/dc/dcmitype/") ,("xmlns:xsi","http://www.w3.org/2001/XMLSchema-instance")] $ mknode "dc:title" [] (stringify $ docTitle meta) - : mknode "dcterms:created" [("xsi:type","dcterms:W3CDTF")] - (maybe "" id $ normalizeDate $ stringify $ docDate meta) - : mknode "dcterms:modified" [("xsi:type","dcterms:W3CDTF")] () -- put current time here - : map (mknode "dc:creator" [] . stringify) (docAuthors meta) + : mknode "dc:creator" [] (intercalate "; " (map stringify $ docAuthors meta)) + : maybe [] + (\x -> [ mknode "dcterms:created" [("xsi:type","dcterms:W3CDTF")] $ x + , mknode "dcterms:modified" [("xsi:type","dcterms:W3CDTF")] $ x + ]) (normalizeDate $ stringify $ docDate meta) let docPropsEntry = toEntry docPropsPath epochtime $ renderXml docProps let relsPath = "_rels/.rels" |