git.iko.soy/typeable/pandoc
on master help sign in
Merge pull request #1794 from mpickering/docxfix
dd9cb2cJohn MacFarlane
src/Text/Pandoc/Writers/Docx.hs+3−2
compare with master
unifiedsplit
@@ -715,7 +715,8 @@ blockToOpenXML opts (Table caption aligns widths headers rows) = do
715 let mkgridcol w = mknode "w:gridCol"
715 let mkgridcol w = mknode "w:gridCol"
716 [("w:w", show (floor (textwidth * w) :: Integer))] ()
716 [("w:w", show (floor (textwidth * w) :: Integer))] ()
717 return $
717 return $
718+ caption' ++
718− mknode "w:tbl" []
719+ [mknode "w:tbl" []
719 ( mknode "w:tblPr" []
720 ( mknode "w:tblPr" []
720 ( mknode "w:tblStyle" [("w:val","TableNormal")] () :
721 ( mknode "w:tblStyle" [("w:val","TableNormal")] () :
721 mknode "w:tblW" [("w:type", "pct"), ("w:w", show rowwidth)] () :
722 mknode "w:tblW" [("w:type", "pct"), ("w:w", show rowwidth)] () :
@@ -727,7 +728,7 @@ blockToOpenXML opts (Table caption aligns widths headers rows) = do
727 else map mkgridcol widths)
728 else map mkgridcol widths)
728 : [ mkrow True headers' | not (all null headers) ] ++
729 : [ mkrow True headers' | not (all null headers) ] ++
729 map (mkrow False) rows'
730 map (mkrow False) rows'
730− ) : caption'
731+ )]
731blockToOpenXML opts (BulletList lst) = do
732blockToOpenXML opts (BulletList lst) = do
732 let marker = BulletMarker
733 let marker = BulletMarker
733 addList marker
734 addList marker