git.iko.soy/typeable/pandoc
on master help sign in
Docx writer: handle tables in table cells.

Although this is not documented in the spec, some versions of Word require a 'w:p' element inside every table cell. Thus, we add one when the contents of a cell do not already include one (e.g. when a table cell contains a table). Closes #4953.

commitb02c25b2cafb56f9f5bbcb0edf9f957b93b4afd0 authorJohn MacFarlane <jgm@berkeley.edu> dateSun 7 Oct 2018, 18:57 (8 years ago) parent145710c
1 file changed+7−2
compare with master
unifiedsplit
src/Text/Pandoc/Writers/Docx.hs+7−2
src/Text/Pandoc/Writers/Docx.hs+7−2
@@ -945,8 +945,13 @@ blockToOpenXML' opts (Table caption aligns widths headers rows) = do
945945 else withParaProp (pCustomStyle "TableCaption")
946946 $ blockToOpenXML opts (Para caption)
947947 let alignmentFor al = mknode "w:jc" [("w:val",alignmentToString al)] ()
948− let cellToOpenXML (al, cell) = withParaProp (alignmentFor al)
949− $ blocksToOpenXML opts cell
948+ -- Table cells require a <w:p> element, even an empty one!
949+ -- Not in the spec but in Word 2007, 2010. See #4953.
950+ let cellToOpenXML (al, cell) = do
951+ es <- withParaProp (alignmentFor al) $ blocksToOpenXML opts cell
952+ if any (\e -> qName (elName e) == "p") es
953+ then return es
954+ else return $ es ++ [mknode "w:p" [] ()]
950955 headers' <- mapM cellToOpenXML $ zip aligns headers
951956 rows' <- mapM (mapM cellToOpenXML . zip aligns) rows
952957 let borderProps = mknode "w:tcPr" []