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

[michal_h21 at gnu.org.ua]

Author: michal_h21
Date: 2019-12-19 16:14:23 +0200 (Thu, 19 Dec 2019)
New Revision: 643

Modified:
   trunk/lit/ChangeLog
   trunk/lit/tex4ht-4ht.tex
Log:
Check for empty caption label

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2019-12-19 11:39:59 UTC (rev 642)
+++ trunk/lit/ChangeLog	2019-12-19 14:14:23 UTC (rev 643)
@@ -3,7 +3,26 @@
 	* tex4ht-4ht.tex (usepackage.4ht): prevent the Caption package from patching
 	other packages. This can clash with TeX4ht configurations.
 	https://tex.stackexchange.com/a/520996/2891
+	* tex4ht-4ht.tex (
+	aa.4ht,
+	acm_proc_article-sp.4ht,
+	amsart.4ht,
+	amsbook.4ht,
+	amsproc.4ht,
+	article.4ht,
+	book.4ht,
+	elsart.4ht,
+	listings.4ht,
+	longtable.4ht,
+	mwart.4ht,
+	mwbk.4ht,
+	mwrep.4ht,
+	report.4ht,
+	revtex4.4ht,
+	scrbook.4ht,
+	scrreprt.4ht): Don't print caption label separator when the labels is empty.
 
+
 2019-12-17 Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-html4.tex (html4.4ht): fixed CSS code for \cmidrule from Booktabs

Modified: trunk/lit/tex4ht-4ht.tex
===================================================================
--- trunk/lit/tex4ht-4ht.tex	2019-12-19 11:39:59 UTC (rev 642)
+++ trunk/lit/tex4ht-4ht.tex	2019-12-19 14:14:23 UTC (rev 643)
@@ -9275,7 +9275,7 @@
 \HLet\LT at caption\:tempc
 \def\:tempc#1#2#3{%
   \LT at mcol\LT at cols c{\hbox{\parbox[t]\LTcapwidth{%
-       \cptA: #1{\cap:ref{#2}}\cptB:\cptC:#3\cptD:
+      \cptA: #1{\cap:ref{#2}}\if :#1:\else\cptB:\fi\cptC:#3\cptD:
     \endgraf\vskip\baselineskip}}}}
 \HLet\LT at makecaption\:tempc
 >>>
@@ -10448,7 +10448,7 @@
 \NewConfigure{caption}[4]{\c:def\cptA:{#1}\c:def\cptB:{#2}%
    \c:def\cptC:{#3}\c:def\cptD:{#4}}
 \long\def\@makecaption#1#2{%   |%\:makecaption|%
-   {\cptA: |<caption and ref/tag|>\cptB:}{\cptC:{#2}\cptD:}}
+{\cptA: |<caption and ref/tag|>\if :#1:\else\cptB:\fi}{\cptC:{#2}\cptD:}}
 >>>
 
 \<write caption to toc\><<<
@@ -15089,7 +15089,7 @@
      \small\rmfamily 
      \flushing 
      \let\footnote\@footnotemark at gobble 
-     {\cptA: \cap:ref{#1}\cptB:}{\cptC:{#2}\cptD:}
+   {\cptA: \cap:ref{#1}\if :#1:\else\cptB:\fi}{\cptC:{#2}\cptD:}
   \endgroup 
   \par
 }
@@ -15570,7 +15570,7 @@
    \c:def\cptC:{#3}\c:def\cptD:{#4}}
 \long\def\@makecaption#1#2{%   
    {\cptA: \cap:ref{#1}%
-\cptB:}{\cptC:{#2}\cptD:}}
+ \if :#1:\else\cptB:\fi}{\cptC:{#2}\cptD:}}
 
 \pend:def\caption{\SkipRefstepAnchor}
 
@@ -16641,7 +16641,7 @@
    \c:def\cptC:{#3}\c:def\cptD:{#4}}
 \long\def\@makecaption#1#2{%   
    {\cptA: \cap:ref{#1}%
-\cptB:}{\cptC:{#2}\cptD:}}
+ \if :#1:\else\cptB:\fi}{\cptC:{#2}\cptD:}}
 
 \pend:def\caption{\SkipRefstepAnchor}
 \append:def\quote{\par\@totalleftmargin\z@}
@@ -16714,7 +16714,7 @@
    \c:def\cptC:{#3}\c:def\cptD:{#4}}
 \long\def\@makecaption#1#2{%   
    {\cptA: \cap:ref{#1}%
-\cptB:}{\cptC:{#2}\cptD:}}
+ \if :#1:\else\cptB:\fi}{\cptC:{#2}\cptD:}}
 
 \pend:def\caption{\SkipRefstepAnchor}
 \append:def\quote{\par\@totalleftmargin\z@}
@@ -17047,10 +17047,10 @@
 |<elsart sup|>
 \def\@makecaption{\@makefigurecaption}
 \long\def\@makefigurecaption#1#2{%  
-   {\cptA: |<caption and ref/tag|>\cptB:}{\cptC:{#2}\cptD:}}
+{\cptA: |<caption and ref/tag|>\if :#1:\else\cptB:\fi}{\cptC:{#2}\cptD:}}
 \long\def\@maketablecaption#1#2{\@tablecaptionsize
     \global \@minipagefalse
-    \hbox{{\cptA: |<caption and ref/tag|>\cptB:}{\cptC:{#2}\cptD:}}}
+\hbox{{\cptA: |<caption and ref/tag|>\if :#1:\else\cptB:\fi}{\cptC:{#2}\cptD:}}}
 >>>
 
 \<elsart sup\><<<
@@ -29505,7 +29505,7 @@
 get correct cross-references. There were duplicate IDs sometimes.
 
 \<listings sty\><<<
-\def\lst at makecaption#1#2{\cptA: #1\cptB: \cptC: #2\cptD:}
+\def\lst at makecaption#1#2{\cptA: #1\if :#1:\else\cptB:\fi \cptC: #2\cptD:}
 >>>
 
 I don't know why there used to be clearing of math environment, it