aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Text/Pandoc/Writers/DokuWiki.hs7
-rw-r--r--tests/writer.dokuwiki27
2 files changed, 11 insertions, 23 deletions
diff --git a/src/Text/Pandoc/Writers/DokuWiki.hs b/src/Text/Pandoc/Writers/DokuWiki.hs
index ad68425ff..31057f09e 100644
--- a/src/Text/Pandoc/Writers/DokuWiki.hs
+++ b/src/Text/Pandoc/Writers/DokuWiki.hs
@@ -34,7 +34,6 @@ DokuWiki: <https://www.dokuwiki.org/dokuwiki>
[ ] Correct handling of Span
[ ] Don't generate <blockquote>...
[ ] Don't generate lists using <ol> and <ul>
- [ ] Don't generate <div>
[ ] Implement alignment of text in tables
[ ] Implement comments
[ ] Work through the Dokuwiki spec, and check I've not missed anything out
@@ -47,7 +46,6 @@ import Text.Pandoc.Definition
import Text.Pandoc.Options
import Text.Pandoc.Shared
import Text.Pandoc.Writers.Shared
-import Text.Pandoc.Pretty (render)
import Text.Pandoc.Templates (renderTemplate')
import Data.List ( intersect, intercalate )
import Network.URI ( isURI )
@@ -97,10 +95,9 @@ blockToDokuWiki :: WriterOptions -- ^ Options
blockToDokuWiki _ Null = return ""
-blockToDokuWiki opts (Div attrs bs) = do
+blockToDokuWiki opts (Div _attrs bs) = do
contents <- blockListToDokuWiki opts bs
- return $ render Nothing (tagWithAttrs "div" attrs) ++ "\n" ++
- contents ++ "\n" ++ "</div>"
+ return $ contents ++ "\n"
blockToDokuWiki opts (Plain inlines) =
inlineListToDokuWiki opts inlines
diff --git a/tests/writer.dokuwiki b/tests/writer.dokuwiki
index c18e95128..3e47ee7ee 100644
--- a/tests/writer.dokuwiki
+++ b/tests/writer.dokuwiki
@@ -274,21 +274,16 @@ Blank line after term, indented marker, alternate markers:
Simple block on one line:
-<div>
foo
-</div>
+
And nested without indentation:
-<div>
-<div>
-<div>
foo
-</div>
-</div>
-<div>
+
+
bar
-</div>
-</div>
+
+
Interpreted markdown in a table:
<html>
@@ -309,9 +304,8 @@ And this is **strong**
</html>
Here’s a simple block:
-<div>
foo
-</div>
+
This should be a code block, though:
<code><div>
@@ -322,13 +316,10 @@ As should this:
<code><div>foo</div></code>
Now, nested:
-<div>
-<div>
-<div>
foo
-</div>
-</div>
-</div>
+
+
+
This should just be an HTML comment:
<html>