summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-03-10 22:36:37 +0000
committerKarl Berry <karl@freefriends.org>2023-03-10 22:36:37 +0000
commit4eb64d65abbae4f82afb54ccf19d2e5eff9f685f (patch)
tree782b37269deca13c92d0aaa5df993f66ae53568b /Master/texmf-dist/tex/generic
parent2ac11e2403561cf84306287bd1bbd2dbc6c0dc8d (diff)
cleveref/xr clash, tex4ht r1305
git-svn-id: svn://tug.org/texlive/trunk@66530 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/cleveref.4ht7
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/xr-hyper.4ht14
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/xr.4ht14
3 files changed, 22 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/cleveref.4ht b/Master/texmf-dist/tex/generic/tex4ht/cleveref.4ht
index a54f2e5d57e..1ffa05dcdf1 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/cleveref.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/cleveref.4ht
@@ -1,5 +1,5 @@
-% cleveref.4ht (2022-11-04-13:31), generated from tex4ht-4ht.tex
-% Copyright 2018-2022 TeX Users Group
+% cleveref.4ht (2023-03-10-14:19), generated from tex4ht-4ht.tex
+% Copyright 2018-2023 TeX Users Group
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -16,7 +16,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2022-11-04-13:31}
+\immediate\write-1{version 2023-03-10-14:19}
@@ -62,6 +62,7 @@
\fi
\def\:tempa#1#2{\bgroup%
\def\rEfLiNK##1##2{\Link{##1}{}}%
+ \def\XRrEfLiNK[##1]##2##3{\Link[##1]{##2}{}}% handle links from Xr and Xr-hyper
\expandafter\expandafter\expandafter\@firstoffive\csname r@#2\endcsname{}{}{}{}{}%
\cref@getlabel{#2}{\@templabel}%
#1{\@templabel}{}{}%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/xr-hyper.4ht b/Master/texmf-dist/tex/generic/tex4ht/xr-hyper.4ht
index bfa0d0e5ce9..b10470531a9 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/xr-hyper.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/xr-hyper.4ht
@@ -1,6 +1,6 @@
-% xr-hyper.4ht (2022-05-23-13:42), generated from tex4ht-4ht.tex
-% Copyright 2003-2009 Eitan M. Gurari
-% Copyright 2009-2022 TeX Users Group
+% xr-hyper.4ht (2023-03-10-14:19), generated from tex4ht-4ht.tex
+% Copyright 2003-2023 TeX Users Group
+% Copyright 2009-2023 TeX Users Group
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2022-05-23-13:42}
+\immediate\write-1{version 2023-03-10-14:19}
\let\XR:loop=\XR@loop
\def\XR@loop#1{%
@@ -42,15 +42,19 @@
\catcode`\:=12
\XR:loop{#1}%
}
+\ExplSyntaxOn
\long\def\XR@test#1#2#3#4\XR@{%
\ifx#1\newlabel
- \expandafter\xdef\csname r@\XR@prefix#2\endcsname{\XR:rEfLiNK #3}%
+ \regex_match:nnTF{@cref}{#2}% we must handle cleveref meta references
+{\expandafter\xdef\csname r@\XR@prefix#2\endcsname{#3}}%
+{\expandafter\xdef\csname r@\XR@prefix#2\endcsname{\XR:rEfLiNK #3}}%
%
\else\ifx#1\@input
\edef\XR@list{\XR@list#2\relax}%
\fi\fi
\ifeof\@inputcheck\expandafter\XR@aux
\else\expandafter\XR@read\fi}
+\ExplSyntaxOff
\def\XRrEfLiNK[#1]#2#3{%
\filename@parse{#1}% Get basename of the linked html file,
diff --git a/Master/texmf-dist/tex/generic/tex4ht/xr.4ht b/Master/texmf-dist/tex/generic/tex4ht/xr.4ht
index 66e4fe0d122..e317a1d7698 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/xr.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/xr.4ht
@@ -1,6 +1,6 @@
-% xr.4ht (2022-04-26-14:00), generated from tex4ht-4ht.tex
-% Copyright 1997-2009 Eitan M. Gurari
-% Copyright 2009-2022 TeX Users Group
+% xr.4ht (2023-03-10-14:19), generated from tex4ht-4ht.tex
+% Copyright 1997-2023 TeX Users Group
+% Copyright 2009-2023 TeX Users Group
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2022-04-26-14:00}
+\immediate\write-1{version 2023-03-10-14:19}
\let\XR:loop=\XR@loop
\def\XR@loop#1{%
@@ -42,15 +42,19 @@
\catcode`\:=12
\XR:loop{#1}%
}
+\ExplSyntaxOn
\long\def\XR@test#1#2#3#4\XR@{%
\ifx#1\newlabel
- \expandafter\xdef\csname r@\XR@prefix#2\endcsname{\XR:rEfLiNK #3}%
+ \regex_match:nnTF{@cref}{#2}% we must handle cleveref meta references
+{\expandafter\xdef\csname r@\XR@prefix#2\endcsname{#3}}%
+{\expandafter\xdef\csname r@\XR@prefix#2\endcsname{\XR:rEfLiNK #3}}%
%
\else\ifx#1\@input
\edef\XR@list{\XR@list#2\relax}%
\fi\fi
\ifeof\@inputcheck\expandafter\XR@aux
\else\expandafter\XR@read\fi}
+\ExplSyntaxOff
\def\XRrEfLiNK[#1]#2#3{%
\filename@parse{#1}% Get basename of the linked html file,