Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fixed regression in ODT writer.

Browse source 
This was due to a change in the Show instance for
Text.Pandoc.Pretty.Doc, which led 1.11 to produce corrupt ODTs.

Closes #780.
This commit is contained in:
John MacFarlane 2013-03-15 15:20:52 -07:00
parent db3d4113a2
commit a1c0210dcd
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Text/Pandoc/Writers/ODT.hs
View file

@ -78,7 +78,7 @@ writeODT opts doc@(Pandoc (Meta title _ _) _) = do
] ]
let files = [ ent | ent <- filesInArchive archive, not ("META-INF" `isPrefixOf` ent) ] let files = [ ent | ent <- filesInArchive archive, not ("META-INF" `isPrefixOf` ent) ]
let manifestEntry = toEntry "META-INF/manifest.xml" epochtime let manifestEntry = toEntry "META-INF/manifest.xml" epochtime
$ fromStringLazy $ show $ fromStringLazy $ render Nothing
$ text "<?xml version=\"1.0\" encoding=\"utf-8\"?>" $ text "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
$$ $$
( inTags True "manifest:manifest" ( inTags True "manifest:manifest"
@ -92,7 +92,7 @@ writeODT opts doc@(Pandoc (Meta title _ _) _) = do
) )
let archive' = addEntryToArchive manifestEntry archive let archive' = addEntryToArchive manifestEntry archive
let metaEntry = toEntry "meta.xml" epochtime let metaEntry = toEntry "meta.xml" epochtime
$ fromStringLazy $ show $ fromStringLazy $ render Nothing
$ text "<?xml version=\"1.0\" encoding=\"utf-8\"?>" $ text "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
$$ $$
( inTags True "office:document-meta" ( inTags True "office:document-meta"