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/RST.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/RST.hs')
| -rw-r--r-- | src/Text/Pandoc/Writers/RST.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Writers/RST.hs b/src/Text/Pandoc/Writers/RST.hs index 701679799..45e077f0d 100644 --- a/src/Text/Pandoc/Writers/RST.hs +++ b/src/Text/Pandoc/Writers/RST.hs @@ -74,6 +74,7 @@ pandocToRST (Pandoc meta blocks) = do title <- titleToRST (docTitle meta) subtit metadata <- metaToJSON (fmap (render colwidth) . blockListToRST) (fmap (trimr . render colwidth) . inlineListToRST) + (writerVariables opts) $ deleteMeta "title" $ deleteMeta "subtitle" meta body <- blockListToRST blocks notes <- liftM (reverse . stNotes) get >>= notesToRST @@ -88,8 +89,7 @@ pandocToRST (Pandoc meta blocks) = do $ defField "math" hasMath $ defField "title" (render Nothing title :: String) $ defField "math" hasMath - $ foldl (\acc (x,y) -> setField x y acc) - metadata (writerVariables opts) + $ metadata if writerStandalone opts then return $ renderTemplate' (writerTemplate opts) context else return main |