aboutsummaryrefslogtreecommitdiff
path: root/src/Text
diff options
context:
space:
mode:
authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2007-07-09 01:36:53 +0000
committerfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2007-07-09 01:36:53 +0000
commit69072efc004f656c4da831a170e45516dd3f287c (patch)
treee3981f082c94249fbfbc48f91316e5c6e989dbab /src/Text
parent0ceb538ecdad279fef6a966feb7f5a376b6edd1f (diff)
downloadpandoc-69072efc004f656c4da831a170e45516dd3f287c.tar.gz
Text.Pandoc.Blocks:
+ Fixed a bug in hPad, which previously padded the rightmost cell. This is fixed by introducing a case for a singleton list. + Fixed Markdown writer so that the space after a table is not nested two spaces. + Adjusted Markdown table tests accordingly. git-svn-id: https://pandoc.googlecode.com/svn/trunk@660 788f1e2b-df1e-0410-8736-df70ead52e1b
Diffstat (limited to 'src/Text')
-rw-r--r--src/Text/Pandoc/Blocks.hs1
-rw-r--r--src/Text/Pandoc/Writers/Markdown.hs4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Blocks.hs b/src/Text/Pandoc/Blocks.hs
index 3e1411e04..ef0d444f8 100644
--- a/src/Text/Pandoc/Blocks.hs
+++ b/src/Text/Pandoc/Blocks.hs
@@ -97,6 +97,7 @@ hPad width line =
-- which they appear side by side.
hcatBlocks :: [TextBlock] -> TextBlock
hcatBlocks [] = TextBlock 0 0 []
+hcatBlocks [x] = x -- This is not redundant! We don't want last item hPad'd.
hcatBlocks ((TextBlock width1 height1 lns1):xs) =
let (TextBlock width2 height2 lns2) = hcatBlocks xs
height = max height1 height2
diff --git a/src/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs
index 66f0acc59..6792a1935 100644
--- a/src/Text/Pandoc/Writers/Markdown.hs
+++ b/src/Text/Pandoc/Writers/Markdown.hs
@@ -205,8 +205,8 @@ blockToMarkdown opts (Table caption aligns widths headers rows) = do
then text ""
else empty
let body = vcat $ intersperse spacer $ map blockToDoc rows'
- return $ nest 2 $ border $$ (blockToDoc head) $$ underline $$ body $$
- border $$ caption'' $$ text ""
+ return $ (nest 2 $ border $$ (blockToDoc head) $$ underline $$ body $$
+ border $$ caption'') $$ text ""
blockToMarkdown opts (BulletList items) = do
contents <- mapM (bulletListItemToMarkdown opts) items
return $ (vcat contents) <> text "\n"