summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-03-09 20:43:49 +0000
committerKarl Berry <karl@freefriends.org>2024-03-09 20:43:49 +0000
commitee4914fc9f97ec611e283b0bedf979c13191b252 (patch)
tree1e0ee8604542c7b76734ab76c687d6875218690b
parent88081054d4adc2a86d0cd6ab88268099a6179429 (diff)
markdown (9mar24)
git-svn-id: svn://tug.org/texlive/trunk@70529 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/markdown/CHANGES.md21
-rw-r--r--Master/texmf-dist/doc/generic/markdown/VERSION2
-rw-r--r--Master/texmf-dist/doc/generic/markdown/markdown.html4
-rw-r--r--Master/texmf-dist/doc/generic/markdown/markdown.pdfbin1089321 -> 1089312 bytes
-rw-r--r--Master/texmf-dist/doc/latex/markdown/examples/latex-luatex.tex10
-rw-r--r--Master/texmf-dist/doc/latex/markdown/examples/latex-xetex.tex10
-rw-r--r--Master/texmf-dist/scripts/markdown/markdown-cli.lua2
-rw-r--r--Master/texmf-dist/source/generic/markdown/markdown.dtx4
-rw-r--r--Master/texmf-dist/tex/generic/markdown/markdown.tex4
-rw-r--r--Master/texmf-dist/tex/latex/markdown/markdown.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/markdown/markdown.lua2
11 files changed, 27 insertions, 34 deletions
diff --git a/Master/texmf-dist/doc/generic/markdown/CHANGES.md b/Master/texmf-dist/doc/generic/markdown/CHANGES.md
index e0f893ab21d..48d2d7066d0 100644
--- a/Master/texmf-dist/doc/generic/markdown/CHANGES.md
+++ b/Master/texmf-dist/doc/generic/markdown/CHANGES.md
@@ -1,5 +1,19 @@
# Changes
+## 3.5.0
+
+## 3.4.2 (2024-03-09)
+
+Fixes:
+
+- In `\begin{markdown}[options]`, allow a new line before `options`.
+ (#414, #415)
+
+Contributed Software:
+
+- Add `contributions/istqb_product_base`. (8e727c9b)
+- Add `contributions/fithesis`. (0b6a436c, 0725b20c, 7daf2b5e)
+
## 3.4.1 (2024-02-16)
Fixes:
@@ -10,11 +24,10 @@ Fixes:
Deprecation:
-- Replace all instances of `\markdownInfo`, `\markdownWarning`, and
- `\markdownError` with l3msg functions and deprecate `\markdownInfo`,
- `\markdownWarning`, and `\markdownError`. (#383, #398, e3ca682c, 48002f84)
+- Replace `\markdownInfo`, `\markdownWarning`, and `\markdownError` with l3msg
+ functions and deprecate them. (#383, #398, e3ca682c, 48002f84)
- Use the `TEXMF_OUTPUT_DIRECTORY` environmental variable to set
- `\markdownOptionOutputDir` and deprecate `\markdownOptionOutputDir`.
+ `\markdownOptionOutputDir` and deprecate it.
(#405, #409, [matrix.org][matrix-405])
[matrix-405]: https://matrix.to/#/!efVbynJpCMjlOTfose:matrix.org/$8oUA2Bn3ch3q9K6RU-1EgpO9uQOd_3Mky4YwT325Ib0?via=matrix.org&via=im.f3l.de
diff --git a/Master/texmf-dist/doc/generic/markdown/VERSION b/Master/texmf-dist/doc/generic/markdown/VERSION
index 941a04710b1..7fba28f70e4 100644
--- a/Master/texmf-dist/doc/generic/markdown/VERSION
+++ b/Master/texmf-dist/doc/generic/markdown/VERSION
@@ -1 +1 @@
-3.4.1-0-g457226ae (2024-02-16)
+3.4.2-0-ga45cf0ed (2024-03-09)
diff --git a/Master/texmf-dist/doc/generic/markdown/markdown.html b/Master/texmf-dist/doc/generic/markdown/markdown.html
index a9235283635..a5616317fcd 100644
--- a/Master/texmf-dist/doc/generic/markdown/markdown.html
+++ b/Master/texmf-dist/doc/generic/markdown/markdown.html
@@ -93,7 +93,7 @@
<header id="title-block-header">
<h1 class="title">Markdown Package User Manual</h1>
<p class="author">Vít Starý Novotný</p>
-<p class="date">3.4.1-0-g457226ae 2024-02-16</p>
+<p class="date">3.4.2-0-ga45cf0ed 2024-03-09</p>
</header>
<nav id="TOC" role="doc-toc">
<ul>
@@ -212,7 +212,7 @@ which contains the latest development version of the Markdown package,
or a <span class="tex">T<sub>e</sub>X</span> distribution: <a
href="https://www.tug.org/texlive/"
title="TeX Live - TeX Users Group"><span
-class="tex">T<sub>e</sub>X</span> Live</a> ≥ 2020 is known to work with
+class="tex">T<sub>e</sub>X</span> Live</a> ≥ 2022 is known to work with
the current version of the Markdown package and so are recent versions
of <a href="https://miktex.org/" title="Home - MiKTeXorg">Mik<span
class="tex">T<sub>e</sub>X</span></a>. If you are using an older,
diff --git a/Master/texmf-dist/doc/generic/markdown/markdown.pdf b/Master/texmf-dist/doc/generic/markdown/markdown.pdf
index a5d91a23272..34822a723fa 100644
--- a/Master/texmf-dist/doc/generic/markdown/markdown.pdf
+++ b/Master/texmf-dist/doc/generic/markdown/markdown.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/markdown/examples/latex-luatex.tex b/Master/texmf-dist/doc/latex/markdown/examples/latex-luatex.tex
index 9b2e6234080..5aa7c85d7d6 100644
--- a/Master/texmf-dist/doc/latex/markdown/examples/latex-luatex.tex
+++ b/Master/texmf-dist/doc/latex/markdown/examples/latex-luatex.tex
@@ -1,15 +1,5 @@
\documentclass{book}
\usepackage{polyglossia}
-% work around a bug in polyglossia
-\makeatletter
-\ExplSyntaxOn
-\pretocmd\xpg@set@alias@values{%
- \prop_if_exist:cF { xpg@alias@keyvals@#1@#4 }
- { \prop_new:c {xpg@alias@keyvals@#1@#4} }
-}{}{}
-\ExplSyntaxOff
-\makeatother
-% end of workaround
\setmainlanguage{english}
\usepackage{fontspec}
\usepackage{booktabs}
diff --git a/Master/texmf-dist/doc/latex/markdown/examples/latex-xetex.tex b/Master/texmf-dist/doc/latex/markdown/examples/latex-xetex.tex
index 9b2e6234080..5aa7c85d7d6 100644
--- a/Master/texmf-dist/doc/latex/markdown/examples/latex-xetex.tex
+++ b/Master/texmf-dist/doc/latex/markdown/examples/latex-xetex.tex
@@ -1,15 +1,5 @@
\documentclass{book}
\usepackage{polyglossia}
-% work around a bug in polyglossia
-\makeatletter
-\ExplSyntaxOn
-\pretocmd\xpg@set@alias@values{%
- \prop_if_exist:cF { xpg@alias@keyvals@#1@#4 }
- { \prop_new:c {xpg@alias@keyvals@#1@#4} }
-}{}{}
-\ExplSyntaxOff
-\makeatother
-% end of workaround
\setmainlanguage{english}
\usepackage{fontspec}
\usepackage{booktabs}
diff --git a/Master/texmf-dist/scripts/markdown/markdown-cli.lua b/Master/texmf-dist/scripts/markdown/markdown-cli.lua
index 32a8753873e..8e1b5d667af 100644
--- a/Master/texmf-dist/scripts/markdown/markdown-cli.lua
+++ b/Master/texmf-dist/scripts/markdown/markdown-cli.lua
@@ -58,7 +58,7 @@
-- those in the standard .ins files.
--
local metadata = {
- version = "3.4.1-0-g457226ae",
+ version = "3.4.2-0-ga45cf0ed",
comment = "A module for the conversion from markdown to plain TeX",
author = "John MacFarlane, Hans Hagen, Vít Starý Novotný",
copyright = {"2009-2016 John MacFarlane, Hans Hagen",
diff --git a/Master/texmf-dist/source/generic/markdown/markdown.dtx b/Master/texmf-dist/source/generic/markdown/markdown.dtx
index 26b5db62f10..5ce5a6496e1 100644
--- a/Master/texmf-dist/source/generic/markdown/markdown.dtx
+++ b/Master/texmf-dist/source/generic/markdown/markdown.dtx
@@ -938,7 +938,7 @@ Requirements
The package requires either [our official Docker image][docker], which contains
the latest development version of the Markdown package, or a \TeX{}
-distribution: [\TeX{} Live][tl] ≥ 2020 is known to work with the current
+distribution: [\TeX{} Live][tl] ≥ 2022 is known to work with the current
version of the Markdown package and so are recent versions of [Mik\TeX{}][mik].
If you are using an older, incomplete, or atypical \TeX{} distribution, please
consult the [technical documentation][techdoc] for a detailed list of
@@ -33732,7 +33732,7 @@ end
% \end{markdown}
% \begin{macrocode}
\peek_regex_replace_once:nnF
- { \ *\[([^]]*)\][^\r]* }
+ { \ *\[\r*([^]]*)\][^\r]* }
{
% \end{macrocode}
% \begin{markdown}
diff --git a/Master/texmf-dist/tex/generic/markdown/markdown.tex b/Master/texmf-dist/tex/generic/markdown/markdown.tex
index 3f692d579e8..39d77c941de 100644
--- a/Master/texmf-dist/tex/generic/markdown/markdown.tex
+++ b/Master/texmf-dist/tex/generic/markdown/markdown.tex
@@ -572,8 +572,8 @@
{ boolean }
{ true }
\ExplSyntaxOff
-\def\markdownLastModified{2024-02-16}%
-\def\markdownVersion{3.4.1-0-g457226ae}%
+\def\markdownLastModified{2024-03-09}%
+\def\markdownVersion{3.4.2-0-ga45cf0ed}%
\let\markdownBegin\relax
\let\markdownEnd\relax
\let\markdownInput\relax
diff --git a/Master/texmf-dist/tex/latex/markdown/markdown.sty b/Master/texmf-dist/tex/latex/markdown/markdown.sty
index 4f2bcd4bdba..5bafe4bfb11 100644
--- a/Master/texmf-dist/tex/latex/markdown/markdown.sty
+++ b/Master/texmf-dist/tex/latex/markdown/markdown.sty
@@ -96,7 +96,7 @@
\char_set_catcode_active:n { 13 }
\char_set_catcode_letter:n { 35 }
\peek_regex_replace_once:nnF
- { \ *\[([^]]*)\][^\r]* }
+ { \ *\[\r*([^]]*)\][^\r]* }
{
\c { group_end: }
\c { tl_set_rescan:Nnn } \c { l_tmpa_tl } { } { \1 }
diff --git a/Master/texmf-dist/tex/luatex/markdown/markdown.lua b/Master/texmf-dist/tex/luatex/markdown/markdown.lua
index fce3c1fe827..37448b4503a 100644
--- a/Master/texmf-dist/tex/luatex/markdown/markdown.lua
+++ b/Master/texmf-dist/tex/luatex/markdown/markdown.lua
@@ -58,7 +58,7 @@
-- those in the standard .ins files.
--
local metadata = {
- version = "3.4.1-0-g457226ae",
+ version = "3.4.2-0-ga45cf0ed",
comment = "A module for the conversion from markdown to plain TeX",
author = "John MacFarlane, Hans Hagen, Vít Starý Novotný",
copyright = {"2009-2016 John MacFarlane, Hans Hagen",