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

Make sure we use dist version of reference.docx for some things.

Browse source 
Taking some values from a user-supplied reference.docx
tends to lead to corruption.

This fixes a regression from the last release. Closes #2249.
This commit is contained in:
John MacFarlane 2015-06-28 23:25:55 -07:00
parent 5f198c019b
commit 36baded572
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/Docx.hs
View file

@ -211,10 +211,10 @@ writeDocx opts doc@(Pandoc meta _) = do
let doc' = stripInvalidChars . walk fixDisplayMath $ doc
username <- lookup "USERNAME" <$> getEnvironment
utctime <- getCurrentTime
distArchive <- getDefaultReferenceDocx datadir
distArchive <- getDefaultReferenceDocx Nothing
refArchive <- case writerReferenceDocx opts of
Just f -> liftM (toArchive . toLazy) $ B.readFile f
Nothing -> return distArchive
Nothing -> getDefaultReferenceDocx datadir
parsedDoc <- parseXml refArchive distArchive "word/document.xml"
let wname f qn = qPrefix qn == Just "w" && f (qName qn)