From b85211b0d457e8ea4625ba00efe5133ba6f42350 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 31 Oct 2022 19:44:45 +0000 Subject: markdown (31oct22) git-svn-id: svn://tug.org/texlive/trunk@64879 c570f23f-e606-0410-a88d-b1316a301751 --- .../third/markdown/examples/context-mkii.tex | 19 +- .../third/markdown/examples/context-mkiv.tex | 19 +- .../doc/context/third/markdown/examples/example.md | 22 +- Master/texmf-dist/doc/generic/markdown/CHANGES.md | 41 + Master/texmf-dist/doc/generic/markdown/README.md | 16 +- Master/texmf-dist/doc/generic/markdown/VERSION | 2 +- .../texmf-dist/doc/generic/markdown/markdown.html | 5937 ++++++++++---------- .../texmf-dist/doc/generic/markdown/markdown.pdf | Bin 895604 -> 917637 bytes .../doc/latex/markdown/examples/example.md | 22 +- .../doc/latex/markdown/examples/latex.tex | 21 +- .../texmf-dist/scripts/markdown/markdown-cli.lua | 32 +- .../source/generic/markdown/markdown.dtx | 1946 +++++-- .../tex/context/third/markdown/t-markdown.tex | 46 +- .../texmf-dist/tex/generic/markdown/markdown.tex | 593 +- Master/texmf-dist/tex/latex/markdown/markdown.sty | 198 +- Master/texmf-dist/tex/luatex/markdown/markdown.lua | 343 +- 16 files changed, 5251 insertions(+), 4006 deletions(-) diff --git a/Master/texmf-dist/doc/context/third/markdown/examples/context-mkii.tex b/Master/texmf-dist/doc/context/third/markdown/examples/context-mkii.tex index 77809fa16b3..b2c48ac00ae 100644 --- a/Master/texmf-dist/doc/context/third/markdown/examples/context-mkii.tex +++ b/Master/texmf-dist/doc/context/third/markdown/examples/context-mkii.tex @@ -9,21 +9,22 @@ % Set options of the Markdown module. \setupmarkdown [ - hashEnumerators = yes, + contentBlocks = yes, debugExtensions = yes, definitionLists = yes, - smartEllipses = yes, - footnotes = yes, - inlineFootnotes = yes, + fancy_lists = yes, fencedCode = yes, - contentBlocks = yes, + hashEnumerators = yes, + inlineNotes = yes, + notes = yes, pipeTables = yes, + rawAttribute = yes, + smartEllipses = yes, + strikethrough = yes, + subscripts = yes, + superscripts = yes, tableCaptions = yes, taskLists = yes, - strikeThrough = yes, - superscripts = yes, - subscripts = yes, - fancyLists = yes, ] % Set renderers of the Markdown module. diff --git a/Master/texmf-dist/doc/context/third/markdown/examples/context-mkiv.tex b/Master/texmf-dist/doc/context/third/markdown/examples/context-mkiv.tex index 8849e7bd66b..b91ab03d99e 100644 --- a/Master/texmf-dist/doc/context/third/markdown/examples/context-mkiv.tex +++ b/Master/texmf-dist/doc/context/third/markdown/examples/context-mkiv.tex @@ -9,21 +9,22 @@ % Set options of the Markdown module. \setupmarkdown [ - hashEnumerators = yes, + contentBlocks = yes, debugExtensions = yes, definitionLists = yes, - smartEllipses = yes, - footnotes = yes, - inlineFootnotes = yes, + fancy_lists = yes, fencedCode = yes, - contentBlocks = yes, + hashEnumerators = yes, + inlineNotes = yes, + notes = yes, pipeTables = yes, + rawAttribute = yes, + smartEllipses = yes, + strikethrough = yes, + subscripts = yes, + superscripts = yes, tableCaptions = yes, taskLists = yes, - strikeThrough = yes, - superscripts = yes, - subscripts = yes, - fancyLists = yes, ] % Set renderers of the Markdown module. diff --git a/Master/texmf-dist/doc/context/third/markdown/examples/example.md b/Master/texmf-dist/doc/context/third/markdown/examples/example.md index 24ca2c6362e..f697bcff579 100644 --- a/Master/texmf-dist/doc/context/third/markdown/examples/example.md +++ b/Master/texmf-dist/doc/context/third/markdown/examples/example.md @@ -10,7 +10,7 @@ ###### This is an H6 -This is a text paragraph containing an ellipsis ... and followed by a horizontal rule. +This is a text paragraph containing an ellipsis ... and followed by a thematic break. *** @@ -148,20 +148,26 @@ This is a block quote: > > Back to the first level. -Here is a footnote reference[^1] and another.[^longnote] +Here is a note reference[^1] and another.[^longnote] Here is an inline note.^[Inlines notes are easier to write, since you don't have to pick an identifier and move down to type the note.] - -[^1]: Here is the footnote. + +[^1]: Here is the note. [^longnote]: Here's one with multiple blocks. - + Subsequent paragraphs are indented to show that they -belong to the previous footnote. - +belong to the previous note. + Some code The whole paragraph can be indented, or just the first - line. In this way, multi-paragraph footnotes work like + line. In this way, multi-paragraph notes work like multi-paragraph list items. + +This is raw `\TeX`{=tex} code: + +``` {=tex} +$$ x^n + y^n = z^n $$ +``` diff --git a/Master/texmf-dist/doc/generic/markdown/CHANGES.md b/Master/texmf-dist/doc/generic/markdown/CHANGES.md index 077fb63c994..7e6575d20d1 100644 --- a/Master/texmf-dist/doc/generic/markdown/CHANGES.md +++ b/Master/texmf-dist/doc/generic/markdown/CHANGES.md @@ -1,5 +1,46 @@ # Changes +## 2.18.0 (2022-10-31) + +Development: + +- Accept snake\_case variants of options in addition to camelCase variants in + `\markdownSetup` and Lua CLI. Accept snake\_case and caseless variants of + options in `\setupmarkdown`. (#193, #194, #195, #196, #197, #198) +- Rename renderers, renderer prototypes and options based on the semantics of + elements: (#187, #201) + - Rename the `horizontalRule` and `footnote` renderers and renderer + prototypes to `thematicBreak` and `note`. + - Rename the `footnotes` and `inlineFootnotes` options to `notes` and + `inlineNotes`. + - Rename the `HorizontalRule` rule to `ThematicBreak` and increment + `grammar_version` to `2`. This change is not backwards-compatible with the + `grammar_version` of `1`. +- Add `\markdownEscape` macro that inputs a TeX document in the middle of a + markdown document fragment. (1478f7b) +- Add support for raw attributes. (#173, #202) + +Fixes: + +- Fix missing support for forward slashes in + `\markdownSetup{jekyllDataRenderers = {...}}` keys. (#199, #200) +- Fix `plain` LaTeX option not preventing changes to renderer prototypes. + (013abbb) + +Continuous Integration: + +- Check user manual with MarkdownLint. (#203) + +Contributed Software: + +- Update `contributions/pandoc-to-markdown`. + (contributed by @drehak, 3d5b8e5, d3073bc) + +Deprecation: + +- Deprecate `horizontalRule` and `footnote` renderers and renderer prototypes. + (#187, #201) + ## 2.17.1 (2022-10-03) Fixes: diff --git a/Master/texmf-dist/doc/generic/markdown/README.md b/Master/texmf-dist/doc/generic/markdown/README.md index c47b1074a23..d7423fa93b0 100644 --- a/Master/texmf-dist/doc/generic/markdown/README.md +++ b/Master/texmf-dist/doc/generic/markdown/README.md @@ -185,8 +185,9 @@ For further information, consult one of the following: - [Using Markdown inside TeX documents][tb119], - [Markdown 2.7.0: Towards lightweight markup in TeX][tb124], - [Making Markdown into a Microwave Meal][tb129], - - [Markdown 2.10.0: LaTeX Themes & Snippets, Two Flavors of Comments, and LuaMetaTeX][tb131], and - - [Markdown 2.15.0: What's New?][tb133]. + - [Markdown 2.10.0: LaTeX Themes & Snippets, Two Flavors of Comments, and LuaMetaTeX][tb131], + - [Markdown 2.15.0: What's New?][tb133], and + - [Markdown 2.17.1: What's New, What's Next?][tb135]. 5. Journal articles of me and my students published by [CSTUG][] (in Czech and Slovak): - [Rendering Markdown inside TeX Documents][10.5300/2016-1-4/78], - [Markdown 2.8.1: Boldly Unto the Throne of Lightweight Markup in TeX][10.5300/2020-1-2/48], @@ -204,11 +205,12 @@ For further information, consult one of the following: [overleaf-5]: https://www.overleaf.com/latex/examples/writing-posters-with-markdown/jtbgmmgqrqmh "Writing Posters with Markdown" [overleaf-6]: https://www.overleaf.com/latex/examples/using-markdown-in-latex-documents/whdrnpcpnwrm "Using Markdown in LaTeX documents" - [tb119]: https://www.tug.org/TUGboat/tb38-2/tb119novotny.pdf "Using Markdown inside TeX documents" - [tb124]: https://www.tug.org/TUGboat/tb40-1/tb124novotny-markdown.pdf "Markdown 2.7.0: Towards lightweight markup in TeX" - [tb129]: https://www.tug.org/TUGboat/tb41-3/tb129novotny-frozen.pdf "Making Markdown into a Microwave Meal" - [tb131]: https://www.tug.org/TUGboat/tb42-2/tb131novotny-markdown.pdf "Markdown 2.10.0: LaTeX Themes & Snippets, Two Flavors of Comments, and LuaMetaTeX" - [tb133]: https://tug.org/TUGboat/tb43-1/tb133novotny-markdown.pdf "Markdown 2.15.0: What's New?" + [tb119]: https://www.tug.org/TUGboat/tb38-2/tb119novotny.pdf "Using Markdown inside TeX documents" + [tb124]: https://www.tug.org/TUGboat/tb40-1/tb124novotny-markdown.pdf "Markdown 2.7.0: Towards lightweight markup in TeX" + [tb129]: https://www.tug.org/TUGboat/tb41-3/tb129novotny-frozen.pdf "Making Markdown into a Microwave Meal" + [tb131]: https://www.tug.org/TUGboat/tb42-2/tb131novotny-markdown.pdf "Markdown 2.10.0: LaTeX Themes & Snippets, Two Flavors of Comments, and LuaMetaTeX" + [tb133]: https://www.tug.org/TUGboat/tb43-1/tb133novotny-markdown.pdf "Markdown 2.15.0: What's New?" + [tb135]: https://www.tug.org/TUGboat/production/43-3/tb135novotny-markdown.pdf "Markdown 2.17.1: What's New, What's Next?" [tb131-slides]: https://tug.org/tug2021/assets/pdf/tug2021-novotny-slides.pdf "Markdown 2.10.0: LaTeX Themes & Snippets, Two Flavors of Comments, and LuaMetaTeX" [tb131-video]: https://youtu.be/THmPkAncMnc "Markdown 2.10.0: LaTeX Themes & Snippets, Two Flavors of Comments, and LuaMetaTeX" diff --git a/Master/texmf-dist/doc/generic/markdown/VERSION b/Master/texmf-dist/doc/generic/markdown/VERSION index 5435cd30d6c..ca77f648f35 100644 --- a/Master/texmf-dist/doc/generic/markdown/VERSION +++ b/Master/texmf-dist/doc/generic/markdown/VERSION @@ -1 +1 @@ -2.17.1-0-g8ca83f5 (2022-10-03) +2.18.0-0-gd8ae860 (2022-10-30) diff --git a/Master/texmf-dist/doc/generic/markdown/markdown.html b/Master/texmf-dist/doc/generic/markdown/markdown.html index edd58f157d7..8f66e86c6ef 100644 --- a/Master/texmf-dist/doc/generic/markdown/markdown.html +++ b/Master/texmf-dist/doc/generic/markdown/markdown.html @@ -84,7 +84,7 @@

Markdown Package User Manual

Vít Novotný

-

2.17.1-0-g8ca83f5 2022-10-03

+

2.18.0-0-gd8ae860 2022-10-30