From b292a9962c78c9ec7984fa6ce0bf3b8a5732f06c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 20 Jun 2021 16:37:11 +0000 Subject: more \write-1 version, tex4ht r955 git-svn-id: svn://tug.org/texlive/trunk@59650 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/generic/tex4ht/ChangeLog | 20 +++++++++++++ .../source/generic/tex4ht/tex4ht-4ht.tex | 34 ++++++++++------------ .../source/generic/tex4ht/tex4ht-mkht.tex | 10 ++++--- Master/texmf-dist/tex/generic/tex4ht/mathtools.4ht | 9 +++--- Master/texmf-dist/tex/generic/tex4ht/multicol.4ht | 9 +++--- Master/texmf-dist/tex/generic/tex4ht/multirow.4ht | 24 ++++++++++++--- Master/texmf-dist/tex/generic/tex4ht/mwart.4ht | 9 +++--- Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht | 4 +-- Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht | 9 +++--- 9 files changed, 83 insertions(+), 45 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 96298022552..940b26226cb 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,23 @@ +2021-06-20 Karl Berry + + * tex4ht-4ht.tex (mathtools.4ht, multicol.4ht, multirow.4ht, + mwart.4ht, mwbk.4ht, mwrep.4ht): \write-1 version. + * tex4ht-mkht.tex: copyright 2021. + +2021-06-19 Michal Hoftich + + * tex4ht-4ht.tex (latex.4ht), + * tex4ht-unicode.tex (unicode.4ht): fixed support for \nobreakspace and + \textellipsis in the picture mode. + +2021-06-18 Michal Hoftich + + * tex4ht-mkht.tex (\ourtoks): rename from \toks (should not have + used a TeX primitive originally), to fix mysterious + error that appeared after LaTeX update: +! TeX capacity exceeded, sorry [input stack size=5000].! TeX capacity exceeded, sorry [input stack size=5000]. + \mode_if_inner:F + 2021-06-17 Karl Berry * 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 7eb8e40b0b3..fe1d15b3599 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 954 2021-06-19 19:34:56Z michal_h21 $ +% $Id: tex4ht-4ht.tex 955 2021-06-20 16:36:07Z karl $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2021 TeX Users Group @@ -10285,8 +10285,8 @@ handling. Michal \<<< % multirow.4ht (|version), generated from |jobname.tex -% Copyright (C) |CopyYear.2004. Eitan M. Gurari -| +% Copyright |CopyYear.2004. Eitan M. Gurari +| | \Hinput{multirow} \endinput @@ -15867,10 +15867,9 @@ UnDFexyz}% %%%%%%%%%%%%%%% \<<< -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% mwart.4ht |version % -% Copyright (C) |CopyYear.2003. Eitan M. Gurari % -| +% mwart.4ht (|version), generated from |jobname.tex +% Copyright |CopyYear.2003. Eitan M. Gurari +| | | | @@ -16156,10 +16155,9 @@ UnDFexyz>>> %%%%%%%%%%%%%%% \<<< -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% mwrep.4ht |version % -% Copyright (C) |CopyYear.2003. Eitan M. Gurari % -| +% mwrep.4ht (|version), generated from |jobname.tex +% Copyright |CopyYear.2003. Eitan M. Gurari +| | | | @@ -20492,10 +20490,9 @@ $\m@th\displaystyle{{}#}$% %%%%%%%%%%%%%%% \<<< -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% mathtools.4ht |version % -% Copyright (C) |CopyYear.2007. Eitan M. Gurari % -| +% mathtools.4ht (|version), generated from |jobname.tex +% Copyright |CopyYear.2007. Eitan M. Gurari +| | \edef\cat:underscore{% \noexpand\catcode`\noexpand\_=\the\catcode`\_ } @@ -31649,10 +31646,9 @@ We must fix some exerquiz issues before we load the package itself. \Section{multicol.sty} \<<< -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% multicol.4ht |version % -% Copyright (C) |CopyYear.1997. Eitan M. Gurari % -| +% multicol.4ht (|version), generated from |jobname.tex +% Copyright |CopyYear.1997. Eitan M. Gurari +| \append:def\set@floatcmds{\let\end@dblfloat|=\end@float} \def\slocitlum#1{\let\endslocitlum|=\empty diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mkht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mkht.tex index 9e957719e11..9e4303d5a93 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mkht.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mkht.tex @@ -1,9 +1,9 @@ -% $Id: tex4ht-mkht.tex 845 2020-11-23 18:05:43Z karl $ +% $Id: tex4ht-mkht.tex 955 2021-06-20 16:36:07Z karl $ % (1) latex tex4ht-mkht % (2) perl -c mk4ht.perl (checking correctness) % (3) latex mkht-scripts.4ht % -% Copyright 2009-2020 TeX Users Group +% Copyright 2009-2021 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari % Released under LPPL 1.3c+. % See tex4ht-cpright.tex for license text. @@ -16,6 +16,7 @@ \Preamble{xhtml} \input ProTex.sty \AlProTex{4ht,<<<>>>,?,title,list} + \AtBeginDocument{\EndPreamble} \else \Configure{ProTex}{4ht,<<<>>>,?,title,list,[[]]} \fi @@ -29,8 +30,9 @@ \def\mkhtNote{ } -\newtoks\toks -\expandafter\toks\expandafter{\mkhtNote} +\newtoks\ourtoks + +\expandafter\ourtoks\expandafter{\mkhtNote} %%%%%%%%%%%%%%%%%%%%% end definitions %%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathtools.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathtools.4ht index 46830e07e68..05c429e0beb 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/mathtools.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/mathtools.4ht @@ -1,7 +1,6 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% mathtools.4ht 2020-12-25-13:59 % -% Copyright (C) 2007-2009 Eitan M. Gurari % -% Copyright 2009-2020 TeX Users Group +% mathtools.4ht (2021-06-20-09:36), generated from tex4ht-4ht.tex +% Copyright 2007-2009 Eitan M. Gurari +% Copyright 2009-2021 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -18,6 +17,8 @@ % % If you modify this program, changing the % version identification would be appreciated. +\immediate\write-1{version 2021-06-20-09:36} + \ifx \o:endgathered:\:UnDef\else \HRestore\endgathered \fi diff --git a/Master/texmf-dist/tex/generic/tex4ht/multicol.4ht b/Master/texmf-dist/tex/generic/tex4ht/multicol.4ht index 48e93b14da3..237e87a3e39 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/multicol.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/multicol.4ht @@ -1,7 +1,6 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% multicol.4ht 2020-03-14-13:28 % -% Copyright (C) 1997-2009 Eitan M. Gurari % -% Copyright 2009-2020 TeX Users Group +% multicol.4ht (2021-06-20-09:36), generated from tex4ht-4ht.tex +% Copyright 1997-2009 Eitan M. Gurari +% Copyright 2009-2021 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -18,6 +17,8 @@ % % If you modify this program, changing the % version identification would be appreciated. +\immediate\write-1{version 2021-06-20-09:36} + \append:def\set@floatcmds{\let\end@dblfloat\end@float} \def\slocitlum#1{\let\endslocitlum\empty diff --git a/Master/texmf-dist/tex/generic/tex4ht/multirow.4ht b/Master/texmf-dist/tex/generic/tex4ht/multirow.4ht index d943d480a49..0a3f03a7dce 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/multirow.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/multirow.4ht @@ -1,7 +1,23 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% multirow.4ht 2016-12-03-00:18 % -% Copyright (C) 2004-2009 Eitan M. Gurari % -% Copyright 2009-2016 TeX Users Group +% multirow.4ht (2021-06-20-09:36), generated from tex4ht-4ht.tex +% Copyright 2004-2009 Eitan M. Gurari +% Copyright 2009-2021 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. +\immediate\write-1{version 2021-06-20-09:36} \def\@xmultirow[#1]#2[#3]#4[#5]#6{% \expandafter\multirow@piii#3\relax\end% diff --git a/Master/texmf-dist/tex/generic/tex4ht/mwart.4ht b/Master/texmf-dist/tex/generic/tex4ht/mwart.4ht index d65c040e01f..e5a5383038c 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/mwart.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/mwart.4ht @@ -1,7 +1,6 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% mwart.4ht 2019-12-19-14:27 % -% Copyright (C) 2003-2009 Eitan M. Gurari % -% Copyright 2009-2019 TeX Users Group +% mwart.4ht (2021-06-20-09:36), generated from tex4ht-4ht.tex +% Copyright 2003-2009 Eitan M. Gurari +% Copyright 2009-2021 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -18,6 +17,8 @@ % % If you modify this program, changing the % version identification would be appreciated. +\immediate\write-1{version 2021-06-20-09:36} + \NewConfigure{caption}[4]{\c:def\cptA:{#1}\c:def\cptB:{#2}% \c:def\cptC:{#3}\c:def\cptD:{#4}} \long\def\@makecaption#1#2{% diff --git a/Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht b/Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht index aa15dd61ec9..1743fcb8a82 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 2019-12-19-14:27 % +% mwbk.4ht 2021-06-20-09:36 % % Copyright (C) 2003-2009 Eitan M. Gurari % -% Copyright 2009-2019 TeX Users Group +% Copyright 2009-2021 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either diff --git a/Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht b/Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht index acdf10d2892..94095f5b173 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht @@ -1,7 +1,6 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% mwrep.4ht 2019-12-19-14:27 % -% Copyright (C) 2003-2009 Eitan M. Gurari % -% Copyright 2009-2019 TeX Users Group +% mwrep.4ht (2021-06-20-09:36), generated from tex4ht-4ht.tex +% Copyright 2003-2009 Eitan M. Gurari +% Copyright 2009-2021 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -18,6 +17,8 @@ % % If you modify this program, changing the % version identification would be appreciated. +\immediate\write-1{version 2021-06-20-09:36} + \NewConfigure{caption}[4]{\c:def\cptA:{#1}\c:def\cptB:{#2}% \c:def\cptC:{#3}\c:def\cptD:{#4}} \long\def\@makecaption#1#2{% -- cgit v1.2.3