From f06750c2b66723ca874952c7fbc19aba79f5200d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 19 Dec 2019 22:46:21 +0000 Subject: omit caption label separator when caption is empty, tex4ht r643 git-svn-id: svn://tug.org/texlive/trunk@53190 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/tex4ht/aa.4ht | 50 +++++++++----------- .../tex/generic/tex4ht/acm_proc_article-sp.4ht | 50 +++++++++----------- Master/texmf-dist/tex/generic/tex4ht/amsart.4ht | 8 ++-- Master/texmf-dist/tex/generic/tex4ht/amsbook.4ht | 8 ++-- Master/texmf-dist/tex/generic/tex4ht/amsproc.4ht | 8 ++-- Master/texmf-dist/tex/generic/tex4ht/article.4ht | 8 ++-- Master/texmf-dist/tex/generic/tex4ht/book.4ht | 8 ++-- Master/texmf-dist/tex/generic/tex4ht/elsart.4ht | 54 +++++++++------------- Master/texmf-dist/tex/generic/tex4ht/listings.4ht | 8 ++-- Master/texmf-dist/tex/generic/tex4ht/longtable.4ht | 4 +- Master/texmf-dist/tex/generic/tex4ht/mwart.4ht | 6 +-- Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht | 6 +-- Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht | 6 +-- Master/texmf-dist/tex/generic/tex4ht/report.4ht | 8 ++-- Master/texmf-dist/tex/generic/tex4ht/revtex4.4ht | 48 ++++++++----------- Master/texmf-dist/tex/generic/tex4ht/scrbook.4ht | 8 ++-- Master/texmf-dist/tex/generic/tex4ht/scrreprt.4ht | 8 ++-- 17 files changed, 132 insertions(+), 164 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/tex/generic/tex4ht/aa.4ht b/Master/texmf-dist/tex/generic/tex4ht/aa.4ht index 62f3c86004d..f85506ccce8 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/aa.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/aa.4ht @@ -1,31 +1,23 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% aa.4ht 2009-05-21-09:32 % -% Copyright (C) 1999--2009 Eitan M. Gurari % -% % -% This work may be distributed and/or modified under the % -% conditions of the LaTeX Project Public License, either % -% version 1.3c of this license or (at your option) any % -% later version. The latest version of this license is % -% in % -% http://www.latex-project.org/lppl.txt % -% and version 1.3c or later is part of all distributions % -% of LaTeX version 2005/12/01 or later. % -% % -% This work has the LPPL maintenance status "maintained".% -% % -% This Current Maintainer of this work % -% is Eitan M. Gurari. % -% % -% If you modify this program your changing its signature % -% with a directive of the following form will be % -% appreciated. % -% \message{signature} % -% % -% gurari@cse.ohio-state.edu % -% http://www.cse.ohio-state.edu/~gurari % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\immediate\write-1{version 2009-05-21-09:32} - +% aa.4ht 2019-12-19-14:27 % +% Copyright (C) 1999-2009 Eitan M. Gurari % +% Copyright 2009-2019 TeX Users Group +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either +% version 1.3c of this license or (at your option) any +% later version. The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions +% of LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% The Current Maintainer of this work +% is the TeX4ht Project . +% +% If you modify this program, changing the +% version identification would be appreciated. \onecolumn \Configure{UndefinedSec}{likepart} @@ -173,8 +165,8 @@ \NewConfigure{caption}[4]{\c:def\cptA:{#1}\c:def\cptB:{#2}% \c:def\cptC:{#3}\c:def\cptD:{#4}} \long\def\@makecaption#1#2{% - {\cptA: \cap:ref{#1}% -\cptB:}{\cptC:{#2}\cptD:}} +{\cptA: \cap:ref{#1}% +\if :#1:\else\cptB:\fi}{\cptC:{#2}\cptD:}} diff --git a/Master/texmf-dist/tex/generic/tex4ht/acm_proc_article-sp.4ht b/Master/texmf-dist/tex/generic/tex4ht/acm_proc_article-sp.4ht index d8f9199acdc..df255b483d5 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/acm_proc_article-sp.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/acm_proc_article-sp.4ht @@ -1,31 +1,23 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% acm_proc_article-sp.4ht 2009-05-21-09:32 % -% Copyright (C) 2001--2009 Eitan M. Gurari % -% % -% This work may be distributed and/or modified under the % -% conditions of the LaTeX Project Public License, either % -% version 1.3c of this license or (at your option) any % -% later version. The latest version of this license is % -% in % -% http://www.latex-project.org/lppl.txt % -% and version 1.3c or later is part of all distributions % -% of LaTeX version 2005/12/01 or later. % -% % -% This work has the LPPL maintenance status "maintained".% -% % -% This Current Maintainer of this work % -% is Eitan M. Gurari. % -% % -% If you modify this program your changing its signature % -% with a directive of the following form will be % -% appreciated. % -% \message{signature} % -% % -% gurari@cse.ohio-state.edu % -% http://www.cse.ohio-state.edu/~gurari % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\immediate\write-1{version 2009-05-21-09:32} - +% acm_proc_article-sp.4ht 2019-12-19-14:27 % +% Copyright (C) 2001-2009 Eitan M. Gurari % +% Copyright 2009-2019 TeX Users Group +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either +% version 1.3c of this license or (at your option) any +% later version. The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions +% of LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% The Current Maintainer of this work +% is the TeX4ht Project . +% +% If you modify this program, changing the +% version identification would be appreciated. \catcode`\:=12 \def\@citex#1[#2]#3{% \let\@citea\@empty @@ -63,8 +55,8 @@ \NewConfigure{caption}[4]{\c:def\cptA:{#1}\c:def\cptB:{#2}% \c:def\cptC:{#3}\c:def\cptD:{#4}} \long\def\@makecaption#1#2{% - {\cptA: \cap:ref{#1}% -\cptB:}{\cptC:{#2}\cptD:}} +{\cptA: \cap:ref{#1}% +\if :#1:\else\cptB:\fi}{\cptC:{#2}\cptD:}} \def\:temp{\let\sv:item\item \def\item[##1]{\nobreak diff --git a/Master/texmf-dist/tex/generic/tex4ht/amsart.4ht b/Master/texmf-dist/tex/generic/tex4ht/amsart.4ht index 1cb477b8e43..b32be606770 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/amsart.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/amsart.4ht @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% amsart.4ht 2018-10-20-15:45 % +% amsart.4ht 2019-12-19-14:27 % % Copyright (C) 1997-2009 Eitan M. Gurari % -% Copyright 2009-2018 TeX Users Group +% Copyright 2009-2019 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -23,8 +23,8 @@ \NewConfigure{caption}[4]{\c:def\cptA:{#1}\c:def\cptB:{#2}% \c:def\cptC:{#3}\c:def\cptD:{#4}} \long\def\@makecaption#1#2{% - {\cptA: \cap:ref{#1}% -\cptB:}{\cptC:{#2}\cptD:}} +{\cptA: \cap:ref{#1}% +\if :#1:\else\cptB:\fi}{\cptC:{#2}\cptD:}} \pend:def\caption{\SkipRefstepAnchor} diff --git a/Master/texmf-dist/tex/generic/tex4ht/amsbook.4ht b/Master/texmf-dist/tex/generic/tex4ht/amsbook.4ht index 1d89baa27ae..61f6bffe190 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/amsbook.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/amsbook.4ht @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% amsbook.4ht 2018-10-20-15:45 % +% amsbook.4ht 2019-12-19-14:27 % % Copyright (C) 1997-2009 Eitan M. Gurari % -% Copyright 2009-2018 TeX Users Group +% Copyright 2009-2019 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -23,8 +23,8 @@ \NewConfigure{caption}[4]{\c:def\cptA:{#1}\c:def\cptB:{#2}% \c:def\cptC:{#3}\c:def\cptD:{#4}} \long\def\@makecaption#1#2{% - {\cptA: \cap:ref{#1}% -\cptB:}{\cptC:{#2}\cptD:}} +{\cptA: \cap:ref{#1}% +\if :#1:\else\cptB:\fi}{\cptC:{#2}\cptD:}} \pend:def\caption{\SkipRefstepAnchor} diff --git a/Master/texmf-dist/tex/generic/tex4ht/amsproc.4ht b/Master/texmf-dist/tex/generic/tex4ht/amsproc.4ht index 153a865894a..96ccd63a6fd 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/amsproc.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/amsproc.4ht @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% amsproc.4ht 2018-10-20-15:45 % +% amsproc.4ht 2019-12-19-14:27 % % Copyright (C) 1997-2009 Eitan M. Gurari % -% Copyright 2009-2018 TeX Users Group +% Copyright 2009-2019 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -23,8 +23,8 @@ \NewConfigure{caption}[4]{\c:def\cptA:{#1}\c:def\cptB:{#2}% \c:def\cptC:{#3}\c:def\cptD:{#4}} \long\def\@makecaption#1#2{% - {\cptA: \cap:ref{#1}% -\cptB:}{\cptC:{#2}\cptD:}} +{\cptA: \cap:ref{#1}% +\if :#1:\else\cptB:\fi}{\cptC:{#2}\cptD:}} \pend:def\caption{\SkipRefstepAnchor} diff --git a/Master/texmf-dist/tex/generic/tex4ht/article.4ht b/Master/texmf-dist/tex/generic/tex4ht/article.4ht index 7d712944200..5eb384b6aae 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/article.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/article.4ht @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% article.4ht 2018-10-20-15:45 % +% article.4ht 2019-12-19-14:27 % % Copyright (C) 1997-2009 Eitan M. Gurari % -% Copyright 2009-2018 TeX Users Group +% Copyright 2009-2019 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -30,8 +30,8 @@ \NewConfigure{caption}[4]{\c:def\cptA:{#1}\c:def\cptB:{#2}% \c:def\cptC:{#3}\c:def\cptD:{#4}} \long\def\@makecaption#1#2{% - {\cptA: \cap:ref{#1}% -\cptB:}{\cptC:{#2}\cptD:}} +{\cptA: \cap:ref{#1}% +\if :#1:\else\cptB:\fi}{\cptC:{#2}\cptD:}} \pend:def\caption{\SkipRefstepAnchor} diff --git a/Master/texmf-dist/tex/generic/tex4ht/book.4ht b/Master/texmf-dist/tex/generic/tex4ht/book.4ht index 982e215a0e2..f9ebcbd48b9 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/book.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/book.4ht @@ -1,6 +1,6 @@ -% book.4ht 2018-10-20-15:45 % +% book.4ht 2019-12-19-14:27 % % Copyright (C) 1997-2009 Eitan M. Gurari % -% Copyright 2009-2018 TeX Users Group +% Copyright 2009-2019 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -220,8 +220,8 @@ UnDFexyz}% \NewConfigure{caption}[4]{\c:def\cptA:{#1}\c:def\cptB:{#2}% \c:def\cptC:{#3}\c:def\cptD:{#4}} \long\def\@makecaption#1#2{% - {\cptA: \cap:ref{#1}% -\cptB:}{\cptC:{#2}\cptD:}} +{\cptA: \cap:ref{#1}% +\if :#1:\else\cptB:\fi}{\cptC:{#2}\cptD:}} \pend:def\caption{\SkipRefstepAnchor} diff --git a/Master/texmf-dist/tex/generic/tex4ht/elsart.4ht b/Master/texmf-dist/tex/generic/tex4ht/elsart.4ht index ccda48d2678..29332a5b23d 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/elsart.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/elsart.4ht @@ -1,31 +1,23 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% elsart.4ht 2009-05-21-09:32 % -% Copyright (C) 1999--2009 Eitan M. Gurari % -% % -% This work may be distributed and/or modified under the % -% conditions of the LaTeX Project Public License, either % -% version 1.3c of this license or (at your option) any % -% later version. The latest version of this license is % -% in % -% http://www.latex-project.org/lppl.txt % -% and version 1.3c or later is part of all distributions % -% of LaTeX version 2005/12/01 or later. % -% % -% This work has the LPPL maintenance status "maintained".% -% % -% This Current Maintainer of this work % -% is Eitan M. Gurari. % -% % -% If you modify this program your changing its signature % -% with a directive of the following form will be % -% appreciated. % -% \message{signature} % -% % -% gurari@cse.ohio-state.edu % -% http://www.cse.ohio-state.edu/~gurari % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\immediate\write-1{version 2009-05-21-09:32} - +% elsart.4ht 2019-12-19-14:27 % +% Copyright (C) 1999-2009 Eitan M. Gurari % +% Copyright 2009-2019 TeX Users Group +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either +% version 1.3c of this license or (at your option) any +% later version. The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions +% of LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% The Current Maintainer of this work +% is the TeX4ht Project . +% +% If you modify this program, changing the +% version identification would be appreciated. \edef\@ptsize{\ifdim \normalbaselineskip>14pt 2\else \ifdim \normalbaselineskip>13pt 2\else 0\fi\fi} \input article.4ht @@ -79,12 +71,12 @@ \def\@makecaption{\@makefigurecaption} \long\def\@makefigurecaption#1#2{% - {\cptA: \cap:ref{#1}% -\cptB:}{\cptC:{#2}\cptD:}} +{\cptA: \cap:ref{#1}% +\if :#1:\else\cptB:\fi}{\cptC:{#2}\cptD:}} \long\def\@maketablecaption#1#2{\@tablecaptionsize \global \@minipagefalse - \hbox{{\cptA: \cap:ref{#1}% -\cptB:}{\cptC:{#2}\cptD:}}} +\hbox{{\cptA: \cap:ref{#1}% +\if :#1:\else\cptB:\fi}{\cptC:{#2}\cptD:}}} \pend:def\open@fm{\:gobbleIV} \pend:def\close@fm{\gdef\:temp{\global\setbox\fm@box=\vbox{}}} \def\endfrontmatter{% diff --git a/Master/texmf-dist/tex/generic/tex4ht/listings.4ht b/Master/texmf-dist/tex/generic/tex4ht/listings.4ht index e0040346e91..91e062d1801 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/listings.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/listings.4ht @@ -1,6 +1,6 @@ -% listings.4ht (2017-04-22-16:03), generated from tex4ht-4ht.tex +% listings.4ht (2019-12-19-14:27), generated from tex4ht-4ht.tex % Copyright 2001-2009 Eitan M. Gurari -% Copyright 2009-2017 TeX Users Group +% Copyright 2009-2019 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -17,9 +17,9 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2017-04-22-16:03} +\immediate\write-1{version 2019-12-19-14:27} -\def\lst@makecaption#1#2{\cptA: #1\cptB: \cptC: #2\cptD:} +\def\lst@makecaption#1#2{\cptA: #1\if :#1:\else\cptB:\fi \cptC: #2\cptD:} \newif\iflstnest \append:defII\lst@EnterMode{% diff --git a/Master/texmf-dist/tex/generic/tex4ht/longtable.4ht b/Master/texmf-dist/tex/generic/tex4ht/longtable.4ht index be02612f322..fd37cc24f7f 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/longtable.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/longtable.4ht @@ -1,5 +1,5 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% longtable.4ht 2019-09-18-14:51 % +% longtable.4ht 2019-12-19-14:27 % % Copyright (C) 1997-2009 Eitan M. Gurari % % Copyright 2009-2019 TeX Users Group % @@ -225,7 +225,7 @@ \HLet\LT@caption\:tempc \def\:tempc#1#2#3{% \LT@mcol\LT@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@makecaption\:tempc diff --git a/Master/texmf-dist/tex/generic/tex4ht/mwart.4ht b/Master/texmf-dist/tex/generic/tex4ht/mwart.4ht index 8bed042d426..d65c040e01f 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/mwart.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/mwart.4ht @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% mwart.4ht 2018-10-20-15:45 % +% mwart.4ht 2019-12-19-14:27 % % Copyright (C) 2003-2009 Eitan M. Gurari % -% Copyright 2009-2018 TeX Users Group +% Copyright 2009-2019 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -22,7 +22,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} diff --git a/Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht b/Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht index 16462b9880d..aa15dd61ec9 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% mwbk.4ht 2018-10-20-15:45 % +% mwbk.4ht 2019-12-19-14:27 % % Copyright (C) 2003-2009 Eitan M. Gurari % -% Copyright 2009-2018 TeX Users Group +% Copyright 2009-2019 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -22,7 +22,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} diff --git a/Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht b/Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht index 12adda81fa9..acdf10d2892 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% mwrep.4ht 2018-10-20-15:45 % +% mwrep.4ht 2019-12-19-14:27 % % Copyright (C) 2003-2009 Eitan M. Gurari % -% Copyright 2009-2018 TeX Users Group +% Copyright 2009-2019 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -22,7 +22,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} diff --git a/Master/texmf-dist/tex/generic/tex4ht/report.4ht b/Master/texmf-dist/tex/generic/tex4ht/report.4ht index 360aa8b0159..64d4b913fca 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/report.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/report.4ht @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% report.4ht 2018-10-20-15:45 % +% report.4ht 2019-12-19-14:27 % % Copyright (C) 1997-2009 Eitan M. Gurari % -% Copyright 2009-2018 TeX Users Group +% Copyright 2009-2019 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -71,8 +71,8 @@ \NewConfigure{caption}[4]{\c:def\cptA:{#1}\c:def\cptB:{#2}% \c:def\cptC:{#3}\c:def\cptD:{#4}} \long\def\@makecaption#1#2{% - {\cptA: \cap:ref{#1}% -\cptB:}{\cptC:{#2}\cptD:}} +{\cptA: \cap:ref{#1}% +\if :#1:\else\cptB:\fi}{\cptC:{#2}\cptD:}} \pend:def\caption{\SkipRefstepAnchor} diff --git a/Master/texmf-dist/tex/generic/tex4ht/revtex4.4ht b/Master/texmf-dist/tex/generic/tex4ht/revtex4.4ht index e5faec60492..ae15cec5699 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/revtex4.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/revtex4.4ht @@ -1,31 +1,23 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% revtex4.4ht 2009-05-21-09:32 % -% Copyright (C) 2002--2009 Eitan M. Gurari % -% % -% This work may be distributed and/or modified under the % -% conditions of the LaTeX Project Public License, either % -% version 1.3c of this license or (at your option) any % -% later version. The latest version of this license is % -% in % -% http://www.latex-project.org/lppl.txt % -% and version 1.3c or later is part of all distributions % -% of LaTeX version 2005/12/01 or later. % -% % -% This work has the LPPL maintenance status "maintained".% -% % -% This Current Maintainer of this work % -% is Eitan M. Gurari. % -% % -% If you modify this program your changing its signature % -% with a directive of the following form will be % -% appreciated. % -% \message{signature} % -% % -% gurari@cse.ohio-state.edu % -% http://www.cse.ohio-state.edu/~gurari % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\immediate\write-1{version 2009-05-21-09:32} - +% revtex4.4ht 2019-12-19-14:27 % +% Copyright (C) 2002-2009 Eitan M. Gurari % +% Copyright 2009-2019 TeX Users Group +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either +% version 1.3c of this license or (at your option) any +% later version. The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions +% of LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% The Current Maintainer of this work +% is the TeX4ht Project . +% +% If you modify this program, changing the +% version identification would be appreciated. \def\:tempc[#1]#2{% %\hshow{@array@array@new--222}% \def\Clr{#2}\a:VBorder @@ -507,7 +499,7 @@ \small\rmfamily \flushing \let\footnote\@footnotemark@gobble - {\cptA: \cap:ref{#1}\cptB:}{\cptC:{#2}\cptD:} + {\cptA: \cap:ref{#1}\if :#1:\else\cptB:\fi}{\cptC:{#2}\cptD:} \endgroup \par } diff --git a/Master/texmf-dist/tex/generic/tex4ht/scrbook.4ht b/Master/texmf-dist/tex/generic/tex4ht/scrbook.4ht index f08e81d1f95..8e8f882c1b2 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/scrbook.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/scrbook.4ht @@ -1,6 +1,6 @@ -% scrbook.4ht (2018-06-12-16:01), generated from tex4ht-4ht.tex +% scrbook.4ht (2019-12-19-14:27), generated from tex4ht-4ht.tex % Copyright 1999-2009 Eitan M. Gurari -% Copyright 2009-2018 TeX Users Group +% Copyright 2009-2019 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2018-06-12-16:01} +\immediate\write-1{version 2019-12-19-14:27} \let\o:maketitle:\maketitle \let\o:maketitle:\maketitle @@ -272,7 +272,7 @@ UnDFexyz}% \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@} diff --git a/Master/texmf-dist/tex/generic/tex4ht/scrreprt.4ht b/Master/texmf-dist/tex/generic/tex4ht/scrreprt.4ht index a6201760bb6..c5fff95ab24 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/scrreprt.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/scrreprt.4ht @@ -1,6 +1,6 @@ -% scrreprt.4ht (2018-10-20-15:45), generated from tex4ht-4ht.tex +% scrreprt.4ht (2019-12-19-14:27), generated from tex4ht-4ht.tex % Copyright (C) 1999-2009 Eitan M. Gurari -% Copyright 2009-2018 TeX Users Group +% Copyright 2009-2019 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2018-10-20-15:45} +\immediate\write-1{version 2019-12-19-14:27} \let\o:maketitle:\maketitle \def\maketitle{\bgroup @@ -118,7 +118,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@} -- cgit v1.2.3