texlive[65051] Master/texmf-dist: disable \index and \label in

[commits+karl at tug.org]

Revision: 65051
          http://tug.org/svn/texlive?view=revision&revision=65051
Author:   karl
Date:     2022-11-18 23:16:57 +0100 (Fri, 18 Nov 2022)
Log Message:
-----------
disable \index and \label in \caption from caption.sty, tex4ht r1242

Revision Links:
--------------
    http://tug.org/svn/texlive?view=revision&revision=1242

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/nameref.4ht

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2022-11-18 21:03:23 UTC (rev 65050)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2022-11-18 22:16:57 UTC (rev 65051)
@@ -1,3 +1,8 @@
+2022-11-18  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-4ht.tex (nameref.4ht): disable \index and \label commands
+	in Caption's package version of \caption.
+	
 2022-11-17  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-4ht.tex (

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2022-11-18 21:03:23 UTC (rev 65050)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2022-11-18 22:16:57 UTC (rev 65051)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1241 2022-11-17 18:48:36Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1242 2022-11-18 22:04:51Z michal_h21 $
 % tex tex4ht-4ht   or   ht tex tex4ht-4ht
 %
 % Copyright 2009-2022 TeX Users Group    
@@ -3549,7 +3549,13 @@
 \@ifpackageloaded{caption}{
   \pend:defIII\caption at beginex{%
     \gdef\NR:Type{\@currenvir}%
-    \gdef\NR:Title{\a:newlabel{##2}}%
+    % handle \label and \index in Caption's package
+    % version of \caption
+    \begingroup%
+    \let\index\:gobble%
+    \let\label\:gobble%
+    \protected at xdef\NR:Title{\a:newlabel{##2}}%
+    \endgroup%
   }
 }{}
 

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/nameref.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/nameref.4ht	2022-11-18 21:03:23 UTC (rev 65050)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/nameref.4ht	2022-11-18 22:16:57 UTC (rev 65051)
@@ -1,4 +1,4 @@
-% nameref.4ht (2022-07-05-14:35), generated from tex4ht-4ht.tex
+% nameref.4ht (2022-11-18-14:11), generated from tex4ht-4ht.tex
 % Copyright 2005-2009 Eitan M. Gurari
 % Copyright 2009-2022 TeX Users Group
 %
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2022-07-05-14:35}
+\immediate\write-1{version 2022-11-18-14:11}
 
    \let\NR:Type\relax
 \let\ltx at label\label
@@ -138,7 +138,13 @@
 \@ifpackageloaded{caption}{
   \pend:defIII\caption at beginex{%
     \gdef\NR:Type{\@currenvir}%
-    \gdef\NR:Title{\a:newlabel{##2}}%
+    % handle \label and \index in Caption's package
+    % version of \caption
+    \begingroup%
+    \let\index\:gobble%
+    \let\label\:gobble%
+    \protected at xdef\NR:Title{\a:newlabel{##2}}%
+    \endgroup%
   }
 }{}