git.iko.soy/typeable/pandoc
on master help sign in
Docx writer: Improved entryFromArchive to avoid parse.

No need to parse the XML if we're just going to render it right away!

commit326d7fa8f89f9a4b74042bf4cbb04931e26c8d8d authorJohn MacFarlane <jgm@berkeley.edu> dateMon 2 Jun 2014, 20:20 (12 years ago) parentbf915da
1 file changed+3−2
src/Text/Pandoc/Writers/Docx.hs+3−2
src/Text/Pandoc/Writers/Docx.hs+3−2
@@ -310,8 +310,9 @@ writeDocx opts doc@(Pandoc meta _) = do
310310 let relsEntry = toEntry relsPath epochtime $ renderXml rels
311311
312312 let entryFromArchive arch path =
313− (toEntry path epochtime . renderXml) `fmap`
314− parseXml arch distArchive path
313+ maybe (fail $ path ++ " corrupt or missing in reference docx")
314+ return
315+ (findEntryByPath path arch `mplus` findEntryByPath path distArchive)
315316 docPropsAppEntry <- entryFromArchive refArchive "docProps/app.xml"
316317 themeEntry <- entryFromArchive refArchive "word/theme/theme1.xml"
317318 fontTableEntry <- entryFromArchive refArchive "word/fontTable.xml"