diff options
| author | claremacrae <github@cfmacrae.fastmail.co.uk> | 2013-07-28 18:59:16 +0100 |
|---|---|---|
| committer | claremacrae <github@cfmacrae.fastmail.co.uk> | 2013-07-28 18:59:16 +0100 |
| commit | b5f86a665d272a76d768ccdc6d7c19b13e884d29 (patch) | |
| tree | e641d565e9f48f552da23ce45c4d02feea6bf059 /src/Text | |
| parent | 51b8ce49f1c98f22987463cf891c8f20e4a9da54 (diff) | |
| download | pandoc-b5f86a665d272a76d768ccdc6d7c19b13e884d29.tar.gz | |
Removed incorrect entity conversion in dokuwiki writer (#386)
Diffstat (limited to 'src/Text')
| -rw-r--r-- | src/Text/Pandoc/Writers/DokuWiki.hs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Text/Pandoc/Writers/DokuWiki.hs b/src/Text/Pandoc/Writers/DokuWiki.hs index 6946f7722..c4a99edca 100644 --- a/src/Text/Pandoc/Writers/DokuWiki.hs +++ b/src/Text/Pandoc/Writers/DokuWiki.hs @@ -31,7 +31,6 @@ DokuWiki: <https://www.dokuwiki.org/dokuwiki> -} {- - [ ] Don't convert & to & [ ] Don't generate <blockquote>... [ ] Don't generate <pre>... [ ] Implement definition lists @@ -51,7 +50,7 @@ import Text.Pandoc.Options import Text.Pandoc.Shared import Text.Pandoc.Writers.Shared import Text.Pandoc.Templates (renderTemplate') -import Text.Pandoc.XML ( escapeStringForXML ) +import Text.Pandoc.XML ( escapeStringForXML ) -- TODO Remove this line import Data.List ( intersect, intercalate ) import Network.URI ( isURI ) import Control.Monad.State @@ -89,7 +88,7 @@ pandocToDokuWiki opts (Pandoc meta blocks) = do else return main -- | Escape special characters for DokuWiki. -escapeString :: String -> String +escapeString :: String -> String -- TODO Remove this escapeString = escapeStringForXML -- | Convert Pandoc block element to DokuWiki. @@ -404,7 +403,7 @@ inlineToDokuWiki opts (Cite _ lst) = inlineListToDokuWiki opts lst inlineToDokuWiki _ (Code _ str) = return $ "<code>" ++ (escapeString str) ++ "</code>" -inlineToDokuWiki _ (Str str) = return $ escapeString str +inlineToDokuWiki _ (Str str) = return $ str inlineToDokuWiki _ (Math _ str) = return $ "<math>" ++ str ++ "</math>" -- note: str should NOT be escaped |