4aed13b · typeable/pandoc

git.iko.soy/typeable/pandoc

Markdown writer: don't include variables in metadata blocks!

Previously variables set on the command line were included in e.g. YAML metadata, contrary to documentation and intentions.

commit4aed13bf7c746c34d0cd4d5a3cea94f2ee9b73f8 authorJohn MacFarlane <jgm@berkeley.edu> dateSat 25 Feb 2017, 23:46 (10 years ago) parent1245514

1 file changed+3−4

unifiedsplit

src/Text/Pandoc/Writers/Markdown.hs+3−4

@@ -159,8 +159,7 @@ jsonToYaml (Object hashmap) =

159159 | otherwise -> (k' <> ":") $$ x

160160 (k', Object _, x) -> (k' <> ":") $$ nest 2 x

161161 (_, String "", _) -> empty

162− (k', _, x) | k == "meta-json" -> empty

163− | otherwise -> k' <> ":" <> space <> hang 2 "" x)

162+ (k', _, x) -> k' <> ":" <> space <> hang 2 "" x)

164163 $ sortBy (comparing fst) $ H.toList hashmap

165164jsonToYaml (Array vec) =

166165 vcat $ map (\v -> hang 2 "- " (jsonToYaml v)) $ V.toList vec

@@ -181,7 +180,7 @@ pandocToMarkdown opts (Pandoc meta blocks) = do

181180 then Just $ writerColumns opts

182181 else Nothing

183182 isPlain <- asks envPlain

184− metadata <- metaToJSON opts

183+ metadata <- metaToJSON'

185184 (fmap (render colwidth) . blockListToMarkdown opts)

186185 (fmap (render colwidth) . inlineListToMarkdown opts)

187186 meta

@@ -219,7 +218,7 @@ pandocToMarkdown opts (Pandoc meta blocks) = do

219218 $ (if isNullMeta meta

220219 then id

221220 else defField "titleblock" (render' titleblock))

222− $ metadata

221+ $ addVariablesToJSON opts metadata

223222 case writerTemplate opts of

224223 Nothing -> return main

225224 Just tpl -> return $ renderTemplate' tpl context