From c7814f31e155da212bd3323294db08fe1f4d8ab9 Mon Sep 17 00:00:00 2001 From: despresc <christian.j.j.despres@gmail.com> Date: Thu, 9 Apr 2020 20:08:49 -0400 Subject: Use the new builders, modify readers to preserve empty headers The Builder.simpleTable now only adds a row to the TableHead when the given header row is not null. This uncovered an inconsistency in the readers: some would unconditionally emit a header filled with empty cells, even if the header was not present. Now every reader has the conditional behaviour. Only the XWiki writer depended on the header row being always present; it now pads its head as necessary. --- src/Text/Pandoc/Lua/Marshaling/AST.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/Text/Pandoc/Lua') diff --git a/src/Text/Pandoc/Lua/Marshaling/AST.hs b/src/Text/Pandoc/Lua/Marshaling/AST.hs index f314649f0..5a56b4cb9 100644 --- a/src/Text/Pandoc/Lua/Marshaling/AST.hs +++ b/src/Text/Pandoc/Lua/Marshaling/AST.hs @@ -197,7 +197,7 @@ peekBlock idx = defineHowTo "get Block value" $ do Table nullAttr (Caption Nothing $ maybePlain capt) (zip aligns (map strictPos widths)) - (TableHead nullAttr [toRow headers]) + (TableHead nullAttr $ toHeaderRow headers) [TableBody nullAttr 0 [] (map toRow body)] (TableFoot nullAttr [])) <$> elementContent @@ -211,6 +211,7 @@ peekBlock idx = defineHowTo "get Block value" $ do maybePlain [] = [] maybePlain x = [Plain x] toRow = Row nullAttr . map (\blk -> Cell nullAttr AlignDefault 1 1 blk) + toHeaderRow l = if null l then [] else [toRow l] -- | Push an inline element to the top of the lua stack. pushInline :: Inline -> Lua () -- cgit v1.2.3