diff options
| author | Mauro Bieg <mb21@users.noreply.github.com> | 2018-03-12 02:20:36 +0100 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2018-03-11 18:20:36 -0700 |
| commit | a0da1e2723a08b4afc12a6e358d3abfdffeb6944 (patch) | |
| tree | a559135478976d404047314f6a53633927ef8b5e | |
| parent | 2f979e068497f28c4e8ff29549df0de6fc265420 (diff) | |
| download | pandoc-a0da1e2723a08b4afc12a6e358d3abfdffeb6944.tar.gz | |
Dokuwiki writer: fix LineBreaks in Tables (#4444)
fixes #4313
| -rw-r--r-- | src/Text/Pandoc/Writers/DokuWiki.hs | 6 | ||||
| -rw-r--r-- | test/dokuwiki_multiblock_table.dokuwiki | 7 | ||||
| -rw-r--r-- | test/dokuwiki_multiblock_table.native | 7 |
3 files changed, 15 insertions, 5 deletions
diff --git a/src/Text/Pandoc/Writers/DokuWiki.hs b/src/Text/Pandoc/Writers/DokuWiki.hs index dda21d23d..3fd297c00 100644 --- a/src/Text/Pandoc/Writers/DokuWiki.hs +++ b/src/Text/Pandoc/Writers/DokuWiki.hs @@ -479,7 +479,11 @@ inlineToDokuWiki _ il@(RawInline f str) | f == Format "html" = return $ "<html>" ++ str ++ "</html>" | otherwise = "" <$ report (InlineNotRendered il) -inlineToDokuWiki _ LineBreak = return "\\\\\n" +inlineToDokuWiki _ LineBreak = do + backSlash <- stBackSlashLB <$> ask + return $ if backSlash + then "\n" + else "\\\\\n" inlineToDokuWiki opts SoftBreak = case writerWrapText opts of diff --git a/test/dokuwiki_multiblock_table.dokuwiki b/test/dokuwiki_multiblock_table.dokuwiki index 8b913f1f2..393ebeba0 100644 --- a/test/dokuwiki_multiblock_table.dokuwiki +++ b/test/dokuwiki_multiblock_table.dokuwiki @@ -1,4 +1,5 @@ Sample grid table. -^Fruit ^Price^Advantages ^ -|Bananas|$1.34|built-in wrapper\\ \\ potassium| -|Oranges|$2.10|* cures scurvy\\ * tasty | +^Fruit ^Price^Advantages ^ +|Bananas|$1.34|built-in wrapper\\ \\ potassium | +|Oranges|$2.10|* cures scurvy\\ * tasty | +|Apples |$1.10|Some text\\ \\ after two linebreaks| diff --git a/test/dokuwiki_multiblock_table.native b/test/dokuwiki_multiblock_table.native index 34824296d..6059efb71 100644 --- a/test/dokuwiki_multiblock_table.native +++ b/test/dokuwiki_multiblock_table.native @@ -10,4 +10,9 @@ ,[Para [Str "$2.10"]] ,[BulletList [[Plain [Str "cures",Space,Str "scurvy"]] - ,[Plain [Str "tasty"]]]]]]] + ,[Plain [Str "tasty"]]]]] + ,[[Para [Str "Apples"]] + ,[Para [Str "$1.10"]] + ,[Para [Str "Some",Space,Str "text",LineBreak,LineBreak,Str "after",Space,Str "two",Space,Str "linebreaks"] + ]] + ]] |