From ce0960ba5af2a32c9f8a44642fd16e14d721202b Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 13 Jul 2014 15:24:52 -0700 Subject: DokuWiki writer: Fix raw inlines and blocks. * mediawiki > dokuwiki * ignore raw content other than html or dokuwiki. (#1398) --- src/Text/Pandoc/Writers/DokuWiki.hs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/Text/Pandoc') diff --git a/src/Text/Pandoc/Writers/DokuWiki.hs b/src/Text/Pandoc/Writers/DokuWiki.hs index f04dab76d..3511c4862 100644 --- a/src/Text/Pandoc/Writers/DokuWiki.hs +++ b/src/Text/Pandoc/Writers/DokuWiki.hs @@ -119,9 +119,9 @@ blockToDokuWiki opts (Para inlines) = do else contents ++ if null indent then "\n" else "" blockToDokuWiki _ (RawBlock f str) - | f == Format "mediawiki" = return str - | f == Format "html" = return $ "\n" ++ str ++ "" - | otherwise = return str + | f == Format "dokuwiki" = return str + | f == Format "html" = return $ "\n" ++ str ++ "" + | otherwise = return "" blockToDokuWiki _ HorizontalRule = return "\n----\n" @@ -403,9 +403,9 @@ inlineToDokuWiki _ (Math _ str) = return $ "" ++ str ++ "" -- note: str should NOT be escaped inlineToDokuWiki _ (RawInline f str) - | f == Format "mediawiki" = return str - | f == Format "html" = return str - | otherwise = return str + | f == Format "dokuwiki" = return str + | f == Format "html" = return str + | otherwise = return "" inlineToDokuWiki _ (LineBreak) = return "\\\\ " -- cgit v1.2.3