path: root/src/Text/Pandoc/Writers/MediaWiki.hs
diff options
authorJohn MacFarlane <>2013-06-29 22:14:01 -0700
committerJohn MacFarlane <>2013-06-29 22:14:01 -0700
commita1f010de7830777b86f88743785560a04fab62fd (patch)
tree1ab1d0cb2045ec51e890c9e1a636b888334a7391 /src/Text/Pandoc/Writers/MediaWiki.hs
parent5cb0f0bbf1da61b7ce276a39055a51b6166500cc (diff)
Metadata changes: Variables now completely shadow metadata.
Previously if you set a value both in metadata and with a variable, they'd be combined into a list. Now the variable replaces the value in document metadata. If many variables with the same name are set, a list is created. Shared: metaToJSON now has an argument for a variable list.
Diffstat (limited to 'src/Text/Pandoc/Writers/MediaWiki.hs')
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Writers/MediaWiki.hs b/src/Text/Pandoc/Writers/MediaWiki.hs
index 7651c652c..3cdf81298 100644
--- a/src/Text/Pandoc/Writers/MediaWiki.hs
+++ b/src/Text/Pandoc/Writers/MediaWiki.hs
@@ -57,6 +57,7 @@ pandocToMediaWiki opts (Pandoc meta blocks) = do
metadata <- metaToJSON
(fmap trimr . blockListToMediaWiki opts)
(inlineListToMediaWiki opts)
+ (writerVariables opts)
body <- blockListToMediaWiki opts blocks
notesExist <- get >>= return . stNotes
@@ -66,8 +67,7 @@ pandocToMediaWiki opts (Pandoc meta blocks) = do
let main = body ++ notes
let context = defField "body" main
$ defField "toc" (writerTableOfContents opts)
- $ foldl (\acc (x,y) -> setField x y acc)
- metadata (writerVariables opts)
+ $ metadata
if writerStandalone opts
then return $ renderTemplate' (writerTemplate opts) context
else return main