diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2019-12-04 17:49:12 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2019-12-04 17:49:12 -0800 |
| commit | 28a2a6e5345f2dc51632bdd3ca2b063cc08d896d (patch) | |
| tree | 7cb508422b9c2e320371b2af99ac39a07f0b8dba /src/Text/Pandoc/App | |
| parent | 6c435a17cd48af40dbf87ebbec8baf6ac6aabe27 (diff) | |
| download | pandoc-28a2a6e5345f2dc51632bdd3ca2b063cc08d896d.tar.gz | |
Fix regression with behavior of --variable.
Previously -Vfoo=1 -Vfoo=2 would produce a list value for foo;
with 2.8 it produced just '2'. This commit restores the earlier
beahvior.
Closes #5962.
Diffstat (limited to 'src/Text/Pandoc/App')
| -rw-r--r-- | src/Text/Pandoc/App/CommandLineOptions.hs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/Text/Pandoc/App/CommandLineOptions.hs b/src/Text/Pandoc/App/CommandLineOptions.hs index 32fb04663..95c981f7b 100644 --- a/src/Text/Pandoc/App/CommandLineOptions.hs +++ b/src/Text/Pandoc/App/CommandLineOptions.hs @@ -3,6 +3,7 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TupleSections #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE FlexibleContexts #-} {- | Module : Text.Pandoc.App.CommandLineOptions Copyright : Copyright (C) 2006-2019 John MacFarlane @@ -41,6 +42,7 @@ import System.Environment (getArgs, getProgName) import System.Exit (exitSuccess) import System.FilePath import System.IO (stdout) +import Text.DocTemplates (Val(..)) import Text.Pandoc import Text.Pandoc.Builder (setMeta) import Text.Pandoc.App.Opt (Opt (..), LineEnding (..), IpynbOutput (..)) @@ -1028,8 +1030,12 @@ deprecatedOption o msg = -- | Set text value in text context. setVariable :: String -> String -> Context Text -> Context Text -setVariable key val (Context ctx) = - Context $ M.insert (T.pack key) (toVal (T.pack val)) ctx +setVariable key val (Context ctx) = Context $ M.alter go (T.pack key) ctx + where go Nothing = Just $ toVal (T.pack val) + go (Just (ListVal xs)) + = Just $ ListVal $ xs ++ + [toVal (T.pack val)] + go (Just x) = Just $ ListVal [x, toVal (T.pack val)] addMeta :: String -> String -> Meta -> Meta addMeta k v meta = |