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

RST, Markdown writers: Fixed rendering of grid tables with blank rows.

Browse source 
Closes #2615.
This commit is contained in:
John MacFarlane 2016-01-05 14:01:45 -08:00
parent a81b0932e5
commit a796538d84
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Text/Pandoc/Writers/Markdown.hs
View file

@ -572,7 +572,7 @@ gridTable opts headless _aligns widths headers' rawRows = do
else widths else widths
let widthsInChars = map (floor . (fromIntegral (writerColumns opts) *)) widths' let widthsInChars = map (floor . (fromIntegral (writerColumns opts) *)) widths'
let hpipeBlocks blocks = hcat [beg, middle, end] let hpipeBlocks blocks = hcat [beg, middle, end]
where h = maximum (map height blocks) where h = maximum (1 : map height blocks)
sep' = lblock 3 $ vcat (map text $ replicate h " | ") sep' = lblock 3 $ vcat (map text $ replicate h " | ")
beg = lblock 2 $ vcat (map text $ replicate h "| ") beg = lblock 2 $ vcat (map text $ replicate h "| ")
end = lblock 2 $ vcat (map text $ replicate h " |") end = lblock 2 $ vcat (map text $ replicate h " |")

2
src/Text/Pandoc/Writers/RST.hs
View file

@ -267,7 +267,7 @@ blockToRST (Table caption _ widths headers rows) = do
then map ((+2) . numChars) $ transpose (headers' : rawRows) then map ((+2) . numChars) $ transpose (headers' : rawRows)
else map (floor . (fromIntegral (writerColumns opts) *)) widths else map (floor . (fromIntegral (writerColumns opts) *)) widths
let hpipeBlocks blocks = hcat [beg, middle, end] let hpipeBlocks blocks = hcat [beg, middle, end]
where h = maximum (map height blocks) where h = maximum (1 : map height blocks)
sep' = lblock 3 $ vcat (map text $ replicate h " | ") sep' = lblock 3 $ vcat (map text $ replicate h " | ")
beg = lblock 2 $ vcat (map text $ replicate h "| ") beg = lblock 2 $ vcat (map text $ replicate h "| ")
end = lblock 2 $ vcat (map text $ replicate h " |") end = lblock 2 $ vcat (map text $ replicate h " |")