texlive[72825] Master/texmf-dist: declare caption hooks only if

[commits+karl at tug.org]

Revision: 72825
          https://tug.org/svn/texlive?view=revision&revision=72825
Author:   karl
Date:     2024-11-11 23:25:14 +0100 (Mon, 11 Nov 2024)
Log Message:
-----------
declare caption hooks only if undefined, tex4ht r1595

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

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

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2024-11-11 21:17:35 UTC (rev 72824)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2024-11-11 22:25:14 UTC (rev 72825)
@@ -1,3 +1,9 @@
+2024-11-10  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-4ht.tex (caption.4ht): declare caption hooks only if they
+	are undefined.
+	https://tex.stackexchange.com/a/730529/2891
+
 2024-11-05  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	2024-11-11 21:17:35 UTC (rev 72824)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2024-11-11 22:25:14 UTC (rev 72825)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1594 2024-11-05 10:24:06Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1595 2024-11-10 19:20:38Z michal_h21 $
 % tex tex4ht-4ht   or   ht tex tex4ht-4ht
 %
 % Copyright 2009-2024 TeX Users Group    
@@ -13040,8 +13040,10 @@
 commands would cause compilation errors.
 
 \<caption redefine makecaption\><<<
+\ifdefined\cptA:\else
 \c:def\cptA:{}\c:def\cptB:{}%
 \c:def\cptC:{}\c:def\cptD:{}
+\fi
 >>>
 
 Handle redefined caption command. We ignore the second parameter of

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/caption.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/caption.4ht	2024-11-11 21:17:35 UTC (rev 72824)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/caption.4ht	2024-11-11 22:25:14 UTC (rev 72825)
@@ -1,4 +1,4 @@
-% caption.4ht (2024-10-18-14:47), generated from tex4ht-4ht.tex
+% caption.4ht (2024-11-11-13:40), generated from tex4ht-4ht.tex
 % Copyright 2007-2009 Eitan M. Gurari
 % Copyright 2009-2024 TeX Users Group
 %
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2024-10-18-14:47}
+\immediate\write-1{version 2024-11-11-13:40}
 
 \let\sv:toclof\toclof
 \def\toclof#1#2#3{%
@@ -45,8 +45,10 @@
    }\fi%
 }
 
+\ifdefined\cptA:\else
 \c:def\cptA:{}\c:def\cptB:{}%
 \c:def\cptC:{}\c:def\cptD:{}
+\fi
 \long\def\@makecaption#1#2{%
   \xdef\continuedfloat at captype{\@captype}%
   \caption at make@above%