From 7ce7341b5bebbf6b62b2ea39b4db2d8b7ab10f4d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 18 May 2022 19:50:21 +0000 Subject: markdown (18may22) git-svn-id: svn://tug.org/texlive/trunk@63328 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/markdown/markdown.sty | 53 ++++++++++++++++------ .../markdown/markdownthemewitiko_graphicx_http.sty | 1 + 2 files changed, 40 insertions(+), 14 deletions(-) (limited to 'Master/texmf-dist/tex/latex') 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"; -- cgit v1.2.3