summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClare Macrae <github@cfmacrae.fastmail.co.uk>2014-07-02 22:40:34 +0100
committerClare Macrae <github@cfmacrae.fastmail.co.uk>2014-07-02 22:40:34 +0100
commit0c6f06b8a493bf9bc578a0b882939bac130e16f0 (patch)
tree9807b396998e27ae9bce4760b3b57eee5356cc7b
parent7647d87657b324b268e7d1bf1b6fe9056312d55e (diff)
DokuWiki writer: Span no longer swallows text
-rw-r--r--src/Text/Pandoc/Writers/DokuWiki.hs8
-rw-r--r--tests/dokuwiki.inline_formatting.dokuwiki2
2 files changed, 3 insertions, 7 deletions
diff --git a/src/Text/Pandoc/Writers/DokuWiki.hs b/src/Text/Pandoc/Writers/DokuWiki.hs
index 76a0463eb..ea56ac393 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>
-}
{-
- [ ] Correct handling of Span
[ ] Implement nested blockquotes (currently only ever does one level)
[ ] Implement alignment of text in tables
[ ] Implement comments
@@ -348,12 +347,9 @@ inlineListToDokuWiki opts lst = mapM (inlineToDokuWiki opts) lst >>= return . co
-- | Convert Pandoc inline element to DokuWiki.
inlineToDokuWiki :: WriterOptions -> Inline -> State WriterState String
-inlineToDokuWiki _opts (Span _attrs _ils) = do
- return ""
- {-
+inlineToDokuWiki opts (Span _attrs ils) = do
contents <- inlineListToDokuWiki opts ils
- return $ render Nothing (tagWithAttrs "span" attrs) ++ contents ++ "</span>"
- -}
+ return contents
inlineToDokuWiki opts (Emph lst) = do
contents <- inlineListToDokuWiki opts lst
diff --git a/tests/dokuwiki.inline_formatting.dokuwiki b/tests/dokuwiki.inline_formatting.dokuwiki
index 2faf49eec..e02596e6c 100644
--- a/tests/dokuwiki.inline_formatting.dokuwiki
+++ b/tests/dokuwiki.inline_formatting.dokuwiki
@@ -2,7 +2,7 @@ Regular text //italics// **bold //bold italics//**.
This is Small Caps, and this is <del>strikethrough</del>.
-Some people use .
+Some people use single underlines for //emphasis//.
Above the line is <sup>superscript</sup> and below the line is <sub>subscript</sub>.