summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-11-18 22:16:57 +0000
committerKarl Berry <karl@freefriends.org>2022-11-18 22:16:57 +0000
commitc2f6ebcc05b7cd544d84470590da6b7a7df0e053 (patch)
treee8a763d8e9f5f513cdcf8972d6e338174871726c /Master
parent66b84fd5d0def0dd37fe3b45fe7dbcdad3853c35 (diff)
disable \index and \label in \caption from caption.sty, tex4ht r1242
git-svn-id: svn://tug.org/texlive/trunk@65051 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog5
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex10
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/nameref.4ht12
3 files changed, 22 insertions, 5 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 28e098577fb..36d060f7846 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,8 @@
+2022-11-18 Michal Hoftich <michal.h21@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@gmail.com>
* tex4ht-4ht.tex (
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index f846cebdac2..21a4f041b8e 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 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 @@ definitions.
\@ifpackageloaded{caption}{
\pend:defIII\caption@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@xdef\NR:Title{\a:newlabel{##2}}%
+ \endgroup%
}
}{}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/nameref.4ht b/Master/texmf-dist/tex/generic/tex4ht/nameref.4ht
index ef6805f0a54..359cedcf4c6 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/nameref.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/nameref.4ht
@@ -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@label\label
@@ -138,7 +138,13 @@
\@ifpackageloaded{caption}{
\pend:defIII\caption@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@xdef\NR:Title{\a:newlabel{##2}}%
+ \endgroup%
}
}{}