47cc5ad · typeable/pandoc

git.iko.soy/typeable/pandoc

Restore no wrapping of XML in Docx, ODT.

It's possible that wrapping causes problems; safer to turn it off.

commit47cc5ad6e0269ca6aa8b8b6dd7d4415967f8a488 authorJohn MacFarlane <jgm@berkeley.edu> dateSat 12 Dec 2015, 00:28 (11 years ago) parent28a2f4c

2 files changed+2−2

unifiedsplit

src/Text/Pandoc/Writers/Docx.hs+1−1

@@ -245,7 +245,7 @@ writeDocx opts doc@(Pandoc meta _) = do

245245 let tocTitle = fromMaybe (stTocTitle defaultWriterState) $

246246 metaValueToInlines <$> lookupMeta "toc-title" meta

247247

248− ((contents, footnotes), st) <- runStateT (writeOpenXML opts{writerWrapText = WrapAuto} doc')

248+ ((contents, footnotes), st) <- runStateT (writeOpenXML opts{writerWrapText = WrapNone} doc')

249249 defaultWriterState{ stChangesAuthor = fromMaybe "unknown" username

250250 , stChangesDate = formatTime defaultTimeLocale "%FT%XZ" utctime

251251 , stPrintWidth = (maybe 420 (\x -> quot x 20) pgContentWidth)

src/Text/Pandoc/Writers/ODT.hs+1−1

@@ -67,7 +67,7 @@ writeODT opts doc@(Pandoc meta _) = do

6767 -- handle formulas and pictures

6868 picEntriesRef <- newIORef ([] :: [Entry])

6969 doc' <- walkM (transformPicMath opts picEntriesRef) $ walk fixDisplayMath doc

70− let newContents = writeOpenDocument opts{writerWrapText = WrapAuto} doc'

70+ let newContents = writeOpenDocument opts{writerWrapText = WrapNone} doc'

7171 epochtime <- floor `fmap` getPOSIXTime

7272 let contentEntry = toEntry "content.xml" epochtime

7373 $ fromStringLazy newContents