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/tex/generic/tex4ht/enumitem.4ht | 53 +++++++++++------------ Master/texmf-dist/tex/generic/tex4ht/html4.4ht | 35 +++++++++++++-- Master/texmf-dist/tex/generic/tex4ht/multicol.4ht | 44 ++++++------------- 3 files changed, 70 insertions(+), 62 deletions(-) (limited to 'Master/texmf-dist/tex/generic/tex4ht') 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