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

RST reader: fix treatment of headerless simple tables.

Browse source 
We were producing a header with blank cells rather than no
header.  Closes .
This commit is contained in:
John MacFarlane 2022-02-11 09:42:24 -08:00
parent e8c1c6adb1
commit 899feec4d3
3 changed files with 3 additions and 20 deletions

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

@ -1304,7 +1304,7 @@ simpleTableHeader headless = try $ do
let indices = scanl (+) 0 lines' let indices = scanl (+) 0 lines'
let aligns = replicate (length lines') AlignDefault let aligns = replicate (length lines') AlignDefault
let rawHeads = if headless let rawHeads = if headless
then replicate (length dashes) "" then []
else simpleTableSplitLine indices rawContent else simpleTableSplitLine indices rawContent
heads <- mapM ( parseFromString' (mconcat <$> many plain) . trim) rawHeads heads <- mapM ( parseFromString' (mconcat <$> many plain) . trim) rawHeads
return (heads, aligns, indices) return (heads, aligns, indices)

10
test/rst-reader.native
View file

@ -1124,15 +1124,7 @@ Pandoc
, ( AlignDefault , ColWidthDefault ) , ( AlignDefault , ColWidthDefault )
, ( AlignDefault , ColWidthDefault ) , ( AlignDefault , ColWidthDefault )
] ]
(TableHead (TableHead ( "" , [] , [] ) [])
( "" , [] , [] )
[ Row
( "" , [] , [] )
[ Cell ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) []
, Cell ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) []
, Cell ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) []
]
])
[ TableBody [ TableBody
( "" , [] , [] ) ( "" , [] , [] )
(RowHeadColumns 0) (RowHeadColumns 0)

11
test/tables-rstsubset.native
View file

@ -755,16 +755,7 @@
, ( AlignDefault , ColWidthDefault ) , ( AlignDefault , ColWidthDefault )
, ( AlignDefault , ColWidthDefault ) , ( AlignDefault , ColWidthDefault )
] ]
(TableHead (TableHead ( "" , [] , [] ) [])
( "" , [] , [] )
[ Row
( "" , [] , [] )
[ Cell ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) []
, Cell ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) []
, Cell ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) []
, Cell ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) []
]
])
[ TableBody [ TableBody
( "" , [] , [] ) ( "" , [] , [] )
(RowHeadColumns 0) (RowHeadColumns 0)