From 45d62c355885e905db2a729761eb384ec447e931 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 18 Feb 2024 21:05:58 +0000 Subject: markdown (18feb24) git-svn-id: svn://tug.org/texlive/trunk@69962 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/markdown/examples/example.md | 16 ++++------------ .../doc/latex/markdown/examples/latex-luatex.tex | 16 +++++++++++++--- .../doc/latex/markdown/examples/latex-pdftex.tex | 10 +++++----- .../doc/latex/markdown/examples/latex-tex4ht.tex | 10 +++++----- .../doc/latex/markdown/examples/latex-xetex.tex | 16 +++++++++++++--- 5 files changed, 40 insertions(+), 28 deletions(-) (limited to 'Master/texmf-dist/doc/latex/markdown') diff --git a/Master/texmf-dist/doc/latex/markdown/examples/example.md b/Master/texmf-dist/doc/latex/markdown/examples/example.md index 8819ef5b672..5e5457088ed 100644 --- a/Master/texmf-dist/doc/latex/markdown/examples/example.md +++ b/Master/texmf-dist/doc/latex/markdown/examples/example.md @@ -41,9 +41,7 @@ This is a table: This is a bullet list: -* The first item of a bullet list - - that spans several paragraphs, +* The first item of a bullet list, * the second item of a bullet list, @@ -57,9 +55,7 @@ This is a compact bullet list: This is an ordered list: -5. The first item of an ordered list - - that spans several paragraphs, +5. The first item of an ordered list, 6. the second item of an ordered list, @@ -67,9 +63,7 @@ This is an ordered list: This is a fancy ordered list: -e) The first item of an ordered list - - that spans several paragraphs, +e) The first item of an ordered list, f) the second item of an ordered list, @@ -77,9 +71,7 @@ g) the third item of an ordered list. This is an ordered list using hash enumerators: -#. The first item of an ordered list - - that spans several paragraphs, +#. The first item of an ordered list, #. the second item of an ordered list, 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 18b16bf7769..9b2e6234080 100644 --- a/Master/texmf-dist/doc/latex/markdown/examples/latex-luatex.tex +++ b/Master/texmf-dist/doc/latex/markdown/examples/latex-luatex.tex @@ -1,5 +1,15 @@ \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} @@ -28,13 +38,13 @@ texMathSingleBackslash, ]{markdown} % Set the document metadata using a YAML metadata block. -\begin{markdown*}{hybrid} +\begin{markdown}[hybrid] --- title: An Example *Markdown* Document -author: Vít Novotný +author: Vít Starý Novotný date: \today --- -\end{markdown*} +\end{markdown} \begin{document} % Typeset the document `example.md` by letting the Markdown package handle % the conversion internally. diff --git a/Master/texmf-dist/doc/latex/markdown/examples/latex-pdftex.tex b/Master/texmf-dist/doc/latex/markdown/examples/latex-pdftex.tex index db6cbea8c80..7d188d75f25 100644 --- a/Master/texmf-dist/doc/latex/markdown/examples/latex-pdftex.tex +++ b/Master/texmf-dist/doc/latex/markdown/examples/latex-pdftex.tex @@ -29,13 +29,13 @@ texMathSingleBackslash, ]{markdown} % Set the document metadata using a YAML metadata block. -\begin{markdown*}{hybrid} +\begin{markdown}[hybrid] --- title: An Example *Markdown* Document -author: Vít Novotný +author: Vít Starý Novotný date: \today --- -\end{markdown*} +\end{markdown} \begin{document} % Typeset the document `example.md` by letting the Markdown package handle % the conversion internally. @@ -55,7 +55,7 @@ date: \today Here are some non-ASCII characters: *ěščřžýáíé*. \end{markdown} -\begin{markdown*}{html, hybrid} +\begin{markdown}[hybrid] Here is some HTML code mixed *with Markdown*. In \TeX, the HTML code will be silently ignored, whereas in \TeX 4ht, the HTML code will be passed through to the output: @@ -72,5 +72,5 @@ through to the output: 10 -\end{markdown*} +\end{markdown} \end{document} diff --git a/Master/texmf-dist/doc/latex/markdown/examples/latex-tex4ht.tex b/Master/texmf-dist/doc/latex/markdown/examples/latex-tex4ht.tex index db6cbea8c80..7d188d75f25 100644 --- a/Master/texmf-dist/doc/latex/markdown/examples/latex-tex4ht.tex +++ b/Master/texmf-dist/doc/latex/markdown/examples/latex-tex4ht.tex @@ -29,13 +29,13 @@ texMathSingleBackslash, ]{markdown} % Set the document metadata using a YAML metadata block. -\begin{markdown*}{hybrid} +\begin{markdown}[hybrid] --- title: An Example *Markdown* Document -author: Vít Novotný +author: Vít Starý Novotný date: \today --- -\end{markdown*} +\end{markdown} \begin{document} % Typeset the document `example.md` by letting the Markdown package handle % the conversion internally. @@ -55,7 +55,7 @@ date: \today Here are some non-ASCII characters: *ěščřžýáíé*. \end{markdown} -\begin{markdown*}{html, hybrid} +\begin{markdown}[hybrid] Here is some HTML code mixed *with Markdown*. In \TeX, the HTML code will be silently ignored, whereas in \TeX 4ht, the HTML code will be passed through to the output: @@ -72,5 +72,5 @@ through to the output: 10 -\end{markdown*} +\end{markdown} \end{document} 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 18b16bf7769..9b2e6234080 100644 --- a/Master/texmf-dist/doc/latex/markdown/examples/latex-xetex.tex +++ b/Master/texmf-dist/doc/latex/markdown/examples/latex-xetex.tex @@ -1,5 +1,15 @@ \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} @@ -28,13 +38,13 @@ texMathSingleBackslash, ]{markdown} % Set the document metadata using a YAML metadata block. -\begin{markdown*}{hybrid} +\begin{markdown}[hybrid] --- title: An Example *Markdown* Document -author: Vít Novotný +author: Vít Starý Novotný date: \today --- -\end{markdown*} +\end{markdown} \begin{document} % Typeset the document `example.md` by letting the Markdown package handle % the conversion internally. -- cgit v1.2.3