From 6af4916860677e2f9e7b783f6ed31abe9ed3ddee Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 13 Jun 2021 15:47:52 +0000 Subject: \write-1 version (tex4ht r950), and missed scrlayer.4ht git-svn-id: svn://tug.org/texlive/trunk@59573 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/generic/tex4ht/ChangeLog | 21 +++++++++--- .../source/generic/tex4ht/tex4ht-4ht.tex | 37 +++++++++++++++------- Master/texmf-dist/tex/generic/tex4ht/fontspec.4ht | 22 +++++++++++-- Master/texmf-dist/tex/generic/tex4ht/graphics.4ht | 6 ++-- Master/texmf-dist/tex/generic/tex4ht/latex209.4ht | 21 ++++++++++++ Master/texmf-dist/tex/generic/tex4ht/lfeenc.4ht | 9 +++--- Master/texmf-dist/tex/generic/tex4ht/longtable.4ht | 9 +++--- Master/texmf-dist/tex/generic/tex4ht/ltugboat.4ht | 6 ++-- Master/texmf-dist/tex/generic/tex4ht/scrlayer.4ht | 25 +++++++++++++++ 9 files changed, 125 insertions(+), 31 deletions(-) create mode 100644 Master/texmf-dist/tex/generic/tex4ht/scrlayer.4ht diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 34d97dfca72..db7bce31520 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,10 +1,23 @@ +2021-06-13 Karl Berry + + * tex4ht-4ht.tex (fontspec.4ht, graphics.4ht, lfeenc.4ht, + longtable.4ht, ltugboat.4ht, latex209.4ht): \write-1 version. + +2021-06-13 Michal Hoftich + + * tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): protect more + commands from expansion in movable arguments. + https://tex.stackexchange.com/a/601062/2891 + * tex4ht-html5.tex (html5.4ht): add vertical space between image and + caption. + 2021-06-12 Michal Hoftich - * tex4ht-html4.tex (html4.4ht): remove vertical space in \item items that - contain just one paragraph. + * tex4ht-html4.tex (html4.4ht): remove vertical space in \item + items that contain just one paragraph. https://tug.org/pipermail/tex4ht/2021q2/002997.html - * tex4ht-4ht.tex (scrlayer.4ht): fix for runtime error when scrlayer checks - whether it can access current page style. + * tex4ht-4ht.tex (scrlayer.4ht): fix for runtime error when + scrlayer checks whether it can access current page style. 2021-06-06 Karl Berry diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index e25dd156bab..d2028bd46db 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 945 2021-06-06 16:18:27Z karl $ +% $Id: tex4ht-4ht.tex 950 2021-06-13 15:46:36Z karl $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2021 TeX Users Group @@ -4209,7 +4209,7 @@ must be declared first. This is done in the fontspec-xetex.4ht file. \<<< % fontspec.4ht (|version), generated from |jobname.tex -% Copyright 2016-2017 TeX Users Group +% Copyright 2016-2021 TeX Users Group | \Hinput{fontspec} @@ -9437,10 +9437,9 @@ new way. Don't globalize ar:cnt!!!! %%%%%%%%%%%%%%%%%%%%%%%%% \<<< -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% longtable.4ht |version % -% Copyright (C) |CopyYear.1997. Eitan M. Gurari % -| +% longtable.4ht (|version), generated from |jobname.tex +% Copyright |CopyYear.1997. Eitan M. Gurari +| | | | @@ -14268,6 +14267,9 @@ Hide an artificial math. \Chapter{latex209.def} \<<< +% latex209.4ht (|version), generated from |jobname.tex +% Copyright |CopyYear.1997. Eitan M. Gurari +| \let\:fnsymbol\@fnsymbol \def\@fnsymbol#1{{\hbox{$\:fnsymbol{#1}$}}} \Hinput{latex209} @@ -16830,6 +16832,18 @@ unnumberedsubsubsec% \Chapter{src art/rep/book} %%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%% +\Section{scrlayer} +%%%%%%%%%%%%%%%%%% +\<<< +% scrlayer.4ht (|version), generated from |jobname.tex +% Copyright 2021 TeX Users Group +| +\def\pagestyle#1{\edef\currentpagestyle{#1}} +\Hinput{scrlayer} +\endinput +>>> \AddFile{9}{scrlayer} + %%%%%%%%%%%%%%%%%% \Section{scrbook} %%%%%%%%%%%%%%%%%% @@ -23012,11 +23026,10 @@ environments to insert XML tags. %%%%%%%%%%%%%%% \<<< -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% lfeenc.4ht |version % -% Copyright (C) |CopyYear.2007. Youssef Jabri % -% Modified by Eitan M. Gurari % -| +% lfeenc.4ht (|version), generated from |jobname.tex +% Copyright |CopyYear.2007. Youssef Jabri +% Modified by Eitan M. Gurari +| \long\def\ZWNJ{\noindent\ht:special{t4ht@+\string&{35}x200C;}\a:HChar} \Hinput{lfeenc} \endinput @@ -29963,7 +29976,7 @@ d|\last:haddr \<<< % ltugboat.4ht (|version), generated from |jobname.tex % Copyright |CopyYear.1999. Eitan M. Gurari -| +| \@ifclassloaded{ltugproc}{}{% \@ifpackageloaded{ltugproc}{}{\Hinclude{\input ltugboat-a.4ht}{article}} \InputIfFileExists{tugboat.dates}% diff --git a/Master/texmf-dist/tex/generic/tex4ht/fontspec.4ht b/Master/texmf-dist/tex/generic/tex4ht/fontspec.4ht index 47e9ccb779a..06a8a4bc5fa 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/fontspec.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/fontspec.4ht @@ -1,6 +1,22 @@ -% fontspec.4ht (2016-12-08-16:38), generated from tex4ht-4ht.tex -% Copyright 2016 TeX Users Group -% Copyright 2009-2016 TeX Users Group +% fontspec.4ht (2021-06-13-08:46), generated from tex4ht-4ht.tex +% Copyright 2016-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-13-08:46} \Hinput{fontspec} diff --git a/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht b/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht index 8bfb654f5ab..48ec9543411 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/graphics.4ht @@ -1,6 +1,6 @@ -% graphics.4ht (2019-10-13-14:32), generated from tex4ht-4ht.tex +% graphics.4ht (2021-06-13-08:46), generated from tex4ht-4ht.tex % Copyright 1997-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 @@ -17,6 +17,8 @@ % % If you modify this program, changing the % version identification would be appreciated. +\immediate\write-1{version 2021-06-13-08:46} + \expandafter\let\csname includegraphics \endcsname\includegraphics \def\includegraphics{\expandafter\protect\csname includegraphics \endcsname} diff --git a/Master/texmf-dist/tex/generic/tex4ht/latex209.4ht b/Master/texmf-dist/tex/generic/tex4ht/latex209.4ht index e333ec7778d..818e4ff4011 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/latex209.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/latex209.4ht @@ -1,3 +1,24 @@ +% latex209.4ht (2021-06-13-08:46), 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 +% 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-13-08:46} + \let\:fnsymbol\@fnsymbol \def\@fnsymbol#1{{\hbox{$\:fnsymbol{#1}$}}} \Hinput{latex209} diff --git a/Master/texmf-dist/tex/generic/tex4ht/lfeenc.4ht b/Master/texmf-dist/tex/generic/tex4ht/lfeenc.4ht index 1be7d606c31..724eba10263 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/lfeenc.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/lfeenc.4ht @@ -1,7 +1,6 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% lfeenc.4ht 2021-04-25-09:48 % -% Copyright (C) 2007-2009 Youssef Jabri % -% Modified by Eitan M. Gurari % +% lfeenc.4ht (2021-06-13-08:46), generated from tex4ht-4ht.tex +% Copyright 2007-2009 Youssef Jabri +% Modified by Eitan M. Gurari % Copyright 2009-2021 TeX Users Group % % This work may be distributed and/or modified under the @@ -19,6 +18,8 @@ % % If you modify this program, changing the % version identification would be appreciated. +\immediate\write-1{version 2021-06-13-08:46} + \long\def\ZWNJ{\noindent\ht:special{t4ht@+\string&{35}x200C;}\a:HChar} \Hinput{lfeenc} \endinput diff --git a/Master/texmf-dist/tex/generic/tex4ht/longtable.4ht b/Master/texmf-dist/tex/generic/tex4ht/longtable.4ht index 96f04b13bb7..776e089e91d 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/longtable.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/longtable.4ht @@ -1,7 +1,6 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% longtable.4ht 2020-06-16-13:36 % -% Copyright (C) 1997-2009 Eitan M. Gurari % -% Copyright 2009-2020 TeX Users Group +% longtable.4ht (2021-06-13-08:46), 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-13-08:46} + \def\:tempc[#1]#2{% \gHAdvance\float:cnt 1 \gHAssign\capt:cnt0 diff --git a/Master/texmf-dist/tex/generic/tex4ht/ltugboat.4ht b/Master/texmf-dist/tex/generic/tex4ht/ltugboat.4ht index 731de41d3a4..4cee859d864 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/ltugboat.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/ltugboat.4ht @@ -1,6 +1,6 @@ -% ltugboat.4ht (2020-12-13-11:14), generated from tex4ht-4ht.tex +% ltugboat.4ht (2021-06-13-08:46), generated from tex4ht-4ht.tex % Copyright 1999-2009 Eitan M. Gurari -% Copyright 2009-2020 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 @@ -17,6 +17,8 @@ % % If you modify this program, changing the % version identification would be appreciated. +\immediate\write-1{version 2021-06-13-08:46} + \@ifclassloaded{ltugproc}{}{% \@ifpackageloaded{ltugproc}{}{\Hinclude{\input ltugboat-a.4ht}{article}} \InputIfFileExists{tugboat.dates}% diff --git a/Master/texmf-dist/tex/generic/tex4ht/scrlayer.4ht b/Master/texmf-dist/tex/generic/tex4ht/scrlayer.4ht new file mode 100644 index 00000000000..3f1f2e56eaf --- /dev/null +++ b/Master/texmf-dist/tex/generic/tex4ht/scrlayer.4ht @@ -0,0 +1,25 @@ +% scrlayer.4ht (2021-06-12-14:22), generated from tex4ht-4ht.tex +% Copyright 2021 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 +% 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-12-14:22} + +\def\pagestyle#1{\edef\currentpagestyle{#1}} +\Hinput{scrlayer} +\endinput + -- cgit v1.2.3