[tex4ht-commits] [SCM] tex4ht updated: r1305 - trunk/lit

[Michal Hoftich]

Author: michal_h21
Date: 2023-03-10 16:01:24 +0000 (Fri, 10 Mar 2023)
New Revision: 1305

Modified:
   trunk/lit/ChangeLog
   trunk/lit/tex4ht-4ht.tex
Log:
Fixed clash between xr and cleveref

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2023-03-07 12:50:09 UTC (rev 1304)
+++ trunk/lit/ChangeLog	2023-03-10 16:01:24 UTC (rev 1305)
@@ -1,3 +1,10 @@
+2023-03-10  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-4ht.tex (xr.4ht,  xr-hyper.4ht, cleveref.4ht): fixed clash
+	between Cleveref and Xr.
+	https://github.com/michal-h21/make4ht/issues/113
+	https://tex.stackexchange.com/q/678730/2891
+
 2023-03-07  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-4ht.tex (physics.4ht): fixed MathML issues with the Physics

Modified: trunk/lit/tex4ht-4ht.tex
===================================================================
--- trunk/lit/tex4ht-4ht.tex	2023-03-07 12:50:09 UTC (rev 1304)
+++ trunk/lit/tex4ht-4ht.tex	2023-03-10 16:01:24 UTC (rev 1305)
@@ -3631,7 +3631,7 @@
 
 \<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 @@
 \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 at getlabel{#2}{\@templabel}%
   #1{\@templabel}{}{}%
@@ -3845,7 +3846,7 @@
 
 \<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 @@
 \`'-'. 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 at prefix#2\endcsname{\XR:rEfLiNK #3}%
+\regex_match:nnTF{@cref}{#2}% we must handle cleveref meta references
+{\expandafter\xdef\csname r@\XR at prefix#2\endcsname{#3}}%
+{\expandafter\xdef\csname r@\XR at prefix#2\endcsname{\XR:rEfLiNK #3}}%
 >>>
 
 \<fix xr\><<<
+\ExplSyntaxOn
 \long\def\XR at test#1#2#3#4\XR@{%
   \ifx#1\newlabel
      |<xr newlabel|>%
@@ -3946,6 +3953,7 @@
   \fi\fi
   \ifeof\@inputcheck\expandafter\XR at aux
   \else\expandafter\XR at read\fi}
+\ExplSyntaxOff
 >>>
 
 %%%%%%%%%%%%%%%%%%%%%
@@ -3954,7 +3962,7 @@
 
 \<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|>