0aed9dd · typeable/pandoc

MANUAL.txt+2

compare with master

unifiedsplit

@@ -226,6 +226,7 @@ header when requesting a document from a URL:

226

227 ::: {#input-formats}

228 - `commonmark` ([CommonMark] Markdown)

229+ - `commonmark_x` ([CommonMark] Markdown with extensions)

229 - `creole` ([Creole 1.0])

230 - `creole` ([Creole 1.0])

230 - `csv` ([CSV] table)

231 - `csv` ([CSV] table)

231 - `docbook` ([DocBook])

232 - `docbook` ([DocBook])

@@ -277,6 +278,7 @@ header when requesting a document from a URL:

277 - `asciidoc` ([AsciiDoc]) or `asciidoctor` ([AsciiDoctor])

278 - `asciidoc` ([AsciiDoc]) or `asciidoctor` ([AsciiDoctor])

278 - `beamer` ([LaTeX beamer][`beamer`] slide show)

279 - `beamer` ([LaTeX beamer][`beamer`] slide show)

279 - `commonmark` ([CommonMark] Markdown)

280 - `commonmark` ([CommonMark] Markdown)

281+ - `commonmark_x` ([CommonMark] Markdown with extensions)

280 - `context` ([ConTeXt])

282 - `context` ([ConTeXt])

281 - `docbook` or `docbook4` ([DocBook] 4)

283 - `docbook` or `docbook4` ([DocBook] 4)

282 - `docbook5` (DocBook 5)

284 - `docbook5` (DocBook 5)

src/Text/Pandoc/Extensions.hs+31−3

@@ -338,6 +338,29 @@ getDefaultExtensions "plain" = plainExtensions

338getDefaultExtensions "gfm" = githubMarkdownExtensions

339getDefaultExtensions "commonmark" = extensionsFromList

340 [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+ ]

341getDefaultExtensions "org" = extensionsFromList

364getDefaultExtensions "org" = extensionsFromList

342 [Ext_citations,

365 [Ext_citations,

343 Ext_auto_identifiers]

366 Ext_auto_identifiers]

@@ -433,10 +456,16 @@ getAllExtensions f = universalExtensions <> getAll f

433 [ Ext_amuse ]

456 [ Ext_amuse ]

434 getAll "asciidoc" = autoIdExtensions

457 getAll "asciidoc" = autoIdExtensions

435 getAll "plain" = allMarkdownExtensions

458 getAll "plain" = allMarkdownExtensions

436− getAll "gfm" = githubMarkdownExtensions <>

459+ getAll "gfm" = getAll "commonmark"

460+ getAll "commonmark" =

437 autoIdExtensions <>

461 autoIdExtensions <>

438 extensionsFromList

462 extensionsFromList

463+ [ Ext_pipe_tables

464+ , Ext_autolink_bare_uris

465+ , Ext_strikeout

466+ , Ext_task_lists

467+ , Ext_emoji

439− [ Ext_raw_html

468+ , Ext_raw_html

440 , Ext_raw_tex -- only supported in writer (for math)

469 , Ext_raw_tex -- only supported in writer (for math)

441 , Ext_implicit_figures

470 , Ext_implicit_figures

442 , Ext_hard_line_breaks

471 , Ext_hard_line_breaks

@@ -453,7 +482,6 @@ getAllExtensions f = universalExtensions <> getAll f

453 , Ext_implicit_header_references

482 , Ext_implicit_header_references

454 , Ext_attributes

483 , Ext_attributes

455 ]

484 ]

456− getAll "commonmark" = getAll "gfm"

457 getAll "org" = autoIdExtensions <>

485 getAll "org" = autoIdExtensions <>

458 extensionsFromList

486 extensionsFromList

459 [ Ext_citations

487 [ Ext_citations

src/Text/Pandoc/Readers.hs+1

@@ -111,6 +111,7 @@ readers = [ ("native" , TextReader readNative)

111 ,("markdown_github" , TextReader readMarkdown)

112 ,("markdown_mmd", TextReader readMarkdown)

113 ,("commonmark" , TextReader readCommonMark)

114+ ,("commonmark_x" , TextReader readCommonMark)

114 ,("creole" , TextReader readCreole)

115 ,("creole" , TextReader readCreole)

115 ,("dokuwiki" , TextReader readDokuWiki)

116 ,("dokuwiki" , TextReader readDokuWiki)

116 ,("gfm" , TextReader readCommonMark)

117 ,("gfm" , TextReader readCommonMark)

src/Text/Pandoc/Templates.hs+1

@@ -97,6 +97,7 @@ getDefaultTemplate writer = do

97 "markdown_mmd" -> getDefaultTemplate "markdown"

98 "markdown_phpextra" -> getDefaultTemplate "markdown"

99 "gfm" -> getDefaultTemplate "commonmark"

100+ "commonmark_x" -> getDefaultTemplate "commonmark"

100 _ -> do

101 _ -> do

101 let fname = "templates" </> "default" <.> T.unpack format

102 let fname = "templates" </> "default" <.> T.unpack format

102 UTF8.toText <$> readDataFile fname

103 UTF8.toText <$> readDataFile fname

src/Text/Pandoc/Writers.hs+1

@@ -178,6 +178,7 @@ writers = [

178 ,("asciidoctor" , TextWriter writeAsciiDoctor)

179 ,("haddock" , TextWriter writeHaddock)

180 ,("commonmark" , TextWriter writeCommonMark)

181+ ,("commonmark_x" , TextWriter writeCommonMark)

181 ,("gfm" , TextWriter writeCommonMark)

182 ,("gfm" , TextWriter writeCommonMark)

182 ,("tei" , TextWriter writeTEI)

183 ,("tei" , TextWriter writeTEI)

183 ,("muse" , TextWriter writeMuse)

184 ,("muse" , TextWriter writeMuse)