diff options
| -rw-r--r-- | src/Text/Pandoc/Writers/Org.hs | 2 | ||||
| -rw-r--r-- | test/tables.org | 58 |
2 files changed, 30 insertions, 30 deletions
diff --git a/src/Text/Pandoc/Writers/Org.hs b/src/Text/Pandoc/Writers/Org.hs index e21d3f8c2..2774a98bd 100644 --- a/src/Text/Pandoc/Writers/Org.hs +++ b/src/Text/Pandoc/Writers/Org.hs @@ -195,7 +195,7 @@ blockToOrg (Table caption' _ _ headers rows) = do let numChars = maximum . map offset -- FIXME: width is not being used. let widthsInChars = - map ((+2) . numChars) $ transpose (headers' : rawRows) + map numChars $ transpose (headers' : rawRows) -- FIXME: Org doesn't allow blocks with height more than 1. let hpipeBlocks blocks = hcat [beg, middle, end] where sep' = vfill " | " diff --git a/test/tables.org b/test/tables.org index 9eaf5e706..10dfe21bd 100644 --- a/test/tables.org +++ b/test/tables.org @@ -1,51 +1,51 @@ Simple table with caption: -| Right | Left | Center | Default | -|---------+--------+----------+-----------| -| 12 | 12 | 12 | 12 | -| 123 | 123 | 123 | 123 | -| 1 | 1 | 1 | 1 | +| Right | Left | Center | Default | +|-------+------+--------+---------| +| 12 | 12 | 12 | 12 | +| 123 | 123 | 123 | 123 | +| 1 | 1 | 1 | 1 | #+CAPTION: Demonstration of simple table syntax. Simple table without caption: -| Right | Left | Center | Default | -|---------+--------+----------+-----------| -| 12 | 12 | 12 | 12 | -| 123 | 123 | 123 | 123 | -| 1 | 1 | 1 | 1 | +| Right | Left | Center | Default | +|-------+------+--------+---------| +| 12 | 12 | 12 | 12 | +| 123 | 123 | 123 | 123 | +| 1 | 1 | 1 | 1 | Simple table indented two spaces: -| Right | Left | Center | Default | -|---------+--------+----------+-----------| -| 12 | 12 | 12 | 12 | -| 123 | 123 | 123 | 123 | -| 1 | 1 | 1 | 1 | +| Right | Left | Center | Default | +|-------+------+--------+---------| +| 12 | 12 | 12 | 12 | +| 123 | 123 | 123 | 123 | +| 1 | 1 | 1 | 1 | #+CAPTION: Demonstration of simple table syntax. Multiline table with caption: -| Centered Header | Left Aligned | Right Aligned | Default aligned | -|-------------------+----------------+-----------------+---------------------------------------------------------| -| First | row | 12.0 | Example of a row that spans multiple lines. | -| Second | row | 5.0 | Here's another one. Note the blank line between rows. | +| Centered Header | Left Aligned | Right Aligned | Default aligned | +|-----------------+--------------+---------------+-------------------------------------------------------| +| First | row | 12.0 | Example of a row that spans multiple lines. | +| Second | row | 5.0 | Here's another one. Note the blank line between rows. | #+CAPTION: Here's the caption. It may span multiple lines. Multiline table without caption: -| Centered Header | Left Aligned | Right Aligned | Default aligned | -|-------------------+----------------+-----------------+---------------------------------------------------------| -| First | row | 12.0 | Example of a row that spans multiple lines. | -| Second | row | 5.0 | Here's another one. Note the blank line between rows. | +| Centered Header | Left Aligned | Right Aligned | Default aligned | +|-----------------+--------------+---------------+-------------------------------------------------------| +| First | row | 12.0 | Example of a row that spans multiple lines. | +| Second | row | 5.0 | Here's another one. Note the blank line between rows. | Table without column headers: -| 12 | 12 | 12 | 12 | -| 123 | 123 | 123 | 123 | -| 1 | 1 | 1 | 1 | - +| 12 | 12 | 12 | 12 | +| 123 | 123 | 123 | 123 | +| 1 | 1 | 1 | 1 | + Multiline table without column headers: -| First | row | 12.0 | Example of a row that spans multiple lines. | -| Second | row | 5.0 | Here's another one. Note the blank line between rows. | +| First | row | 12.0 | Example of a row that spans multiple lines. | +| Second | row | 5.0 | Here's another one. Note the blank line between rows. | |