git.iko.soy/typeable/pandoc
on master help sign in
Muse writer: simplify "simpleTable"
commitd27384c10962c30c2a9d5cf7bd93fb7e48ff57a4 authorAlexander Krotov <ilabdsf@gmail.com> dateTue 6 Nov 2018, 14:02 (8 years ago) parent6fd3bcc
1 file changed+4−7
src/Text/Pandoc/Writers/Muse.hs+4−7
src/Text/Pandoc/Writers/Muse.hs+4−7
@@ -174,22 +174,19 @@ simpleTable caption headers rows = do
174174 caption' <- inlineListToMuse caption
175175 headers' <- mapM blockListToMuse headers
176176 rows' <- mapM (mapM blockListToMuse) rows
177− let noHeaders = all null headers
178− let numChars = maximum . map offset
179− let widthsInChars =
180− map numChars $ transpose (headers' : rows')
177+ let widthsInChars = maximum . map offset <$> transpose (headers' : rows')
181178 let hpipeBlocks sep blocks = hcat $ intersperse sep' blocks
182− where h = maximum (1 : map height blocks)
183− sep' = lblock (length sep) $ vcat (replicate h (text sep))
179+ where sep' = lblock (length sep) $ text sep
184180 let makeRow sep = (" " <>) . hpipeBlocks sep . zipWith lblock widthsInChars
185181 let head' = makeRow " || " headers'
186− let rowSeparator = if noHeaders then " | " else " | "
187182 rows'' <- mapM (\row -> makeRow rowSeparator <$> mapM blockListToMuse row) rows
188183 let body = vcat rows''
189184 return $ (if noHeaders then empty else head')
190185 $$ body
191186 $$ (if null caption then empty else " |+ " <> caption' <> " +|")
192187 $$ blankline
188+ where noHeaders = all null headers
189+ rowSeparator = if noHeaders then " | " else " | "
193190
194191-- | Convert list of Pandoc block elements to Muse.
195192blockListToMuse :: PandocMonad m