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

Writers.Shared: Improve toLegacyTable.

Browse source 
Closes #7683.
(PR #7684)
This commit is contained in:
Christian Despres 2021-11-11 23:55:37 -05:00 • committed by GitHub
parent ebf7f782d3
commit abdfefebdf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -508,7 +508,7 @@ toLegacyTable (Caption _ cbody) specs thead tbodies tfoot
= let (h, w, cBody) = getComponents c
cRowPieces = cBody : replicate (w - 1) mempty
cPendingPieces = replicate w $ replicate (h - 1) mempty
pendingPieces' = dropWhile null pendingPieces
pendingPieces' = drop w pendingPieces
(pendingPieces'', rowPieces) = placeCutCells pendingPieces' cells'
in (cPendingPieces <> pendingPieces'', cRowPieces <> rowPieces)
| otherwise = ([], [])

16
test/Tests/Shared.hs
View file

@ -56,6 +56,7 @@ testLegacyTable :: [TestTree]
testLegacyTable =
[ testCase "decomposes a table with head" $ gen1 @?= expect1
, testCase "decomposes a table without head" $ gen2 @?= expect2
, testCase "decomposes the table from issue 7683" $ gen3 @?= expect3
]
where
pln = toList . plain . str
@ -110,3 +111,18 @@ testLegacyTable =
,[pln "j", mempty, mempty]]
)
gen2 = toLegacyTable emptyCaption spec1 (th []) [body1] (tf footRows1)
spec3 = replicate 4 (AlignDefault, ColWidthDefault)
body3 = tb 0
[]
[[cl "a" 2 1, cl "b" 1 2, cl "c" 2 1]
,[cl "d" 1 1, cl "e" 1 1]
]
expect3 = ( []
, replicate 4 AlignDefault
, replicate 4 0
, []
, [[pln "a", pln "b", mempty, pln "c"]
,[mempty, pln "d", pln "e", mempty]]
)
gen3 = toLegacyTable emptyCaption spec3 (th []) [body3] (tf [])