diff options
| author | claremacrae <github@cfmacrae.fastmail.co.uk> | 2013-08-17 12:34:05 +0100 |
|---|---|---|
| committer | claremacrae <github@cfmacrae.fastmail.co.uk> | 2013-08-17 12:34:05 +0100 |
| commit | 0961d499121e20473dfc02cfd1d7282f89436700 (patch) | |
| tree | 4e283c08b34b43acc0c0b05d472773fb887b53f4 | |
| parent | 4c48433a2aaae080acbd74450bd5f70b714475be (diff) | |
| download | pandoc-0961d499121e20473dfc02cfd1d7282f89436700.tar.gz | |
Fixed inlined code in dokuwiki writer (#386)
| -rw-r--r-- | src/Text/Pandoc/Writers/DokuWiki.hs | 7 | ||||
| -rw-r--r-- | tests/writer.dokuwiki | 12 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/Text/Pandoc/Writers/DokuWiki.hs b/src/Text/Pandoc/Writers/DokuWiki.hs index b9eb444b3..3f4efb1b3 100644 --- a/src/Text/Pandoc/Writers/DokuWiki.hs +++ b/src/Text/Pandoc/Writers/DokuWiki.hs @@ -48,7 +48,6 @@ import Text.Pandoc.Options import Text.Pandoc.Shared import Text.Pandoc.Writers.Shared import Text.Pandoc.Templates (renderTemplate') -import Text.Pandoc.XML ( escapeStringForXML ) -- TODO Remove this line import Data.List ( intersect, intercalate ) import Network.URI ( isURI ) import Control.Monad.State @@ -86,10 +85,6 @@ pandocToDokuWiki opts (Pandoc meta blocks) = do then return $ renderTemplate' (writerTemplate opts) context else return main --- | Escape special characters for DokuWiki. -escapeString :: String -> String -- TODO Remove this -escapeString = escapeStringForXML - -- | Convert Pandoc block element to DokuWiki. blockToDokuWiki :: WriterOptions -- ^ Options -> Block -- ^ Block element @@ -412,7 +407,7 @@ inlineToDokuWiki opts (Quoted DoubleQuote lst) = do inlineToDokuWiki opts (Cite _ lst) = inlineListToDokuWiki opts lst inlineToDokuWiki _ (Code _ str) = - return $ "<code>" ++ (escapeString str) ++ "</code>" + return $ "''" ++ str++ "''" inlineToDokuWiki _ (Str str) = return $ str diff --git a/tests/writer.dokuwiki b/tests/writer.dokuwiki index 489726a76..8aeb52bd6 100644 --- a/tests/writer.dokuwiki +++ b/tests/writer.dokuwiki @@ -433,7 +433,7 @@ So is **//this//** word. So is **//this//** word. -This is code: <code>></code>, <code>$</code>, <code>\</code>, <code>\$</code>, <code><html></code>. +This is code: ''>'', ''$'', ''\'', ''\$'', ''<html>''. <del>This is //strikeout//.</del> @@ -456,7 +456,7 @@ These should not be superscripts or subscripts, because of the unescaped spaces: ‘He said, “I want to go.”’ Were you alive in the 70’s? -Here is some quoted ‘<code>code</code>’ and a “[[http://example.com/?foo=1&bar=2|quoted link]]”. +Here is some quoted ‘''code''’ and a “[[http://example.com/?foo=1&bar=2|quoted link]]”. Some dashes: one—two — three—four — five. @@ -480,10 +480,10 @@ Ellipses…and…and…. These shouldn’t be math: - * To get the famous equation, write <code>$e = mc^2$</code>. + * To get the famous equation, write ''$e = mc^2$''. * $22,000 is a //lot// of money. So is $34,000. (It worked if “lot” is emphasized.) * Shoes ($20) and socks ($5). - * Escaped <code>$</code>: $73 //this should be emphasized// 23$. + * Escaped ''$'': $73 //this should be emphasized// 23$. Here’s a LaTeX table: @@ -615,7 +615,7 @@ An e-mail address: [[mailto:nobody@nowhere.net|nobody@nowhere.net]] <blockquote>Blockquoted: http://example.com/ </blockquote> -Auto-links should not occur here: <code><http://example.com/></code> +Auto-links should not occur here: ''<http://example.com/>'' <code>or here: <http://example.com/></code> @@ -641,7 +641,7 @@ Subsequent blocks are indented to show that they belong to the footnote (as with <code> { <code> }</code> If you want, you can indent every line, but you can also be lazy and just indent the first line of each block. -)) This should //not// be a footnote reference, because it contains a space.[^my note] Here is an inline note.((This is //easier// to type. Inline notes may contain [[http://google.com|links]] and <code>]</code> verbatim characters, as well as [bracketed text]. +)) This should //not// be a footnote reference, because it contains a space.[^my note] Here is an inline note.((This is //easier// to type. Inline notes may contain [[http://google.com|links]] and '']'' verbatim characters, as well as [bracketed text]. )) <blockquote>Notes can go in quotes.((In quote. |