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/OpenDocument.hs | |
| parent | 5cb0f0bbf1da61b7ce276a39055a51b6166500cc (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/OpenDocument.hs')
| -rw-r--r-- | src/Text/Pandoc/Writers/OpenDocument.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Text/Pandoc/Writers/OpenDocument.hs b/src/Text/Pandoc/Writers/OpenDocument.hs index ff405355f..b9c99d536 100644 --- a/src/Text/Pandoc/Writers/OpenDocument.hs +++ b/src/Text/Pandoc/Writers/OpenDocument.hs @@ -42,7 +42,7 @@ import Control.Arrow ( (***), (>>>) ) import Control.Monad.State hiding ( when ) import Data.Char (chr, isDigit) import qualified Data.Map as Map -import Text.Pandoc.Shared (metaToJSON, defField, setField) +import Text.Pandoc.Shared (metaToJSON, defField) -- | Auxiliary function to convert Plain block to Para. plainToPara :: Block -> Block @@ -183,6 +183,7 @@ writeOpenDocument opts (Pandoc meta blocks) = m <- metaToJSON (fmap (render colwidth) . blocksToOpenDocument opts) (fmap (render colwidth) . inlinesToOpenDocument opts) + (writerVariables opts) meta b <- render' `fmap` blocksToOpenDocument opts blocks return (b, m) @@ -194,8 +195,7 @@ writeOpenDocument opts (Pandoc meta blocks) = reverse $ styles ++ listStyles context = defField "body" body $ defField "automatic-styles" (render' automaticStyles) - $ foldl (\acc (x,y) -> setField x y acc) - metadata (writerVariables opts) + $ metadata in if writerStandalone opts then renderTemplate' (writerTemplate opts) context else body |