@@ -159,8 +159,7 @@ jsonToYaml (Object hashmap) =
159 | otherwise -> (k' <> ":") $$ x
159 | otherwise -> (k' <> ":") $$ x
160 (k', Object _, x) -> (k' <> ":") $$ nest 2 x
160 (k', Object _, x) -> (k' <> ":") $$ nest 2 x
161 (_, String "", _) -> empty
161 (_, String "", _) -> empty
162− (k', _, x) | k == "meta-json" -> empty
163− | otherwise -> k' <> ":" <> space <> hang 2 "" x)
162+ (k', _, x) -> k' <> ":" <> space <> hang 2 "" x)
164 $ sortBy (comparing fst) $ H.toList hashmap
163 $ sortBy (comparing fst) $ H.toList hashmap
165jsonToYaml (Array vec) =
164jsonToYaml (Array vec) =
166 vcat $ map (\v -> hang 2 "- " (jsonToYaml v)) $ V.toList vec
165 vcat $ map (\v -> hang 2 "- " (jsonToYaml v)) $ V.toList vec
@@ -181,7 +180,7 @@ pandocToMarkdown opts (Pandoc meta blocks) = do
181 then Just $ writerColumns opts
180 then Just $ writerColumns opts
182 else Nothing
181 else Nothing
183 isPlain <- asks envPlain
182 isPlain <- asks envPlain
184− metadata <- metaToJSON opts
183+ metadata <- metaToJSON'
185 (fmap (render colwidth) . blockListToMarkdown opts)
184 (fmap (render colwidth) . blockListToMarkdown opts)
186 (fmap (render colwidth) . inlineListToMarkdown opts)
185 (fmap (render colwidth) . inlineListToMarkdown opts)
@@ -219,7 +218,7 @@ pandocToMarkdown opts (Pandoc meta blocks) = do
219 $ (if isNullMeta meta
218 $ (if isNullMeta meta
221 else defField "titleblock" (render' titleblock))
220 else defField "titleblock" (render' titleblock))
222− $ metadata
221+ $ addVariablesToJSON opts metadata
223 case writerTemplate opts of
222 case writerTemplate opts of
224 Nothing -> return main
223 Nothing -> return main
225 Just tpl -> return $ renderTemplate' tpl context
224 Just tpl -> return $ renderTemplate' tpl context