git.iko.soy/typeable/pandoc
on master help sign in
Merge pull request #1794 from mpickering/docxfix

Fix for #1641 (docx table captions above tables)

commitdd9cb2c872188a2eabe20b4afdf2865969bcff70 authorJohn MacFarlane <jgm@berkeley.edu> dateMon 8 Dec 2014, 15:50 (12 years ago) parent4458fedf7b265e
1 file changed+3−2
src/Text/Pandoc/Writers/Docx.hs+3−2
src/Text/Pandoc/Writers/Docx.hs+3−2
@@ -715,7 +715,8 @@ blockToOpenXML opts (Table caption aligns widths headers rows) = do
715715 let mkgridcol w = mknode "w:gridCol"
716716 [("w:w", show (floor (textwidth * w) :: Integer))] ()
717717 return $
718− mknode "w:tbl" []
718+ caption' ++
719+ [mknode "w:tbl" []
719720 ( mknode "w:tblPr" []
720721 ( mknode "w:tblStyle" [("w:val","TableNormal")] () :
721722 mknode "w:tblW" [("w:type", "pct"), ("w:w", show rowwidth)] () :
@@ -727,7 +728,7 @@ blockToOpenXML opts (Table caption aligns widths headers rows) = do
727728 else map mkgridcol widths)
728729 : [ mkrow True headers' | not (all null headers) ] ++
729730 map (mkrow False) rows'
730− ) : caption'
731+ )]
731732blockToOpenXML opts (BulletList lst) = do
732733 let marker = BulletMarker
733734 addList marker