diff options
| -rw-r--r-- | src/Text/Pandoc/Writers/MediaWiki.hs | 6 | ||||
| -rw-r--r-- | tests/tables.mediawiki | 216 |
2 files changed, 113 insertions, 109 deletions
diff --git a/src/Text/Pandoc/Writers/MediaWiki.hs b/src/Text/Pandoc/Writers/MediaWiki.hs index d14865612..0da8bc98c 100644 --- a/src/Text/Pandoc/Writers/MediaWiki.hs +++ b/src/Text/Pandoc/Writers/MediaWiki.hs @@ -306,7 +306,11 @@ tableCellToMediaWiki headless rownum (alignment, width, bs) = do let attr = if null attrs then "" else unwords attrs ++ "|" - return $ marker ++ attr ++ trimr contents + let sep = case bs of + [Plain _] -> " " + [Para _] -> " " + _ -> "\n" + return $ marker ++ attr ++ sep ++ trimr contents alignmentToString :: Alignment -> String alignmentToString alignment = case alignment of diff --git a/tests/tables.mediawiki b/tests/tables.mediawiki index efde76559..614c3eea1 100644 --- a/tests/tables.mediawiki +++ b/tests/tables.mediawiki @@ -2,145 +2,145 @@ Simple table with caption: {| |+ Demonstration of simple table syntax. -!align="right"|Right -!Left -!align="center"|Center -!Default -|- -|align="right"|12 -|12 -|align="center"|12 -|12 -|- -|align="right"|123 -|123 -|align="center"|123 -|123 -|- -|align="right"|1 -|1 -|align="center"|1 -|1 +!align="right"| Right +! Left +!align="center"| Center +! Default +|- +|align="right"| 12 +| 12 +|align="center"| 12 +| 12 +|- +|align="right"| 123 +| 123 +|align="center"| 123 +| 123 +|- +|align="right"| 1 +| 1 +|align="center"| 1 +| 1 |} Simple table without caption: {| -!align="right"|Right -!Left -!align="center"|Center -!Default -|- -|align="right"|12 -|12 -|align="center"|12 -|12 -|- -|align="right"|123 -|123 -|align="center"|123 -|123 -|- -|align="right"|1 -|1 -|align="center"|1 -|1 +!align="right"| Right +! Left +!align="center"| Center +! Default +|- +|align="right"| 12 +| 12 +|align="center"| 12 +| 12 +|- +|align="right"| 123 +| 123 +|align="center"| 123 +| 123 +|- +|align="right"| 1 +| 1 +|align="center"| 1 +| 1 |} Simple table indented two spaces: {| |+ Demonstration of simple table syntax. -!align="right"|Right -!Left -!align="center"|Center -!Default -|- -|align="right"|12 -|12 -|align="center"|12 -|12 -|- -|align="right"|123 -|123 -|align="center"|123 -|123 -|- -|align="right"|1 -|1 -|align="center"|1 -|1 +!align="right"| Right +! Left +!align="center"| Center +! Default +|- +|align="right"| 12 +| 12 +|align="center"| 12 +| 12 +|- +|align="right"| 123 +| 123 +|align="center"| 123 +| 123 +|- +|align="right"| 1 +| 1 +|align="center"| 1 +| 1 |} Multiline table with caption: {| |+ Here's the caption. It may span multiple lines. -!align="center" width="15%"|Centered Header -!width="13%"|Left Aligned -!align="right" width="16%"|Right Aligned -!width="33%"|Default aligned -|- -|align="center"|First -|row -|align="right"|12.0 -|Example of a row that spans multiple lines. -|- -|align="center"|Second -|row -|align="right"|5.0 -|Here's another one. Note the blank line between rows. +!align="center" width="15%"| Centered Header +!width="13%"| Left Aligned +!align="right" width="16%"| Right Aligned +!width="33%"| Default aligned +|- +|align="center"| First +| row +|align="right"| 12.0 +| Example of a row that spans multiple lines. +|- +|align="center"| Second +| row +|align="right"| 5.0 +| Here's another one. Note the blank line between rows. |} Multiline table without caption: {| -!align="center" width="15%"|Centered Header -!width="13%"|Left Aligned -!align="right" width="16%"|Right Aligned -!width="33%"|Default aligned -|- -|align="center"|First -|row -|align="right"|12.0 -|Example of a row that spans multiple lines. -|- -|align="center"|Second -|row -|align="right"|5.0 -|Here's another one. Note the blank line between rows. +!align="center" width="15%"| Centered Header +!width="13%"| Left Aligned +!align="right" width="16%"| Right Aligned +!width="33%"| Default aligned +|- +|align="center"| First +| row +|align="right"| 12.0 +| Example of a row that spans multiple lines. +|- +|align="center"| Second +| row +|align="right"| 5.0 +| Here's another one. Note the blank line between rows. |} Table without column headers: {| -|align="right"|12 -|12 -|align="center"|12 -|align="right"|12 -|- -|align="right"|123 -|123 -|align="center"|123 -|align="right"|123 -|- -|align="right"|1 -|1 -|align="center"|1 -|align="right"|1 +|align="right"| 12 +| 12 +|align="center"| 12 +|align="right"| 12 +|- +|align="right"| 123 +| 123 +|align="center"| 123 +|align="right"| 123 +|- +|align="right"| 1 +| 1 +|align="center"| 1 +|align="right"| 1 |} Multiline table without column headers: {| -|align="center" width="15%"|First -|width="13%"|row -|align="right" width="16%"|12.0 -|width="33%"|Example of a row that spans multiple lines. -|- -|align="center"|Second -|row -|align="right"|5.0 -|Here's another one. Note the blank line between rows. +|align="center" width="15%"| First +|width="13%"| row +|align="right" width="16%"| 12.0 +|width="33%"| Example of a row that spans multiple lines. +|- +|align="center"| Second +| row +|align="right"| 5.0 +| Here's another one. Note the blank line between rows. |} |