From 48b7ebac6c0abbba4c165539b409ce31a5869eb8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 22 May 2020 20:58:43 +0000 Subject: ams*: \thanks fix (tex4ht r695);
 for verbatim (tex4ht r694);
 caption package fixes (tex4ht r693)

git-svn-id: svn://tug.org/texlive/trunk@55239 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/generic/tex4ht/amsart.4ht     |  5 +++--
 Master/texmf-dist/tex/generic/tex4ht/amsbook.4ht    |  5 +++--
 Master/texmf-dist/tex/generic/tex4ht/amsproc.4ht    |  5 +++--
 Master/texmf-dist/tex/generic/tex4ht/caption.4ht    | 10 ++++++++--
 Master/texmf-dist/tex/generic/tex4ht/html4.4ht      | 13 ++++++-------
 Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht |  8 ++++++--
 6 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/Master/texmf-dist/tex/generic/tex4ht/amsart.4ht b/Master/texmf-dist/tex/generic/tex4ht/amsart.4ht
index b32be606770..71a1488dd30 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                            2019-12-19-14:27 %
+% amsart.4ht                            2020-05-22-13:46 %
 % Copyright (C) 1997-2009       Eitan M. Gurari         %
-% Copyright 2009-2019 TeX Users Group
+% Copyright 2009-2020 TeX Users Group
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -164,6 +164,7 @@ A script of the form
         :\string #1\endcsname#2}\fi}
 \NewConfigure{@maketitle}{2}
 \HRestore\thanks
+\let\@adminfootnotes\relax
 \def\:thanks#1{\par \a:thanks#1\@addpunct.\b:thanks}
 \NewConfigure{thanks author date and}[8]{%
    \c:def\a:thanks{#1}\c:def\b:thanks{#2}\c:def\a:author{#3}\c:def\b:author{#4}%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/amsbook.4ht b/Master/texmf-dist/tex/generic/tex4ht/amsbook.4ht
index 61f6bffe190..a92fdaf1be6 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                           2019-12-19-14:27 %
+% amsbook.4ht                           2020-05-22-13:46 %
 % Copyright (C) 1997-2009       Eitan M. Gurari         %
-% Copyright 2009-2019 TeX Users Group
+% Copyright 2009-2020 TeX Users Group
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -164,6 +164,7 @@ A script of the form
         :\string #1\endcsname#2}\fi}
 \NewConfigure{@maketitle}{2}
 \HRestore\thanks
+\let\@adminfootnotes\relax
 \def\:thanks#1{\par \a:thanks#1\@addpunct.\b:thanks}
 \NewConfigure{thanks author date and}[8]{%
    \c:def\a:thanks{#1}\c:def\b:thanks{#2}\c:def\a:author{#3}\c:def\b:author{#4}%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/amsproc.4ht b/Master/texmf-dist/tex/generic/tex4ht/amsproc.4ht
index 96ccd63a6fd..314a1d3c0f8 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                           2019-12-19-14:27 %
+% amsproc.4ht                           2020-05-22-13:46 %
 % Copyright (C) 1997-2009       Eitan M. Gurari         %
-% Copyright 2009-2019 TeX Users Group
+% Copyright 2009-2020 TeX Users Group
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -164,6 +164,7 @@ A script of the form
         :\string #1\endcsname#2}\fi}
 \NewConfigure{@maketitle}{2}
 \HRestore\thanks
+\let\@adminfootnotes\relax
 \def\:thanks#1{\par \a:thanks#1\@addpunct.\b:thanks}
 \NewConfigure{thanks author date and}[8]{%
    \c:def\a:thanks{#1}\c:def\b:thanks{#2}\c:def\a:author{#3}\c:def\b:author{#4}%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/caption.4ht b/Master/texmf-dist/tex/generic/tex4ht/caption.4ht
index fb533f36f47..f2a6fd99cf7 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/caption.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/caption.4ht
@@ -1,6 +1,6 @@
-% caption.4ht (2017-04-22-16:03), generated from tex4ht-4ht.tex
+% caption.4ht (2020-05-22-13:46), generated from tex4ht-4ht.tex
 % Copyright 2007-2009 Eitan M. Gurari
-% Copyright 2009-2017 TeX Users Group
+% Copyright 2009-2020 TeX Users Group
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -43,6 +43,12 @@
    }\fi%
 }
 
+\long\def\@makecaption#1#2{%
+  \caption@make@above%
+  \cptA:\caption@@make{\cap:ref{#1}\if :#1:\else\cptB:\fi}{\cptC:#2}\cptD:%
+  \caption@make@below%
+}
+
 \Hinput{caption}
 \endinput
 
diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
index fe1613f31e3..44b55addf4e 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
@@ -1,4 +1,4 @@
-% html4.4ht (2020-04-13-14:20), generated from tex4ht-html4.tex
+% html4.4ht (2020-05-22-13:46), generated from tex4ht-html4.tex
 % Copyright 2009-2020 TeX Users Group
 % Copyright 1997-2009 Eitan M. Gurari
 %
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2020-04-13-14:20}
+\immediate\write-1{version 2020-05-22-13:46}
 
 \exit:ifnot{8859-6,% 
 CJK,% 
@@ -1611,13 +1611,12 @@ switches of tex4ht.c)
 \def\env:verb#1{\ifinner\else \vfill\break\fi
   \IgnorePar\EndP  \HAssign\Verb:N=0
   \gHAdvance\verbatimN by 1
-  \HCode{
}\EndNoFonts} + \HCode{
}\EndNoFonts}
 \def\endenv:verb{\NoFonts
-  \EndP \ht:special{t4ht=
}\ShowPar \par{\HCondtrue\noindent}% + \EndP \ht:special{t4ht=
}\ShowPar \par{\HCondtrue\noindent}% } \HAssign\Verb:N=0 -\Css{div.verbatim {font-family: monospace,monospace; - white-space: nowrap; +\Css{pre.verbatim {font-family: monospace,monospace; text-align:left; clear:both; }} @@ -2877,7 +2876,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% % use the command line option `javahelp'} % \fi \Configure{verbatim} - {\HAdvance\Verb:N by 1 \ifnum \Verb:N>1 \:nbsp \HCode{
}\fi} + {\HAdvance\Verb:N by 1 \ifnum \Verb:N>1\fi} {\a:sp} \Configure{verb} {\HCode{}} diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht index a6f0179346e..d375944b150 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht @@ -1,4 +1,4 @@ -% usepackage.4ht (2020-04-23-13:56), generated from tex4ht-4ht.tex +% usepackage.4ht (2020-05-22-13:46), generated from tex4ht-4ht.tex % Copyright 2003-2009 Eitan M. Gurari % Copyright 2009-2020 TeX Users Group % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2020-04-23-13:56} +\immediate\write-1{version 2020-05-22-13:46} \def\:temp{tex4ht}\ifx \:temp\@currname \:warning{\string\usepackage{tex4ht} again?} @@ -166,6 +166,10 @@ \def\:temp{caption}\ifx\@currname\:temp \:AtEndOfPackage{% \long\def\caption@If@Package@Loaded#1[#2]#3#4{} + \renewcommand*\caption@redefine{% + \let\caption\caption@caption% + \let\@caption\caption@@caption% + }% } \fi \def\:temp{graphics}\ifx\@currname\:temp -- cgit v1.2.3