summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
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/source/generic/tex4ht/tex4ht-4ht.tex
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/source/generic/tex4ht/tex4ht-4ht.tex')
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex18
1 files changed, 13 insertions, 5 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index 4d36f3a4723..ffc1469088a 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1304 2023-03-07 12:50:09Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1305 2023-03-10 16:01:24Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2023 TeX Users Group
@@ -3631,7 +3631,7 @@ definitions.
\<cleveref.4ht\><<<
% cleveref.4ht (|version), generated from |jobname.tex
-% Copyright 2018-2022 TeX Users Group
+% Copyright 2018-2023 TeX Users Group
|<TeX4ht license text|>
|<cleveref refstepcounter|>
@@ -3692,6 +3692,7 @@ Support for links from the \Verb|\cref| command.
\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}{}{}%
@@ -3845,7 +3846,7 @@ before \''\begin{document}'.
\<xr.4ht\><<<
% xr.4ht (|version), generated from |jobname.tex
-% Copyright |CopyYear.1997. Eitan M. Gurari
+% Copyright 1997-2023 TeX Users Group
|<TeX4ht copywrite|>
|<fix xr|>
|<fix xr-nonhyper|>
@@ -3933,11 +3934,17 @@ For xref file
\`'-'. The if acts on \`')F1F-' to get the file name. Where the \`'x'
got into the picture? Did \''\aXrefFile' introduced it? where?
+We must also test for references with the @cref suffix - these are automatically
+created by Cleveref and contain meta info about reference types.
+
\<xr 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}}%
>>>
\<fix xr\><<<
+\ExplSyntaxOn
\long\def\XR@test#1#2#3#4\XR@{%
\ifx#1\newlabel
|<xr newlabel|>%
@@ -3946,6 +3953,7 @@ got into the picture? Did \''\aXrefFile' introduced it? where?
\fi\fi
\ifeof\@inputcheck\expandafter\XR@aux
\else\expandafter\XR@read\fi}
+\ExplSyntaxOff
>>>
%%%%%%%%%%%%%%%%%%%%%
@@ -3954,7 +3962,7 @@ got into the picture? Did \''\aXrefFile' introduced it? where?
\<xr-hyper.4ht\><<<
% xr-hyper.4ht (|version), generated from |jobname.tex
-% Copyright |CopyYear.2003. Eitan M. Gurari
+% Copyright 2003-2023 TeX Users Group
|<TeX4ht copywrite|>
|<fix xr|>
|<fix xr-hyper|>