From dcd4b33437ee2d76762844fd5b757285a0495900 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 2 Feb 2023 21:15:03 +0000 Subject: markdown (2feb23) git-svn-id: svn://tug.org/texlive/trunk@65715 c570f23f-e606-0410-a88d-b1316a301751 --- .../third/markdown/examples/context-mkii.tex | 1 + .../third/markdown/examples/context-mkiv.tex | 1 + .../doc/context/third/markdown/examples/example.md | 6 + Master/texmf-dist/doc/generic/markdown/CHANGES.md | 56 +- Master/texmf-dist/doc/generic/markdown/README.md | 27 +- Master/texmf-dist/doc/generic/markdown/VERSION | 2 +- .../texmf-dist/doc/generic/markdown/markdown.css | 9 + .../texmf-dist/doc/generic/markdown/markdown.html | 7664 ++++++++++---------- .../texmf-dist/doc/generic/markdown/markdown.pdf | Bin 929724 -> 945263 bytes .../doc/latex/markdown/examples/example.md | 6 + .../doc/latex/markdown/examples/latex.tex | 1 + .../texmf-dist/scripts/markdown/markdown-cli.lua | 6 +- .../source/generic/markdown/markdown.dtx | 1518 +++- .../tex/context/third/markdown/t-markdown.tex | 70 +- .../texmf-dist/tex/generic/markdown/markdown.tex | 146 +- Master/texmf-dist/tex/latex/markdown/markdown.sty | 115 +- .../tex/latex/markdown/markdownthemewitiko_dot.sty | 2 +- Master/texmf-dist/tex/luatex/markdown/markdown.lua | 400 +- 18 files changed, 5770 insertions(+), 4260 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 b2c48ac00ae..f5eed3d8d00 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 @@ -16,6 +16,7 @@ fencedCode = yes, hashEnumerators = yes, inlineNotes = yes, + lineBlocks = yes, notes = yes, pipeTables = yes, rawAttribute = yes, 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 b91ab03d99e..29c1aa552b5 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 @@ -16,6 +16,7 @@ fencedCode = yes, hashEnumerators = yes, inlineNotes = yes, + lineBlocks = yes, notes = yes, pipeTables = yes, rawAttribute = yes, 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 f697bcff579..16d32368d92 100644 --- a/Master/texmf-dist/doc/context/third/markdown/examples/example.md +++ b/Master/texmf-dist/doc/context/third/markdown/examples/example.md @@ -171,3 +171,9 @@ This is raw `\TeX`{=tex} code: ``` {=tex} $$ x^n + y^n = z^n $$ ``` + +| this is a line block that +| spans multiple +| even + discontinuous +| lines diff --git a/Master/texmf-dist/doc/generic/markdown/CHANGES.md b/Master/texmf-dist/doc/generic/markdown/CHANGES.md index 5cbde41192d..6be50c7a091 100644 --- a/Master/texmf-dist/doc/generic/markdown/CHANGES.md +++ b/Master/texmf-dist/doc/generic/markdown/CHANGES.md @@ -1,10 +1,62 @@ # Changes +## 2.20.0 + +Development: + +- Add support for line blocks. + (contributed by @Omikhleia and @lostenderman, jgm#41, #209, #248) +- Add support for attributes on fenced code blocks. + (contributed by @Omikhleia, jgm#36, #123, #211) + +Documentation: + +- Add @drehak's thesis to `README.md`. (204a18c, aec9b44, cda53fb) +- Update examples for options `bracketedSpans` and `fencedDivs`. + (499c65a, 532cdb8) + +Fixes: + +- Map U+0000 and U+FFFD to new replacement character renderer. + (lostenderman#34, #247, #250) +- Map non-breaking space to `writer->nbsp` in strings. + (lostenderman#99, #247, #249) +- Fix input normalization and move it from Lua CLI and plain TeX + layers directly to the `convert()` Lua method. (#246, #253) +- Allow fenced div closing tag to break out of a blockquote. + (contributed by @Omikhleia, jgm#60, jgm#61, #230, #259) + +Default Renderer Prototypes: + +- Use `paralist` LaTeX package to define default renderer prototypes for + fancy lists when `fancyList` Lua option is enabled. (#241) +- Insert `\unskip` after default raw inline renderer prototype. (ca2047e) +- Make `\*group_begin:` and `\*group_end:` the default renderer prototypes + for attribute contexts. (#243) +- In LaTeX and ConTeXt, use just first word of infostring to determine fence + code block language. (#244) + +Unit Tests: + +- Do not fold tabs and spaces into a single space token. + (lostenderman#107, #242) +- Do not escape URIs in test outputs. (lostenderman#8, #260, 291e388) + +Speed Improvements: + +- Only make backticks special when `codeSpans` or `fencedCode` are enabled. + (#239) +- Use fast unit testing in continuous integration. (#231, #255) + +Continuous Integration: + +- Fix ownership of repository before running Docker image. (#240) + ## 2.19.0 (2022-12-23) Development: -- Add support for fenced divs and bracketed spans. (#207) +- Add support for fenced divs and bracketed spans. (#126, #207) Fixes: @@ -18,7 +70,7 @@ Refactoring: Documentation: -- Link article [*High-Level Languages for +- Add article [*High-Level Languages for TeX*](https://www.doi.org/10.5300/2022-1-4/35) (in Czech) from CSTUG Bulletin 1–4/2022 to `README.md`. (authored by @witiko, a2bbdea) diff --git a/Master/texmf-dist/doc/generic/markdown/README.md b/Master/texmf-dist/doc/generic/markdown/README.md index a2504c3738b..42a62e73837 100644 --- a/Master/texmf-dist/doc/generic/markdown/README.md +++ b/Master/texmf-dist/doc/generic/markdown/README.md @@ -165,9 +165,8 @@ For further information, consult one of the following: 1. The user manual for either [the released version][manual-tex-live] or [the latest development version][manual-latest], which can be produced by interpreting the `markdown.ins` file using a Unicode-aware TeX engine, such - as XeTeX (`xetex markdown.ins`) or LuaTeX (`luatex markdown.ins`). The - manual will reside in the file `markdown.md` and the CSS stylesheet - `markdown.css`. + as LuaTeX (`luatex markdown.ins`). The manual will reside in the file + `markdown.md` and the CSS stylesheet `markdown.css`. 2. The technical documentation for either [the released version][techdoc-tex-live] or [the latest development version][techdoc-latest], which can be typeset by running the [LaTeXMK][] tool on the `markdown.dtx` file (`latexmk @@ -198,6 +197,8 @@ For further information, consult one of the following: - [Five Years of Markdown in LaTeX: What, Why, How, and Whereto][pv212-fall2020] (in Czech), and - [Markdown 2.10.0: LaTeX Themes & Snippets, Two Flavors of Comments, and LuaMetaTeX][tb131-video] ([slides][tb131-slides]). - [A Gentle Introduction to Markdown for Writers][tb134-video] ([slides][tb134-slides], [example][tb134-example]). +7. Theses by my students: + - [Generic TeX Writer for the Pandoc Document Converter][thesis-umhg5] [overleaf-1]: https://www.overleaf.com/learn/latex/Articles/How_to_write_in_Markdown_on_Overleaf "How to write in Markdown on Overleaf" [overleaf-2]: https://www.overleaf.com/learn/latex/Articles/Markdown_into_LaTeX_with_Style "Markdown into LaTeX with Style" @@ -239,12 +240,14 @@ For further information, consult one of the following: [techdoc-latest]: https://github.com/Witiko/markdown/releases/download/latest/markdown.pdf "A Markdown Interpreter for TeX" [techdoc-tex-live]: https://mirrors.ctan.org/macros/generic/markdown/markdown.pdf "A Markdown Interpreter for TeX" + [thesis-umhg5]: https://is.muni.cz/th/umhg5/?lang=en "Generic TeX Writer for the Pandoc Document Converter" + Acknowledgements ---------------- | Logo | Acknowledgement | | ------------- | --------------- | -| [][fimu] | I gratefully acknowledge the funding from the [Faculty of Informatics][fimu] at the [Masaryk University][mu] in Brno, Czech Republic, for the development of the Markdown package. | +| [][fimu] | I gratefully acknowledge the funding from the [Faculty of Informatics][fimu] at the [Masaryk University][mu] in Brno, Czech Republic, for the development of the Markdown package in projects [MUNI/33/12/2015][], [MUNI/33/1784/2020][], [MUNI/33/0776/2021][], [MUNI/33/1654/2022][], and [MUNI/33/1658/2022][]. | | [][overleaf] | Extensive user documentation for the Markdown package was kindly written by [Lian Tze Lim][liantze] and published by [Overleaf][]. | | [][omedym] | Support for content slicing (Lua options [`shiftHeadings`][option-shift-headings] and [`slice`][option-slice]) and pipe tables (Lua options [`pipeTables`][option-pipe-tables] and [`tableCaptions`][option-table-captions]) was graciously sponsored by [David Vins][dvins] and [Omedym][]. | @@ -258,6 +261,12 @@ Acknowledgements [option-slice]: https://mirrors.ctan.org/macros/generic/markdown/markdown.html#slice "Markdown Package User Manual" [option-table-captions]: https://mirrors.ctan.org/macros/generic/markdown/markdown.html#option-tablecaptions "Markdown Package User Manual" + [MUNI/33/12/2015]: https://www.muni.cz/en/research/projects/32984 "A Markdown Interpreter in TeX" + [MUNI/33/1784/2020]: https://www.muni.cz/en/research/projects/58488 "Extension of the Input Formats of the Markdown Tool" + [MUNI/33/0776/2021]: https://www.muni.cz/en/research/projects/62168 "Preparation of Templates for Typesetting Books and Publishing Collaterals with the Markdown TeX Package" + [MUNI/33/1654/2022]: https://www.muni.cz/en/research/projects/69763 "An Implementation of the CommonMark Standard into the Markdown Package for TeX" + [MUNI/33/1658/2022]: https://www.muni.cz/en/research/projects/69762 "Syntax Extensions of the Markdown Package for TeX" + Contributing to the Development of Markdown ------------------------------------------- @@ -269,11 +278,11 @@ Some useful commands, such as building the release archives and typesetting the documentation, are placed in the `Makefile` file for ease of maintenance. When the file `markdown.ins` is interpreted using a Unicode-aware TeX engine, -such as XeTeX (`xetex markdown.ins`) or LuaTeX (`luatex markdown.ins`), several -files are produced from the `markdown.dtx` document. The `make base` command -is provided by `Makefile` for convenience. In `markdown.dtx`, the boundaries -between the produced files are marked up using an XML-like syntax provided by -the [l3docstrip][] plain TeX package. +such LuaTeX (`luatex markdown.ins`), several files are produced from the +`markdown.dtx` document. The `make base` command is provided by `Makefile` for +convenience. In `markdown.dtx`, the boundaries between the produced files are +marked up using an XML-like syntax provided by the [l3docstrip][] plain TeX +package. Running the [LaTeXMK][] tool on the `markdown.dtx` file (`latexmk markdown.dtx`) after the Markdown package has been diff --git a/Master/texmf-dist/doc/generic/markdown/VERSION b/Master/texmf-dist/doc/generic/markdown/VERSION index 8d5f7708c3e..95633c32797 100644 --- a/Master/texmf-dist/doc/generic/markdown/VERSION +++ b/Master/texmf-dist/doc/generic/markdown/VERSION @@ -1 +1 @@ -2.19.0-0-g80fcf20 (2022-12-23) +2.20.0-0-gf64ade1 (2023-02-01) diff --git a/Master/texmf-dist/doc/generic/markdown/markdown.css b/Master/texmf-dist/doc/generic/markdown/markdown.css index f679065407c..8a27734fcf3 100644 --- a/Master/texmf-dist/doc/generic/markdown/markdown.css +++ b/Master/texmf-dist/doc/generic/markdown/markdown.css @@ -128,6 +128,15 @@ pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; + counter-reset: line; +} + +.sourceCode.linenos > span { + counter-increment: line; +} + +.sourceCode.linenos > span:before{ + content: counter(line) " "; } b, strong { diff --git a/Master/texmf-dist/doc/generic/markdown/markdown.html b/Master/texmf-dist/doc/generic/markdown/markdown.html index 4d62b54fc28..e64210e1465 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.19.0-0-g80fcf20 2022-12-23

+

2.20.0-0-gf64ade1 2023-02-01