aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Text/Pandoc/Writers/DokuWiki.hs6
-rw-r--r--tests/writer.dokuwiki6
2 files changed, 7 insertions, 5 deletions
diff --git a/src/Text/Pandoc/Writers/DokuWiki.hs b/src/Text/Pandoc/Writers/DokuWiki.hs
index ea56ac393..f04dab76d 100644
--- a/src/Text/Pandoc/Writers/DokuWiki.hs
+++ b/src/Text/Pandoc/Writers/DokuWiki.hs
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Copyright : Copyright (C) 2008-2014 John MacFarlane
License : GNU GPL, version 2 or above
- Maintainer : John MacFarlane <jgm@berkeley.edu>
+ Maintainer : Clare Macrae <clare.macrae@googlemail.com>
Stability : alpha
Portability : portable
@@ -126,7 +126,9 @@ blockToDokuWiki _ (RawBlock f str)
blockToDokuWiki _ HorizontalRule = return "\n----\n"
blockToDokuWiki opts (Header level _ inlines) = do
- contents <- inlineListToDokuWiki opts inlines
+ -- emphasis, links etc. not allowed in headers, apparently,
+ -- so we remove formatting:
+ contents <- inlineListToDokuWiki opts $ removeFormatting inlines
let eqs = replicate ( 7 - level ) '='
return $ eqs ++ " " ++ contents ++ " " ++ eqs ++ "\n"
diff --git a/tests/writer.dokuwiki b/tests/writer.dokuwiki
index eff4bed7b..ea27699cb 100644
--- a/tests/writer.dokuwiki
+++ b/tests/writer.dokuwiki
@@ -5,9 +5,9 @@ This is a set of tests for pandoc. Most of them are adapted from John Gruber’s
====== Headers ======
-===== Level 2 with an [[url|embedded link]] =====
+===== Level 2 with an embedded link =====
-==== Level 3 with //emphasis// ====
+==== Level 3 with emphasis ====
=== Level 4 ===
@@ -15,7 +15,7 @@ This is a set of tests for pandoc. Most of them are adapted from John Gruber’s
====== Level 1 ======
-===== Level 2 with //emphasis// =====
+===== Level 2 with emphasis =====
==== Level 3 ====