From a1f010de7830777b86f88743785560a04fab62fd Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 29 Jun 2013 22:14:01 -0700 Subject: 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. --- src/Text/Pandoc/Writers/Org.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Text/Pandoc/Writers/Org.hs') diff --git a/src/Text/Pandoc/Writers/Org.hs b/src/Text/Pandoc/Writers/Org.hs index c02a7eac2..5980b1b99 100644 --- a/src/Text/Pandoc/Writers/Org.hs +++ b/src/Text/Pandoc/Writers/Org.hs @@ -66,6 +66,7 @@ pandocToOrg (Pandoc meta blocks) = do metadata <- metaToJSON (fmap (render colwidth) . blockListToOrg) (fmap (render colwidth) . inlineListToOrg) + (writerVariables opts) meta body <- blockListToOrg blocks notes <- liftM (reverse . stNotes) get >>= notesToOrg @@ -74,8 +75,7 @@ pandocToOrg (Pandoc meta blocks) = do let main = render colwidth $ foldl ($+$) empty $ [body, notes] let context = defField "body" main $ 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 -- cgit v1.2.3