git.iko.soy/typeable/pandoc
on master help sign in
Add commonmark_x output format...

commonmark with a number of useful extensions (more than gfm).

commit265f14038501c6b8f2028bfcf30b51a0266a6dbc authorJohn MacFarlane <jgm@berkeley.edu> dateTue 5 May 2020, 23:01 (6 years ago) parent208a6cb
5 files changed+36−3
compare with master
unifiedsplit
MANUAL.txt+2 src/Text/Pandoc/Extensions.hs+31−3 src/Text/Pandoc/Readers.hs+1 src/Text/Pandoc/Templates.hs+1 src/Text/Pandoc/Writers.hs+1
MANUAL.txt+2
@@ -226,6 +226,7 @@ header when requesting a document from a URL:
226226
227227 ::: {#input-formats}
228228 - `commonmark` ([CommonMark] Markdown)
229+ - `commonmark_x` ([CommonMark] Markdown with extensions)
229230 - `creole` ([Creole 1.0])
230231 - `csv` ([CSV] table)
231232 - `docbook` ([DocBook])
@@ -277,6 +278,7 @@ header when requesting a document from a URL:
277278 - `asciidoc` ([AsciiDoc]) or `asciidoctor` ([AsciiDoctor])
278279 - `beamer` ([LaTeX beamer][`beamer`] slide show)
279280 - `commonmark` ([CommonMark] Markdown)
281+ - `commonmark_x` ([CommonMark] Markdown with extensions)
280282 - `context` ([ConTeXt])
281283 - `docbook` or `docbook4` ([DocBook] 4)
282284 - `docbook5` (DocBook 5)
src/Text/Pandoc/Extensions.hs+31−3
@@ -338,6 +338,29 @@ getDefaultExtensions "plain" = plainExtensions
338338getDefaultExtensions "gfm" = githubMarkdownExtensions
339339getDefaultExtensions "commonmark" = extensionsFromList
340340 [Ext_raw_html]
341+getDefaultExtensions "commonmark_x" = extensionsFromList
342+ [ Ext_pipe_tables
343+ , Ext_raw_html
344+ , Ext_auto_identifiers
345+ , Ext_strikeout
346+ , Ext_task_lists
347+ , Ext_emoji
348+ , Ext_pipe_tables
349+ , Ext_raw_html
350+ , Ext_raw_tex -- only supported in writer (for math)
351+ , Ext_smart
352+ , Ext_tex_math_dollars
353+ , Ext_superscript
354+ , Ext_subscript
355+ , Ext_definition_lists
356+ , Ext_footnotes
357+ , Ext_fancy_lists
358+ , Ext_fenced_divs
359+ , Ext_bracketed_spans
360+ , Ext_raw_attribute
361+ , Ext_implicit_header_references
362+ , Ext_attributes
363+ ]
341364getDefaultExtensions "org" = extensionsFromList
342365 [Ext_citations,
343366 Ext_auto_identifiers]
@@ -433,10 +456,16 @@ getAllExtensions f = universalExtensions <> getAll f
433456 [ Ext_amuse ]
434457 getAll "asciidoc" = autoIdExtensions
435458 getAll "plain" = allMarkdownExtensions
436− getAll "gfm" = githubMarkdownExtensions <>
459+ getAll "gfm" = getAll "commonmark"
460+ getAll "commonmark" =
437461 autoIdExtensions <>
438462 extensionsFromList
439− [ Ext_raw_html
463+ [ Ext_pipe_tables
464+ , Ext_autolink_bare_uris
465+ , Ext_strikeout
466+ , Ext_task_lists
467+ , Ext_emoji
468+ , Ext_raw_html
440469 , Ext_raw_tex -- only supported in writer (for math)
441470 , Ext_implicit_figures
442471 , Ext_hard_line_breaks
@@ -453,7 +482,6 @@ getAllExtensions f = universalExtensions <> getAll f
453482 , Ext_implicit_header_references
454483 , Ext_attributes
455484 ]
456− getAll "commonmark" = getAll "gfm"
457485 getAll "org" = autoIdExtensions <>
458486 extensionsFromList
459487 [ Ext_citations
src/Text/Pandoc/Readers.hs+1
@@ -111,6 +111,7 @@ readers = [ ("native" , TextReader readNative)
111111 ,("markdown_github" , TextReader readMarkdown)
112112 ,("markdown_mmd", TextReader readMarkdown)
113113 ,("commonmark" , TextReader readCommonMark)
114+ ,("commonmark_x" , TextReader readCommonMark)
114115 ,("creole" , TextReader readCreole)
115116 ,("dokuwiki" , TextReader readDokuWiki)
116117 ,("gfm" , TextReader readCommonMark)
src/Text/Pandoc/Templates.hs+1
@@ -97,6 +97,7 @@ getDefaultTemplate writer = do
9797 "markdown_mmd" -> getDefaultTemplate "markdown"
9898 "markdown_phpextra" -> getDefaultTemplate "markdown"
9999 "gfm" -> getDefaultTemplate "commonmark"
100+ "commonmark_x" -> getDefaultTemplate "commonmark"
100101 _ -> do
101102 let fname = "templates" </> "default" <.> T.unpack format
102103 UTF8.toText <$> readDataFile fname
src/Text/Pandoc/Writers.hs+1
@@ -178,6 +178,7 @@ writers = [
178178 ,("asciidoctor" , TextWriter writeAsciiDoctor)
179179 ,("haddock" , TextWriter writeHaddock)
180180 ,("commonmark" , TextWriter writeCommonMark)
181+ ,("commonmark_x" , TextWriter writeCommonMark)
181182 ,("gfm" , TextWriter writeCommonMark)
182183 ,("tei" , TextWriter writeTEI)
183184 ,("muse" , TextWriter writeMuse)