From d27384c10962c30c2a9d5cf7bd93fb7e48ff57a4 Mon Sep 17 00:00:00 2001
From: Alexander Krotov <ilabdsf@gmail.com>
Date: Tue, 6 Nov 2018 14:02:10 +0300
Subject: [PATCH] Muse writer: simplify "simpleTable"
---
src/Text/Pandoc/Writers/Muse.hs | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/Text/Pandoc/Writers/Muse.hs b/src/Text/Pandoc/Writers/Muse.hs
index 71fa0aae6..b74016ec2 100644
--- a/src/Text/Pandoc/Writers/Muse.hs
+++ b/src/Text/Pandoc/Writers/Muse.hs
@@ -174,22 +174,19 @@ simpleTable caption headers rows = do
caption' <- inlineListToMuse caption
headers' <- mapM blockListToMuse headers
rows' <- mapM (mapM blockListToMuse) rows
- let noHeaders = all null headers
- let numChars = maximum . map offset
- let widthsInChars =
- map numChars $ transpose (headers' : rows')
+ let widthsInChars = maximum . map offset <$> transpose (headers' : rows')
let hpipeBlocks sep blocks = hcat $ intersperse sep' blocks
- where h = maximum (1 : map height blocks)
- sep' = lblock (length sep) $ vcat (replicate h (text sep))
+ where sep' = lblock (length sep) $ text sep
let makeRow sep = (" " <>) . hpipeBlocks sep . zipWith lblock widthsInChars
let head' = makeRow " || " headers'
- let rowSeparator = if noHeaders then " | " else " | "
rows'' <- mapM (\row -> makeRow rowSeparator <$> mapM blockListToMuse row) rows
let body = vcat rows''
return $ (if noHeaders then empty else head')
$$ body
$$ (if null caption then empty else " |+ " <> caption' <> " +|")
$$ blankline
+ where noHeaders = all null headers
+ rowSeparator = if noHeaders then " | " else " | "
-- | Convert list of Pandoc block elements to Muse.
blockListToMuse :: PandocMonad m