diff options
author | Karl Berry <karl@freefriends.org> | 2022-05-18 19:50:21 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-05-18 19:50:21 +0000 |
commit | 7ce7341b5bebbf6b62b2ea39b4db2d8b7ab10f4d (patch) | |
tree | 2ba34e01c9f48a15224053983d3a7fae8be8781d /Master/texmf-dist/tex | |
parent | 4960cbf54f16e4074db720dd313240cb94b9fe80 (diff) |
markdown (18may22)
git-svn-id: svn://tug.org/texlive/trunk@63328 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
4 files changed, 43 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/generic/markdown/markdown.tex b/Master/texmf-dist/tex/generic/markdown/markdown.tex index bd5c3664aec..fabde3c4b3f 100644 --- a/Master/texmf-dist/tex/generic/markdown/markdown.tex +++ b/Master/texmf-dist/tex/generic/markdown/markdown.tex @@ -471,8 +471,8 @@ { underscores } { true } \ExplSyntaxOff -\def\markdownLastModified{2022/03/31}% -\def\markdownVersion{2.15.0-0-g9296cf1}% +\def\markdownLastModified{2022/05/17}% +\def\markdownVersion{2.15.1-0-g4b33c77}% \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 a6c17ab3c2f..da080d33d5b 100644 --- a/Master/texmf-dist/tex/latex/markdown/markdown.sty +++ b/Master/texmf-dist/tex/latex/markdown/markdown.sty @@ -782,27 +782,52 @@ \catcode`\#=12 \def\next##1##2##3##4{ \endgroup - \tl_set:Nx - \l_tmpa_tl - { \str_range:nnn { ##3 } { 1 } { 1 } } - \str_if_eq:NNTF - \l_tmpa_tl - \c_hash_str + \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 { - \exp_args:No - \markdownLaTeXRendererRelativeLink - { \str_range:nnn { ##3 } { 2 } { -1 } } + \tl_if_empty_p:N + \l_tmpa_tl + } + \bool_if:nTF + { + \l_tmpa_bool && \l_tmpb_bool + } + { + \markdownLaTeXRendererAutolink { ##2 } { ##3 } }{ - \markdownLaTeXRendererAbsoluteLink { ##1 } { ##2 } { ##3 } { ##4 } + \markdownLaTeXRendererDirectOrIndirectLink { ##1 } { ##2 } { ##3 } { ##4 } } } \next } +\def\markdownLaTeXRendererAutolink#1#2{% + \tl_set:Nx + \l_tmpa_tl + { \str_range:nnn { #2 } { 1 } { 1 } } + \str_if_eq:NNTF + \l_tmpa_tl + \c_hash_str + { + \exp_args:No + \ref + { \str_range:nnn { #2 } { 2 } { -1 } } + }{ + \url { #2 } + } +} \ExplSyntaxOff -\def\markdownLaTeXRendererAbsoluteLink#1#2#3#4{% - #1\footnote{\ifx\empty#4\empty\else#4: \fi\texttt<\url{#3}\texttt>}} -\def\markdownLaTeXRendererRelativeLink#1{% - \ref{#1}} +\def\markdownLaTeXRendererDirectOrIndirectLink#1#2#3#4{% + #1\footnote{\ifx\empty#4\empty\else#4: \fi\url{#3}}} \newcount\markdownLaTeXRowCounter \newcount\markdownLaTeXRowTotal \newcount\markdownLaTeXColumnCounter diff --git a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_graphicx_http.sty b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_graphicx_http.sty index 9717c70a537..04d35bba4e0 100644 --- a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_graphicx_http.sty +++ b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_graphicx_http.sty @@ -64,6 +64,7 @@ \edef\filename{\markdown@witiko@graphicx@http@filename}^^A \markdownIfOption{frozenCache}{}{^^A \immediate\write18{^^A + mkdir -p "\markdownOptionCacheDir"; if printf '%s' "#3" | grep -q -E '^https?:'; then OUTPUT_PREFIX="\markdownOptionCacheDir"; diff --git a/Master/texmf-dist/tex/luatex/markdown/markdown.lua b/Master/texmf-dist/tex/luatex/markdown/markdown.lua index 6955982c3f2..3764f5c5b44 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.15.0-0-g9296cf1", + version = "2.15.1-0-g4b33c77", 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", |