diff options
| author | claremacrae <github@cfmacrae.fastmail.co.uk> | 2013-08-18 09:15:33 +0100 |
|---|---|---|
| committer | claremacrae <github@cfmacrae.fastmail.co.uk> | 2013-08-18 09:15:33 +0100 |
| commit | 288329044a63331658079aa9db57b46fe204b6b9 (patch) | |
| tree | e1b15d02f16878ddef5a10be64430a95f44e09d9 | |
| parent | b5b622f5b821ed5624b0ce2f29d1bddd0100bd04 (diff) | |
| download | pandoc-288329044a63331658079aa9db57b46fe204b6b9.tar.gz | |
Stop plain text ** and __ becoming formatting in dokuwiki writer (#386)
| -rw-r--r-- | src/Text/Pandoc/Writers/DokuWiki.hs | 2 | ||||
| -rw-r--r-- | tests/dokuwiki-writer.dokuwiki | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Writers/DokuWiki.hs b/src/Text/Pandoc/Writers/DokuWiki.hs index 4e7e79441..ec22a5a82 100644 --- a/src/Text/Pandoc/Writers/DokuWiki.hs +++ b/src/Text/Pandoc/Writers/DokuWiki.hs @@ -87,7 +87,7 @@ pandocToDokuWiki opts (Pandoc meta blocks) = do -- | Escape special characters for MediaWiki. escapeString :: String -> String -escapeString str = substitute "//" "%%//%%" str +escapeString str = substitute "__" "%%__%%" ( substitute "**" "%%**%%" ( substitute "//" "%%//%%" str ) ) -- | Convert Pandoc block element to DokuWiki. blockToDokuWiki :: WriterOptions -- ^ Options diff --git a/tests/dokuwiki-writer.dokuwiki b/tests/dokuwiki-writer.dokuwiki index 2e5d2fc1c..6ddacc480 100644 --- a/tests/dokuwiki-writer.dokuwiki +++ b/tests/dokuwiki-writer.dokuwiki @@ -1,3 +1,3 @@ -hello %%//%% world ** from __ me +hello %%//%% world %%**%% from %%__%% me ''%%hello // world ** from __ me%%'' |