aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-07-13 14:33:10 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2014-07-13 14:44:53 -0700
commit5df812f7eb9e2d26ffc26b5ba0644a8ae3016629 (patch)
tree15161aead79791c69ffa844802ff0d7eea3a1ad2 /src
parent172a18427480da79e069df55bcc5a5e6bdab99ac (diff)
parentc7431283d673829741cbfdcd5d5e548077648e5b (diff)
downloadpandoc-5df812f7eb9e2d26ffc26b5ba0644a8ae3016629.tar.gz
Merge branch 'claremacrae-dokuwiki'.
Use removeFormatting from Shared instead of the custom unfancy function.
Diffstat (limited to 'src')
-rw-r--r--src/Text/Pandoc/Writers/DokuWiki.hs6
1 files changed, 4 insertions, 2 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"