git.iko.soy/typeable/pandoc
on master help sign in
Rename `Ext_yaml_title_block` -> `Ext_yaml_metadata_block`.
commit3cd62d7c35ab4b3f9781c63275c8d17619d308dd authorJohn MacFarlane <fiddlosopher@gmail.com> dateTue 2 Jul 2013, 20:54 (13 years ago) parent0da863f
4 files changed+15−9
compare with master
unifiedsplit
README+8−2 src/Text/Pandoc/Options.hs+2−2 src/Text/Pandoc/Readers/Markdown.hs+1−1 src/Text/Pandoc/Writers/Markdown.hs+4−4
README+8−2
@@ -1775,6 +1775,12 @@ will also have "Pandoc User Manuals" in the footer.
17751775
17761776will also have "Version 4.0" in the header.
17771777
1778+YAML metadata block
1779+-------------------
1780+
1781+**Extension: `yaml_metadata_block`**
1782+
1783+TODO
17781784
17791785Backslash escapes
17801786-----------------
@@ -2401,8 +2407,8 @@ the document, for example:
24012407
24022408See the MultiMarkdown documentation for details. Note that only title,
24032409author, and date are recognized; other fields are simply ignored by
2404−pandoc. If `pandoc_title_block` is enabled, it will take precedence over
2405−`mmd_title_block`.
2410+pandoc. If `pandoc_title_block` or `yaml_metadata_block` is enabled,
2411+it will take precedence over `mmd_title_block`.
24062412
24072413 [MultiMarkdown]: http://fletcherpenney.net/multimarkdown/
24082414
src/Text/Pandoc/Options.hs+2−2
@@ -55,7 +55,7 @@ data Extension =
5555 Ext_footnotes -- ^ Pandoc/PHP/MMD style footnotes
5656 | Ext_inline_notes -- ^ Pandoc-style inline notes
5757 | Ext_pandoc_title_block -- ^ Pandoc title block
58− | Ext_yaml_title_block -- ^ YAML metadata block
58+ | Ext_yaml_metadata_block -- ^ YAML metadata block
5959 | Ext_mmd_title_block -- ^ Multimarkdown metadata block
6060 | Ext_table_captions -- ^ Pandoc-style table captions
6161 | Ext_implicit_figures -- ^ A paragraph with just an image is a figure
@@ -107,7 +107,7 @@ pandocExtensions = Set.fromList
107107 [ Ext_footnotes
108108 , Ext_inline_notes
109109 , Ext_pandoc_title_block
110− , Ext_yaml_title_block
110+ , Ext_yaml_metadata_block
111111 , Ext_table_captions
112112 , Ext_implicit_figures
113113 , Ext_simple_tables
src/Text/Pandoc/Readers/Markdown.hs+1−1
@@ -227,7 +227,7 @@ pandocTitleBlock = try $ do
227227
228228yamlTitleBlock :: MarkdownParser (F (Pandoc -> Pandoc))
229229yamlTitleBlock = try $ do
230− guardEnabled Ext_yaml_title_block
230+ guardEnabled Ext_yaml_metadata_block
231231 pos <- getPosition
232232 string "---"
233233 blankline
src/Text/Pandoc/Writers/Markdown.hs+4−4
@@ -131,8 +131,8 @@ plainTitleBlock tit auths dat =
131131 (hcat (intersperse (text "; ") auths)) <> cr <>
132132 dat <> cr
133133
134−yamlTitleBlock :: Value -> Doc
135−yamlTitleBlock v = "---" $$ (jsonToYaml v) $$ "..."
134+yamlMetadataBlock :: Value -> Doc
135+yamlMetadataBlock v = "---" $$ (jsonToYaml v) $$ "..."
136136
137137jsonToYaml :: Value -> Doc
138138jsonToYaml (Object hashmap) =
@@ -174,8 +174,8 @@ pandocToMarkdown opts (Pandoc meta blocks) = do
174174 let titleblock = case writerStandalone opts of
175175 True | isPlain ->
176176 plainTitleBlock title' authors' date'
177− | isEnabled Ext_yaml_title_block opts ->
178− yamlTitleBlock metadata
177+ | isEnabled Ext_yaml_metadata_block opts ->
178+ yamlMetadataBlock metadata
179179 | isEnabled Ext_pandoc_title_block opts ->
180180 pandocTitleBlock title' authors' date'
181181 | isEnabled Ext_mmd_title_block opts ->