diff options
| author | Nikolay Yakimov <root@livid.pp.ru> | 2020-05-01 03:11:44 +0300 |
|---|---|---|
| committer | Nikolay Yakimov <root@livid.pp.ru> | 2020-06-29 17:06:29 +0300 |
| commit | f26923b9e493ecd2c4515d821da58e88fd2d946b (patch) | |
| tree | ebb07c00074e1ca9706db97a42e1e6f5115d22c1 /src/Text/Pandoc/App | |
| parent | 11dc9f84f54650037c60917435fd91a90f94f9cf (diff) | |
| download | pandoc-f26923b9e493ecd2c4515d821da58e88fd2d946b.tar.gz | |
Unify defaults and markdown metadata parsers
Diffstat (limited to 'src/Text/Pandoc/App')
| -rw-r--r-- | src/Text/Pandoc/App/Opt.hs | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/Text/Pandoc/App/Opt.hs b/src/Text/Pandoc/App/Opt.hs index fb2aeab22..c550bed2c 100644 --- a/src/Text/Pandoc/App/Opt.hs +++ b/src/Text/Pandoc/App/Opt.hs @@ -34,9 +34,13 @@ import Text.Pandoc.Options (TopLevelDivision (TopLevelDefault), ObfuscationMethod (NoObfuscation), CiteMethod (Citeproc)) import Text.Pandoc.Shared (camelCaseStrToHyphenated) -import Text.DocLayout (render) -import Text.DocTemplates (Context(..), Val(..)) +import qualified Text.Pandoc.Parsing as P +import Text.Pandoc.Readers.Metadata (yamlMap) +import Text.Pandoc.Class.PandocPure +import Text.DocTemplates (Context(..)) import Data.Text (Text, unpack) +import Data.Default (def) +import Control.Monad (join) import qualified Data.Text as T import qualified Data.Map as M import Text.Pandoc.Definition (Meta(..), MetaValue(..), lookupMeta) @@ -185,8 +189,7 @@ doOpt (k',v) = do -- Note: x comes first because <> for Context is left-biased union -- and we want to favor later default files. See #5988. "metadata" -> - parseYAML v >>= \x -> return (\o -> o{ optMetadata = optMetadata o <> - contextToMeta x }) + return (\o -> o{ optMetadata = optMetadata o <> yamlToMeta v }) "metadata-files" -> parseYAML v >>= \x -> return (\o -> o{ optMetadataFiles = @@ -475,16 +478,14 @@ defaultOpts = Opt , optStripComments = False } -contextToMeta :: Context Text -> Meta -contextToMeta (Context m) = - Meta . M.map valToMetaVal $ m - -valToMetaVal :: Val Text -> MetaValue -valToMetaVal (MapVal (Context m)) = - MetaMap . M.map valToMetaVal $ m -valToMetaVal (ListVal xs) = MetaList $ map valToMetaVal xs -valToMetaVal (SimpleVal d) = MetaString $ render Nothing d -valToMetaVal NullVal = MetaString "" +yamlToMeta :: Node Pos -> Meta +yamlToMeta (Mapping _ _ m) = runEverything (yamlMap pMetaString m) + where + pMetaString = pure . MetaString <$> P.manyChar P.anyChar + runEverything :: P.ParserT Text P.ParserState PandocPure (P.F (M.Map Text MetaValue)) -> Meta + runEverything p = + either (const mempty) (Meta . flip P.runF def) . join . runPure $ P.readWithM p def "" +yamlToMeta _ = mempty addMeta :: String -> String -> Meta -> Meta addMeta k v meta = |