diff options
author | Karl Berry <karl@freefriends.org> | 2022-10-31 20:53:40 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-10-31 20:53:40 +0000 |
commit | cbc7a7bec9a6c93681069085e5b0174ecd60dde3 (patch) | |
tree | b2805166032ae603fb3042d3c8e0123253cc267b /Master/texmf-dist | |
parent | 49868cf03e277e482277b3671d839a8d6c029c4f (diff) |
avoid comments in mintedinline, tex4ht r1229; long arrows, tex4ht r1230; \boxed fixes, tex4ht r1231
git-svn-id: svn://tug.org/texlive/trunk@64884 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
9 files changed, 73 insertions, 46 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 2bc7ae0d33d..a58e929657b 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,22 @@ +2022-10-31 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-mathml.tex (mathml.4ht, html-mml.4ht): fixed output of the + \boxed command. + https://github.com/michal-h21/make4ht/issues/94 + + * tex4ht-unicode.tex (unicode.4ht): fixed Unicode characters for + more long arrow commands. + https://github.com/michal-h21/make4ht/issues/86 + + * tex4ht-4ht.tex (minted.4ht): don't insert comments in + \mintedinline, it can cause removal of HTML tags. + https://github.com/michal-h21/make4ht/issues/92 + +2022-10-30 Karl Berry <karl@freefriends.org> + + * tex4ht-4ht.tex (cleveref.4ht), + * tex4ht-unicode.tex (unicode.4ht): copyright 2022. + 2022-10-27 Michal Hoftich <michal.h21@gmail.com> * tex4ht-4ht.tex (cleveref.4ht): removed spurious spaces produced by diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index ca0a0fb8630..88324fc0db9 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 1227 2022-10-27 15:02:31Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1229 2022-10-31 11:23:43Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2022 TeX Users Group @@ -3614,7 +3614,7 @@ definitions. \<cleveref.4ht\><<< % cleveref.4ht (|version), generated from |jobname.tex -% Copyright 2018-2021 TeX Users Group +% Copyright 2018-2022 TeX Users Group |<TeX4ht license text|> |<cleveref refstepcounter|> @@ -25317,7 +25317,10 @@ in the generated HTML. \NewConfigure{InlineCode}{2} % this is a hack to hide a newline that is produced, and which causes spurious space in the output \NewConfigure{MintedHideNewline}{2} -\Configure{MintedHideNewline}{\HCode{<!--}}{\HCode{-->}} +% I cannot reproduce the newline issue now, but it seems that +% this comment can hide desired tags sometimes, so we should disable it. +% See https://github.com/michal-h21/make4ht/issues/92 +%\Configure{MintedHideNewline}{\HCode{<!--}}{\HCode{-->}} \def\:tempa#1{% \endgroup% diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex index 2118e986e32..e5e09fd63dc 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-mathml.tex 1226 2022-10-27 14:19:24Z michal_h21 $$ +% $Id: tex4ht-mathml.tex 1231 2022-10-31 12:34:12Z michal_h21 $$ % compile 3 times: latex tex4ht-mathltx % or xhlatex tex4ht-mathltx "html,3,sections+" % @@ -4936,11 +4936,11 @@ tail>>> \section{Boxed} %%%%%%%%%%%%%%%%%% -\<configure html-mml amsmath\><<< +\<configure mathml amsmath\><<< \Configure{boxed} - {\ifmathml \Tg<\a:mathml mrow \mml:class="boxed">% + {\ifmathml \Tg<\a:mathml menclose \a:mathml notation="box">\Tg<\a:mathml mrow>% \else \HCode{<span class="boxed">}\IgnorePar\fi} - {\ifmathml \Tg</\a:mathml mrow>% + {\ifmathml \Tg</\a:mathml mrow>\Tg</\a:mathml menclose>% \else \HCode{</span>}\fi} \Css{.boxed{border: 1px solid black; padding-left:2px; padding-right:2px;}} diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-unicode.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-unicode.tex index 83469c18700..e5ccf2814eb 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-unicode.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-unicode.tex @@ -1,7 +1,7 @@ -% $Id: tex4ht-unicode.tex 1223 2022-10-25 20:53:26Z michal_h21 $ +% $Id: tex4ht-unicode.tex 1230 2022-10-31 12:01:20Z michal_h21 $ % latex tex4ht-unicode or xhlatex tex4ht-unicode "html,3,sections+" % -% Copyright 2009-2021 TeX Users Group +% Copyright 2009-2022 TeX Users Group % Copyright 1998-2009 Eitan M. Gurari % Released under LPPL 1.3c+. % See tex4ht-cpright.tex for license text. @@ -227,7 +227,7 @@ of \verb'\mathop', \verb'\mathrel',...., for the next parameter. \<unicode\><<< % unicode.4ht (|version), generated from |jobname.tex -% Copyright 2009-2021 TeX Users Group +% Copyright 2009-2022 TeX Users Group % Copyright |CopyYear.1998. Eitan M. Gurari |<TeX4ht copywrite|> >>> @@ -442,11 +442,11 @@ The special replaces the `x' character. \Configure{ddots} {\x:unicode{22F1}} \Configure{hookleftarrow} {\x:unicode{21A9}} \Configure{hookrightarrow} {\x:unicode{21AA}} -\Configure{longleftarrow} {\x:unicode{2190}} -\Configure{longleftrightarrow} {\x:unicode{2194}} -\Configure{Longleftrightarrow} {\x:unicode{21D4}} -\Configure{longmapsto} {\x:unicode{21A6}} -\Configure{longrightarrow} {\x:unicode{2192}} +\Configure{longleftarrow} {\x:unicode{27F5}} +\Configure{longleftrightarrow} {\x:unicode{27F7}} +\Configure{Longleftrightarrow} {\x:unicode{27FA}} +\Configure{longmapsto} {\x:unicode{27FC}} +\Configure{longrightarrow} {\x:unicode{27F6}} \Configure{mid} {\x:unicode{2223}} \Configure{models} {\x:unicode{22A7}} \Configure{mapsto} {\x:unicode{21A6}} diff --git a/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht b/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht index 3ba14ba48e5..dfe3f02138f 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht @@ -1,4 +1,4 @@ -% html-mml.4ht (2022-10-25-13:43), generated from tex4ht-mathml.tex +% html-mml.4ht (2022-10-31-13:02), generated from tex4ht-mathml.tex % Copyright 2009-2022 TeX Users Group % Copyright 1999-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-10-25-13:43} +\immediate\write-1{version 2022-10-31-13:02} \exit:ifnot{amsmath,% array,% @@ -226,13 +226,15 @@ tex4ht} \HCode{</\:MT td>}\RecallEndP } \Css{.array-hline,.array-cline{ - border-bottom:black solid 1px; + border-top: 1px solid black; height:0px; }} -\Css{.hline-mtd{ +\Css{.array-hline + .array-vspace:last-child{display:none;}} +\Css{.hline-mtd, .array-hline td{ display:none }} \Css{.array-hline + .array-row:last-child{display:none;}} +\Css{.array-hline:first-child{border-bottom:1px solid black;border-top:none;}} \:CheckOption{fonts} \if:Option \Configure{texttt} {\ifmathml \providemtextclass{\mml:class="texttt" @@ -664,13 +666,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% {\let\tagform@=\:gobble } \Css{mtd.align-odd{margin-left:2em; text-align:right;}} \Css{mtd.align-even{margin-right:2em; text-align:left;}} -\Configure{boxed} - {\ifmathml \Tg<\a:mathml mrow \mml:class="boxed">% - \else \HCode{<span class="boxed">}\IgnorePar\fi} - {\ifmathml \Tg</\a:mathml mrow>% - \else \HCode{</span>}\fi} -\Css{.boxed{border: 1px solid black; padding-left:2px; - padding-right:2px;}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht index 5afccc2f9c5..eb41750a12d 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht @@ -1,4 +1,4 @@ -% mathml.4ht (2022-10-27-13:38), generated from tex4ht-mathml.tex +% mathml.4ht (2022-10-31-13:02), generated from tex4ht-mathml.tex % Copyright 2009-2022 TeX Users Group % Copyright 1999-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-10-27-13:38} +\immediate\write-1{version 2022-10-31-13:02} \exit:ifnot{Preamble,% accents,% @@ -2099,6 +2099,13 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% {\HCode{<\a:mathml mtd \a:mathml columnalign="\ifodd\HCol right\else left\fi" >}} {\HCode{</\a:mathml mtd>}} +\Configure{boxed} + {\ifmathml \Tg<\a:mathml menclose \a:mathml notation="box">\Tg<\a:mathml mrow>% + \else \HCode{<span class="boxed">}\IgnorePar\fi} + {\ifmathml \Tg</\a:mathml mrow>\Tg</\a:mathml menclose>% + \else \HCode{</span>}\fi} +\Css{.boxed{border: 1px solid black; padding-left:2px; + padding-right:2px;}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/generic/tex4ht/minted.4ht b/Master/texmf-dist/tex/generic/tex4ht/minted.4ht index 9c7f6bd8c43..7ff6a2778e0 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/minted.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/minted.4ht @@ -1,4 +1,4 @@ -% minted.4ht (2022-04-04-07:43), generated from tex4ht-4ht.tex +% minted.4ht (2022-10-31-13:02), generated from tex4ht-4ht.tex % Copyright 2022 TeX Users Group % % This work may be distributed and/or modified under the @@ -16,13 +16,16 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-04-04-07:43} +\immediate\write-1{version 2022-10-31-13:02} \NewConfigure{InlineCode}{2} % this is a hack to hide a newline that is produced, and which causes spurious space in the output \NewConfigure{MintedHideNewline}{2} -\Configure{MintedHideNewline}{\HCode{<!--}}{\HCode{-->}} +% I cannot reproduce the newline issue now, but it seems that +% this comment can hide desired tags sometimes, so we should disable it. +% See https://github.com/michal-h21/make4ht/issues/92 +%\Configure{MintedHideNewline}{\HCode{<!--}}{\HCode{-->}} \def\:tempa#1{% \endgroup% diff --git a/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht b/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht index dbba934a142..b9f4e115a42 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht @@ -1,5 +1,5 @@ -% unicode.4ht (2022-10-25-13:59), generated from tex4ht-unicode.tex -% Copyright 2009-2021 TeX Users Group +% unicode.4ht (2022-10-31-13:02), generated from tex4ht-unicode.tex +% Copyright 2009-2022 TeX Users Group % Copyright 1998-2009 Eitan M. Gurari % % This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-10-25-13:59} +\immediate\write-1{version 2022-10-31-13:02} \exit:ifnot{8859-6,% SIunits,% @@ -502,11 +502,11 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% \Configure{ddots} {\x:unicode{22F1}} \Configure{hookleftarrow} {\x:unicode{21A9}} \Configure{hookrightarrow} {\x:unicode{21AA}} -\Configure{longleftarrow} {\x:unicode{2190}} -\Configure{longleftrightarrow} {\x:unicode{2194}} -\Configure{Longleftrightarrow} {\x:unicode{21D4}} -\Configure{longmapsto} {\x:unicode{21A6}} -\Configure{longrightarrow} {\x:unicode{2192}} +\Configure{longleftarrow} {\x:unicode{27F5}} +\Configure{longleftrightarrow} {\x:unicode{27F7}} +\Configure{Longleftrightarrow} {\x:unicode{27FA}} +\Configure{longmapsto} {\x:unicode{27FC}} +\Configure{longrightarrow} {\x:unicode{27F6}} \Configure{mid} {\x:unicode{2223}} \Configure{models} {\x:unicode{22A7}} \Configure{mapsto} {\x:unicode{21A6}} @@ -1013,11 +1013,11 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% \Configure{ddots} {\x:unicode{22F1}} \Configure{hookleftarrow} {\x:unicode{21A9}} \Configure{hookrightarrow} {\x:unicode{21AA}} -\Configure{longleftarrow} {\x:unicode{2190}} -\Configure{longleftrightarrow} {\x:unicode{2194}} -\Configure{Longleftrightarrow} {\x:unicode{21D4}} -\Configure{longmapsto} {\x:unicode{21A6}} -\Configure{longrightarrow} {\x:unicode{2192}} +\Configure{longleftarrow} {\x:unicode{27F5}} +\Configure{longleftrightarrow} {\x:unicode{27F7}} +\Configure{Longleftrightarrow} {\x:unicode{27FA}} +\Configure{longmapsto} {\x:unicode{27FC}} +\Configure{longrightarrow} {\x:unicode{27F6}} \Configure{mid} {\x:unicode{2223}} \Configure{models} {\x:unicode{22A7}} \Configure{mapsto} {\x:unicode{21A6}} diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht index b24eac7249a..4bf827cb163 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht @@ -1,4 +1,4 @@ -% usepackage.4ht (2022-10-27-13:37), generated from tex4ht-4ht.tex +% usepackage.4ht (2022-10-31-13:02), generated from tex4ht-4ht.tex % Copyright 2003-2009 Eitan M. Gurari % Copyright 2009-2022 TeX Users Group % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-10-27-13:37} +\immediate\write-1{version 2022-10-31-13:02} \def\:temp{tex4ht}\ifx \:temp\@currname \:warning{\string\usepackage{tex4ht} again?} |