diff options
| author | John MacFarlane <fiddlosopher@gmail.com> | 2013-06-29 22:14:01 -0700 |
|---|---|---|
| committer | John MacFarlane <fiddlosopher@gmail.com> | 2013-06-29 22:14:01 -0700 |
| commit | a1f010de7830777b86f88743785560a04fab62fd (patch) | |
| tree | 1ab1d0cb2045ec51e890c9e1a636b888334a7391 /src/Text/Pandoc/Writers/ConTeXt.hs | |
| parent | 5cb0f0bbf1da61b7ce276a39055a51b6166500cc (diff) | |
| download | pandoc-a1f010de7830777b86f88743785560a04fab62fd.tar.gz | |
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/ConTeXt.hs')
| -rw-r--r-- | src/Text/Pandoc/Writers/ConTeXt.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Writers/ConTeXt.hs b/src/Text/Pandoc/Writers/ConTeXt.hs index ac158b471..82d4fccec 100644 --- a/src/Text/Pandoc/Writers/ConTeXt.hs +++ b/src/Text/Pandoc/Writers/ConTeXt.hs @@ -66,6 +66,7 @@ pandocToConTeXt options (Pandoc meta blocks) = do metadata <- metaToJSON (fmap (render colwidth) . blockListToConTeXt) (fmap (render colwidth) . inlineListToConTeXt) + (writerVariables options) meta body <- mapM (elementToConTeXt options) $ hierarchicalize blocks let main = (render colwidth . vcat) body @@ -81,8 +82,7 @@ pandocToConTeXt options (Pandoc meta blocks) = do $ defField "mainlang" (maybe "" (reverse . takeWhile (/=',') . reverse) (lookup "lang" $ writerVariables options)) - $ foldl (\acc (x,y) -> setField x y acc) - metadata (writerVariables options) + $ metadata return $ if writerStandalone options then renderTemplate' (writerTemplate options) context else main |