aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2007-07-09 01:24:49 +0000
committerfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2007-07-09 01:24:49 +0000
commit0ceb538ecdad279fef6a966feb7f5a376b6edd1f (patch)
treecb1c21c536562462c1e8aa9023950e8086566f65
parentad7bb70cce7c54e18e09f4c1e2ea8d5c37b2ce4b (diff)
downloadpandoc-0ceb538ecdad279fef6a966feb7f5a376b6edd1f.tar.gz
Markdown writer:
Fixed a small problem with lengths of dashed lines in tables. git-svn-id: https://pandoc.googlecode.com/svn/trunk@659 788f1e2b-df1e-0410-8736-df70ead52e1b
-rw-r--r--src/Text/Pandoc/Writers/Markdown.hs6
-rw-r--r--tests/tables.markdown9
2 files changed, 7 insertions, 8 deletions
diff --git a/src/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs
index a62988b20..66f0acc59 100644
--- a/src/Text/Pandoc/Writers/Markdown.hs
+++ b/src/Text/Pandoc/Writers/Markdown.hs
@@ -196,11 +196,11 @@ blockToMarkdown opts (Table caption aligns widths headers rows) = do
let tableWidth = sum widthsInChars
let maxRowHeight = maximum $ map heightOfBlock (head:rows')
let isMultilineTable = maxRowHeight > 1
- let border = if isMultilineTable
- then text $ replicate tableWidth '-'
- else empty
let underline = hsep $
map (\width -> text $ replicate width '-') widthsInChars
+ let border = if isMultilineTable
+ then text $ replicate (sum widthsInChars + (length widthsInChars - 1)) '-'
+ else empty
let spacer = if isMultilineTable
then text ""
else empty
diff --git a/tests/tables.markdown b/tests/tables.markdown
index 0251c3149..60389ea94 100644
--- a/tests/tables.markdown
+++ b/tests/tables.markdown
@@ -28,7 +28,7 @@ Simple table indented two spaces:
Multiline table with caption:
- -----------------------------------------------------------
+ --------------------------------------------------------------
Centered Left Right Default aligned
Header Aligned Aligned
----------- ---------- ------------ --------------------------
@@ -38,13 +38,13 @@ Multiline table with caption:
Second row 5.0 Here's another one. Note
the blank line between
rows.
- -----------------------------------------------------------
+ --------------------------------------------------------------
Table: Here's the caption. It may span multiple lines.
Multiline table without caption:
- -----------------------------------------------------------
+ --------------------------------------------------------------
Centered Left Right Default aligned
Header Aligned Aligned
----------- ---------- ------------ --------------------------
@@ -54,7 +54,6 @@ Multiline table without caption:
Second row 5.0 Here's another one. Note
the blank line between
rows.
- -----------------------------------------------------------
+ --------------------------------------------------------------
-