texlive[71043] Master/texmf-dist: label handling in tcolorbox, tex4ht

[commits+karl at tug.org]

Revision: 71043
          https://tug.org/svn/texlive?view=revision&revision=71043
Author:   karl
Date:     2024-04-23 19:44:59 +0200 (Tue, 23 Apr 2024)
Log Message:
-----------
label handling in tcolorbox, tex4ht r1506-7

Revision Links:
--------------
    https://tug.org/svn/texlive?view=revision&revision=1506

Modified Paths:
--------------
    trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
    trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
    trunk/Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2024-04-23 16:13:31 UTC (rev 71042)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2024-04-23 17:44:59 UTC (rev 71043)
@@ -1,3 +1,8 @@
+2024-04-22  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-4ht.tex (tcolorbox.4ht): fixed handling of labels in
+	Tcolorbox.
+
 2024-04-21  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-fonts-noncjk.tex (

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2024-04-23 16:13:31 UTC (rev 71042)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2024-04-23 17:44:59 UTC (rev 71043)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1504 2024-04-19 15:48:03Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1507 2024-04-22 13:28:48Z michal_h21 $
 % tex tex4ht-4ht   or   ht tex tex4ht-4ht
 %
 % Copyright 2009-2024 TeX Users Group    
@@ -28823,6 +28823,7 @@
 % use custom counter that increments for every \tcolorbox
 \newcounter{:tcbcolcount}
 
+\ExplSyntaxOn
 \def\:tempa{%
   \stepcounter{:tcbcolcount}%
   % save text and background colors for use in CSS
@@ -28838,8 +28839,9 @@
   % set label if it exists
   \ifdefined\tcolorbox:label:key%
     \let\@currentlabel\tcolorbox:currentlabel% at this moment, \@currentlabel has wrong value
-    \o:tcb at set@label:{\tcolorbox:label:key}%
+    %\o:tcb at set@label:{\tcolorbox:label:key}%
     \AnchorLabel% save cross-ref destination
+    \o:__tcobox_label:n:{\tcolorbox:label:key}%
     \global\let\tcolorbox:label:key\undefined% 
   \fi%
   % open title
@@ -28862,6 +28864,7 @@
   \fi%
   % We need to close box in \tcb at endboxanddraw
 }
+\ExplSyntaxOff
 
 \HLet\tcb at drawcolorbox\:tempa
 % overwrite other versions of box drawing macros
@@ -28907,8 +28910,14 @@
   \xdef\tcolorbox:label:key{#1}%
   \global\let\tcolorbox:currentlabel\@currentlabel%
 }
-\HLet\tcb at set@label\:tempa
 
+\ExplSyntaxOn
+%\HLet\tcb at set@label\:tempa
+\HLet\__tcobox_label_label:n\:tempa
+\HLet\__tcobox_label_zlabel:n\:tempa
+\HLet\__tcobox_label:n\:tempa
+\ExplSyntaxOff
+
 |<tcolorbox minipage|>
 |<tcolorbox nameref|>
 

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht	2024-04-23 16:13:31 UTC (rev 71042)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht	2024-04-23 17:44:59 UTC (rev 71043)
@@ -1,4 +1,4 @@
-% tcolorbox.4ht (2024-04-20-08:15), generated from tex4ht-4ht.tex
+% tcolorbox.4ht (2024-04-23-10:44), generated from tex4ht-4ht.tex
 % Copyright 2020-2024 TeX Users Group
 %
 % This work may be distributed and/or modified under the
@@ -16,12 +16,13 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2024-04-20-08:15}
+\immediate\write-1{version 2024-04-23-10:44}
 
 
 % use custom counter that increments for every \tcolorbox
 \newcounter{:tcbcolcount}
 
+\ExplSyntaxOn
 \def\:tempa{%
   \stepcounter{:tcbcolcount}%
   % save text and background colors for use in CSS
@@ -37,8 +38,9 @@
   % set label if it exists
   \ifdefined\tcolorbox:label:key%
     \let\@currentlabel\tcolorbox:currentlabel% at this moment, \@currentlabel has wrong value
-    \o:tcb at set@label:{\tcolorbox:label:key}%
+    %\o:tcb at set@label:{\tcolorbox:label:key}%
     \AnchorLabel% save cross-ref destination
+    \o:__tcobox_label:n:{\tcolorbox:label:key}%
     \global\let\tcolorbox:label:key\undefined%
   \fi%
   % open title
@@ -61,6 +63,7 @@
   \fi%
   % We need to close box in \tcb at endboxanddraw
 }
+\ExplSyntaxOff
 
 \HLet\tcb at drawcolorbox\:tempa
 % overwrite other versions of box drawing macros
@@ -106,8 +109,14 @@
   \xdef\tcolorbox:label:key{#1}%
   \global\let\tcolorbox:currentlabel\@currentlabel%
 }
-\HLet\tcb at set@label\:tempa
 
+\ExplSyntaxOn
+%\HLet\tcb at set@label\:tempa
+\HLet\__tcobox_label_label:n\:tempa
+\HLet\__tcobox_label_zlabel:n\:tempa
+\HLet\__tcobox_label:n\:tempa
+\ExplSyntaxOff
+
 \pend:def\tcb at minipage{\SaveEndP}
 \pend:def\tcb at minipage@top{\SaveEndP}
 \pend:def\tcb at minipage@bottom{\SaveEndP}