From 55a54dd6ad38a767ae617efad2cb65ceb0e9f467 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 29 Apr 2022 21:38:28 +0000 Subject: enumitem fixes, tex4ht r1123; multicol in html4, tex4ht r1124 git-svn-id: svn://tug.org/texlive/trunk@63180 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/generic/tex4ht/ChangeLog | 10 ++++ .../source/generic/tex4ht/tex4ht-4ht.tex | 57 ++++++++++------------ .../source/generic/tex4ht/tex4ht-html4.tex | 33 ++++++++++++- Master/texmf-dist/tex/generic/tex4ht/enumitem.4ht | 53 ++++++++++---------- Master/texmf-dist/tex/generic/tex4ht/html4.4ht | 35 +++++++++++-- Master/texmf-dist/tex/generic/tex4ht/multicol.4ht | 44 +++++------------ 6 files changed, 138 insertions(+), 94 deletions(-) diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index a4f4595666b..657bfe47d9e 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,13 @@ +2022-04-29 Michal Hoftich + + * tex4ht-4ht.tex (multicol.4ht), + * tex4ht-html4.tex (html4.4ht): moved HTML code for Multicol to + from multicol.4ht to html4.4ht. Fixed minor CSS issues. + * tex4ht-4ht.tex (enumitem.4ht): execute code stored in the "after" + key after closing commands for the environment. + * tex4ht-html4.tex (html4.4ht): vertically align enumitem numers and + content, provide some vertical spacing. + 2022-04-28 Michal Hoftich * tex4ht-ooffice.tex (ooffice.4ht): added dummy definition of diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index 700179e6c11..7c6439ebc16 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 1121 2022-04-28 13:36:29Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1124 2022-04-29 15:04:44Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2022 TeX Users Group @@ -28378,8 +28378,23 @@ A style file for resumes. \endinput >>> \AddFile{9}{enumitem} -\<<< +If user opens a new environment in Enumitem's "before" key, +it will prevent execution of the closing command for the +original environment, and generated tags will be mismatched. + +This code postpones execution of code from the "after" key after +closing of the Enumitem environment, so it can be correctly closed. + +See \Link[https://tex.stackexchange.com/q/642439/2891] this example +what can go wrong\EndLink. +\<<< +\AddToHook{env/enumerate/end}{\ifx\enit@after\@empty\else% + \let\enit:after\enit@after + \let\enit@after\@empty + \let\enumerate:executed\@empty + \append:def\end:DL{\enit:after} +\fi} >>> %%%%%%%%%%%%% @@ -32620,7 +32635,7 @@ but fatal error is a worse possibility. \def\columnrulecolor{\a:columnrulecolor} \NewConfigure{columnrulecolor}{1} -\Configure{columnrulecolor}{\#555;} +\Configure{columnrulecolor}{\#555} % legal color @@ -32671,37 +32686,19 @@ but fatal error is a worse possibility. \NewConfigure{multicols}{1} \Configure{multicols}{columns} -\def\:wr:mcol:css{% - \Css{.\a:multicols-\mcolnum\space p:first-child { margin-top: 0em; }}% - \Css{.\a:multicols-\mcolnum {% - -moz-column-count:\mcolnum; - -webkit-column-count:\mcolnum; - column-count:\mcolnum; - -moz-column-gap: \a:columngap; - -webkit-column-gap: \a:columngap; - column-gap: \a:columngap; - -moz-column-rule-width: \a:columnrulewidth; - -webkit-column-rule-width: \a:columnrulewidth; - column-rule-rule-width: \a:columnrulewidth; - -moz-column-rule-color: \a:columnrulecolor; - -webkit-column-rule-color: \a:columnrulecolor; - column-rule-color: \a:columnrulecolor; - -moz-column-rule-style: \a:columnrulestyle; - -webkit-column-rule-style: \a:columnrulestyle; - column-rule-style: \a:columnrulestyle; - -moz-column-fill: \a:columnfill; - -webkit-column-fill: \a:columnfill; - column-fill: \a:columnfill; - }% - }% -} -\def\mult:cols{\IgnorePar\EndP% - \HCode{
}% +% CSS needs to be written for every column count +\NewConfigure{multicolscss}{1} +\def\:wr:mcol:css{\a:multicolscss } + +% this configuration should configure HTML code inserted for multicols environment +\NewConfigure{multicolscolumn}{2} + +\def\mult:cols{\a:multicolscolumn% \expandafter\ifx\csname .\a:multicols-\mcolnum\endcsname\relax% \:wr:mcol:css \expandafter\gdef\csname .\a:multicols-\mcolnum\endcsname{1}% \fi\ShowPar\par} -\append:def\endmulticols{\ifvmode\IgnorePar\fi\EndP\HCode{
}} +\append:def\endmulticols{\b:multicolscolumn} >>> \Section{lettrine.sty} diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex index 72577ab6966..d21364326da 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-html4.tex 1121 2022-04-28 13:36:29Z michal_h21 $ +% $Id: tex4ht-html4.tex 1124 2022-04-29 15:04:44Z michal_h21 $ % Compile 4 times: latex tex4ht-html4 % Copy html4.4ht into the work directory before all but the last compilation. % @@ -15672,6 +15672,35 @@ IE doesn't distinguish between upper and lower case characters in css \<<< \HAssign\MultiCols=0 \ConfigureEnv{multicols}{}{}{}{} + +\Configure{multicolscolumn} +{\ifvmode\IgnorePar\fi\EndP\HCode{
}} +{\ifvmode\IgnorePar\fi\EndP\HCode{
}} + +\Configure{multicolscss}{% + \Css{.\a:multicols-\mcolnum\space :first-child { margin-top: 0em; }}% + \Css{.\a:multicols-\mcolnum {% + -moz-column-count:\mcolnum; + -webkit-column-count:\mcolnum; + column-count:\mcolnum; + -moz-column-gap: \a:columngap; + -webkit-column-gap: \a:columngap; + column-gap: \a:columngap; + -moz-column-rule-width: \a:columnrulewidth; + -webkit-column-rule-width: \a:columnrulewidth; + column-rule-rule-width: \a:columnrulewidth; + -moz-column-rule-color: \a:columnrulecolor; + -webkit-column-rule-color: \a:columnrulecolor; + column-rule-color: \a:columnrulecolor; + -moz-column-rule-style: \a:columnrulestyle; + -webkit-column-rule-style: \a:columnrulestyle; + column-rule-style: \a:columnrulestyle; + -moz-column-fill: \a:columnfill; + -webkit-column-fill: \a:columnfill; + column-fill: \a:columnfill; + }% + }% +} % {\par\IgnorePar\EndP % \gHAdvance\MultiCols by 1\relax % \HCode{}\HCode{
}\bgroup \bf} {\egroup\EndP\HCode{
}} -\Css{dl.enumerate-enumitem{display:grid; grid-template-columns: 3ch 1fr;}} +\Css{dl.enumerate-enumitem{display:grid; grid-template-columns: 3ch 1fr; align-items: top; row-gap:1ch;}} >>> diff --git a/Master/texmf-dist/tex/generic/tex4ht/enumitem.4ht b/Master/texmf-dist/tex/generic/tex4ht/enumitem.4ht index 51f50ab7343..acfca8ea8a1 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/enumitem.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/enumitem.4ht @@ -1,32 +1,29 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% enumitem.4ht 2009-05-21-09:32 % -% Copyright (C) 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} - - +% enumitem.4ht 2022-04-29-14:33 % +% Copyright (C) 2009-2009 Eitan M. Gurari % +% Copyright 2009-2022 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. +\AddToHook{env/enumerate/end}{\ifx\enit@after\@empty\else% + \let\enit:after\enit@after + \let\enit@after\@empty + \let\enumerate:executed\@empty + \append:def\end:DL{\enit:after} +\fi} \Hinput{enumitem} \endinput diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht index 414ad4c1838..cf5f8a131c2 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 (2022-04-28-13:47), generated from tex4ht-html4.tex +% html4.4ht (2022-04-29-14:33), generated from tex4ht-html4.tex % Copyright 2009-2022 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 2022-04-28-13:47} +\immediate\write-1{version 2022-04-29-14:33} \exit:ifnot{8859-6,% CJK,% @@ -36003,7 +36003,7 @@ description">}% {\end:itm \global\def\end:itm{\EndP\Tg}\HCode{
}\bgroup \bf} {\egroup\EndP\HCode{
}} -\Css{dl.enumerate-enumitem{display:grid; grid-template-columns: 3ch 1fr;}} +\Css{dl.enumerate-enumitem{display:grid; grid-template-columns: 3ch 1fr; align-items: top; row-gap:1ch;}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -38153,6 +38153,35 @@ emailing the fix to gurari@cse.ohio-state.edu. Thanks\Hnewline %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \HAssign\MultiCols=0 \ConfigureEnv{multicols}{}{}{}{} + +\Configure{multicolscolumn} +{\ifvmode\IgnorePar\fi\EndP\HCode{
}} +{\ifvmode\IgnorePar\fi\EndP\HCode{
}} + +\Configure{multicolscss}{% + \Css{.\a:multicols-\mcolnum\space :first-child { margin-top: 0em; }}% + \Css{.\a:multicols-\mcolnum {% + -moz-column-count:\mcolnum; + -webkit-column-count:\mcolnum; + column-count:\mcolnum; + -moz-column-gap: \a:columngap; + -webkit-column-gap: \a:columngap; + column-gap: \a:columngap; + -moz-column-rule-width: \a:columnrulewidth; + -webkit-column-rule-width: \a:columnrulewidth; + column-rule-rule-width: \a:columnrulewidth; + -moz-column-rule-color: \a:columnrulecolor; + -webkit-column-rule-color: \a:columnrulecolor; + column-rule-color: \a:columnrulecolor; + -moz-column-rule-style: \a:columnrulestyle; + -webkit-column-rule-style: \a:columnrulestyle; + column-rule-style: \a:columnrulestyle; + -moz-column-fill: \a:columnfill; + -webkit-column-fill: \a:columnfill; + column-fill: \a:columnfill; + }% + }% +} % {\par\IgnorePar\EndP % \gHAdvance\MultiCols by 1\relax % \HCode{
}% +% CSS needs to be written for every column count +\NewConfigure{multicolscss}{1} +\def\:wr:mcol:css{\a:multicolscss } + +% this configuration should configure HTML code inserted for multicols environment +\NewConfigure{multicolscolumn}{2} + +\def\mult:cols{\a:multicolscolumn% \expandafter\ifx\csname .\a:multicols-\mcolnum\endcsname\relax% \:wr:mcol:css \expandafter\gdef\csname .\a:multicols-\mcolnum\endcsname{1}% \fi\ShowPar\par} -\append:def\endmulticols{\ifvmode\IgnorePar\fi\EndP\HCode{}} +\append:def\endmulticols{\b:multicolscolumn} \Hinput{multicol} \endinput -- cgit v1.2.3