diff options
Diffstat (limited to 'support/TeX4ht')
| -rw-r--r-- | support/TeX4ht/source/ChangeLog | 10 | ||||
| -rw-r--r-- | support/TeX4ht/source/tex4ht-4ht.tex | 57 | ||||
| -rw-r--r-- | support/TeX4ht/source/tex4ht-html4.tex | 33 |
3 files changed, 68 insertions, 32 deletions
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog index a4f4595666..657bfe47d9 100644 --- a/support/TeX4ht/source/ChangeLog +++ b/support/TeX4ht/source/ChangeLog @@ -1,3 +1,13 @@ +2022-04-29 Michal Hoftich <michal.h21@gmail.com> + + * 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 <michal.h21@gmail.com> * tex4ht-ooffice.tex (ooffice.4ht): added dummy definition of diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex index 700179e6c1..7c6439ebc1 100644 --- a/support/TeX4ht/source/tex4ht-4ht.tex +++ b/support/TeX4ht/source/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} -\<enumitem config\><<< +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. +\<enumitem config\><<< +\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{<div class="\a:multicols-\mcolnum">}% +% 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{</div>}} +\append:def\endmulticols{\b:multicolscolumn} >>> \Section{lettrine.sty} diff --git a/support/TeX4ht/source/tex4ht-html4.tex b/support/TeX4ht/source/tex4ht-html4.tex index 72577ab696..d21364326d 100644 --- a/support/TeX4ht/source/tex4ht-html4.tex +++ b/support/TeX4ht/source/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 \<configure html4 multicol\><<< \HAssign\MultiCols=0 \ConfigureEnv{multicols}{}{}{}{} + +\Configure{multicolscolumn} +{\ifvmode\IgnorePar\fi\EndP\HCode{<div class="\a:multicols-\mcolnum">}} +{\ifvmode\IgnorePar\fi\EndP\HCode{</div>}} + +\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{<table class="multicols" @@ -16534,7 +16563,7 @@ Blue = 1-minimum(1,Yellow *(1-Black)+Black) {\end:itm \global\def\end:itm{\EndP\Tg</dd>}\HCode{<dt class="enumerate-enumitem">}\bgroup \bf} {\egroup\EndP\HCode{</dt><dd\Hnewline class="enumerate-enumitem">}} -\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;}} >>> |