diff options
author | Karl Berry <karl@freefriends.org> | 2022-08-30 19:51:52 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-08-30 19:51:52 +0000 |
commit | d838c20c4fdae5db1e2fe6e3e42d17926869fc34 (patch) | |
tree | 9cba77b8c088b5c1c55934fe0e79251ed6008710 /Master/texmf-dist/tex | |
parent | 6fa2c3b0a45621767bde3b18a5ee412d88b39d03 (diff) |
markdown (30aug22)
git-svn-id: svn://tug.org/texlive/trunk@64240 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/markdown/markdown.tex | 14 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/markdown/markdown.sty | 96 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/markdown/markdown.lua | 2 |
3 files changed, 65 insertions, 47 deletions
diff --git a/Master/texmf-dist/tex/generic/markdown/markdown.tex b/Master/texmf-dist/tex/generic/markdown/markdown.tex index 2bf3439aabb..d78e8fcdfaa 100644 --- a/Master/texmf-dist/tex/generic/markdown/markdown.tex +++ b/Master/texmf-dist/tex/generic/markdown/markdown.tex @@ -440,8 +440,8 @@ { boolean } { true } \ExplSyntaxOff -\def\markdownLastModified{2022/08/26}% -\def\markdownVersion{2.16.0-5-g5bb83fb}% +\def\markdownLastModified{2022-08-30}% +\def\markdownVersion{2.16.1-0-gf8a4bea}% \let\markdownBegin\relax \let\markdownEnd\relax \let\markdownInput\relax @@ -2198,9 +2198,11 @@ \begingroup \catcode`|=0% \catcode`\\=12% + \catcode`|&=6% |gdef|markdownInput#1{% |begingroup |catcode`|%=12 + |catcode`|#=12 |markdownIfOption{frozenCache}{% |ifnum|markdownOptionFrozenCacheCounter=0|relax |markdownInfo{Reading frozen cache from @@ -2212,14 +2214,14 @@ |csname markdownFrozenCache|the|markdownOptionFrozenCacheCounter|endcsname |global|advance|markdownOptionFrozenCacheCounter by 1|relax }{% - |markdownInfo{Including markdown document "#1"}% - |openin|markdownInputFileStream#1 + |markdownInfo{Including markdown document "&1"}% + |openin|markdownInputFileStream&1 |closein|markdownInputFileStream |markdownPrepareLuaOptions |markdownLuaExecute{% |markdownPrepare - local file = assert(io.open("#1", "r"), - [[could not open file "#1" for reading]]) + local file = assert(io.open("&1", "r"), + [[could not open file "&1" for reading]]) local input = assert(file:read("*a")) assert(file:close()) print(convert(input:gsub("\r\n?", "\n") .. "\n"))}% diff --git a/Master/texmf-dist/tex/latex/markdown/markdown.sty b/Master/texmf-dist/tex/latex/markdown/markdown.sty index 6f7c8cdbebf..19898298d26 100644 --- a/Master/texmf-dist/tex/latex/markdown/markdown.sty +++ b/Master/texmf-dist/tex/latex/markdown/markdown.sty @@ -426,17 +426,17 @@ { { Default } { . } { OneParen } { ) } - { Period } { - } + { Period } { . } } } \cs_new:Nn \__markdown_latex_fancy_list_item_label:nnn { - \__markdown_latex_fancy_list_item_label_delimiter:n - { #2 } \__markdown_latex_fancy_list_item_label_number:nn { #1 } { #3 } + \__markdown_latex_fancy_list_item_label_delimiter:n + { #2 } } \cs_new:Nn \__markdown_latex_paralist_style:nn @@ -464,7 +464,16 @@ \tl_set:Nn \l__markdown_latex_fancy_list_item_label_delimiter_style_tl { #2 } - \begin{enumerate}[ \__markdown_latex_paralist_style:nn { #1 } { #2 } ] + \tl_set:Nn + \l_tmpa_tl + { \begin{enumerate}[ } + \tl_put_right:Nx + \l_tmpa_tl + { \__markdown_latex_paralist_style:nn { #1 } { #2 } } + \tl_put_right:Nn + \l_tmpa_tl + { ] } + \l_tmpa_tl }, fancyOlEnd = { \end{enumerate} @@ -480,20 +489,29 @@ \tl_set:Nn \l__markdown_latex_fancy_list_item_label_delimiter_style_tl { #2 } - \begin{compactenum}[ \__markdown_latex_paralist_style:nn { #1 } { #2 } ] + \tl_set:Nn + \l_tmpa_tl + { \begin{compactenum}[ } + \tl_put_right:Nx + \l_tmpa_tl + { \__markdown_latex_paralist_style:nn { #1 } { #2 } } + \tl_put_right:Nn + \l_tmpa_tl + { ] } + \l_tmpa_tl }, fancyOlEndTight = { \end{compactenum} \group_end: }, fancyOlItemWithNumber = { - \markdownRendererOlItemWithNumber - { + \item + [ \__markdown_latex_fancy_list_item_label:VVn \l__markdown_latex_fancy_list_item_label_number_style_tl \l__markdown_latex_fancy_list_item_label_delimiter_style_tl { #1 } - } + ] }, dlBeginTight = {\begin{compactdesc}}, dlEndTight = {\end{compactdesc}}}} @@ -558,8 +576,10 @@ }{% \ifthenelse{\equal{#1}{tex}}{% \catcode`\%=14\relax + \catcode`\#=6\relax \input #3\relax \catcode`\%=12\relax + \catcode`\#=12\relax }{% \markdownInput{#3}% }% @@ -624,7 +644,9 @@ \lstinputlisting[language=#2]{#1}% }% }{% + \catcode`\#=6\relax \inputminted{#2}{#1}% + \catcode`\#=12\relax }% \fi}, horizontalRule = {\noindent\rule[0.5ex]{\linewidth}{1pt}}, @@ -923,38 +945,32 @@ \RequirePackage{url} \RequirePackage{expl3} \ExplSyntaxOn -\def\markdownRendererLinkPrototype{ - \begingroup - \catcode`\#=12 - \def\next##1##2##3##4{ - \endgroup - \tl_set:Nn \l_tmpa_tl { ##1 } - \tl_set:Nn \l_tmpb_tl { ##2 } - \bool_set:Nn - \l_tmpa_bool - { - \tl_if_eq_p:NN - \l_tmpa_tl - \l_tmpb_tl - } - \tl_set:Nn \l_tmpa_tl { ##4 } - \bool_set:Nn - \l_tmpb_bool - { - \tl_if_empty_p:N - \l_tmpa_tl - } - \bool_if:nTF - { - \l_tmpa_bool && \l_tmpb_bool - } - { - \markdownLaTeXRendererAutolink { ##2 } { ##3 } - }{ - \markdownLaTeXRendererDirectOrIndirectLink { ##1 } { ##2 } { ##3 } { ##4 } - } - } - \next +\def\markdownRendererLinkPrototype#1#2#3#4{ + \tl_set:Nn \l_tmpa_tl { #1 } + \tl_set:Nn \l_tmpb_tl { #2 } + \bool_set:Nn + \l_tmpa_bool + { + \tl_if_eq_p:NN + \l_tmpa_tl + \l_tmpb_tl + } + \tl_set:Nn \l_tmpa_tl { #4 } + \bool_set:Nn + \l_tmpb_bool + { + \tl_if_empty_p:N + \l_tmpa_tl + } + \bool_if:nTF + { + \l_tmpa_bool && \l_tmpb_bool + } + { + \markdownLaTeXRendererAutolink { #2 } { #3 } + }{ + \markdownLaTeXRendererDirectOrIndirectLink { #1 } { #2 } { #3 } { #4 } + } } \def\markdownLaTeXRendererAutolink#1#2{% \tl_set:Nn diff --git a/Master/texmf-dist/tex/luatex/markdown/markdown.lua b/Master/texmf-dist/tex/luatex/markdown/markdown.lua index 091e7052bb9..79b875ea469 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 = "2.16.0-5-g5bb83fb", + version = "2.16.1-0-gf8a4bea", comment = "A module for the conversion from markdown to plain TeX", author = "John MacFarlane, Hans Hagen, Vít Novotný", copyright = {"2009-2016 John MacFarlane, Hans Hagen", |