From 6b2fce697356e48c8e620b647d75533c94b6497b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 27 Apr 2022 21:03:34 +0000 Subject: uelem math rendering, tex4ht r1120 git-svn-id: svn://tug.org/texlive/trunk@63162 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/generic/tex4ht/ChangeLog | 7 +++++ .../source/generic/tex4ht/tex4ht-html4.tex | 18 +++++------ .../source/generic/tex4ht/tex4ht-mathml.tex | 35 +++++++++++----------- Master/texmf-dist/tex/generic/tex4ht/html4.4ht | 20 ++++++------- Master/texmf-dist/tex/generic/tex4ht/mathml.4ht | 32 +++++++++----------- 5 files changed, 57 insertions(+), 55 deletions(-) diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 27cce11cff6..58146aa1e3f 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,10 @@ +2022-04-27 Michal Hoftich + + * tex4ht-html4.tex (html4.4ht): corrected class names for Ulem + commands in the math mode. + * tex4ht-mathml.tex (mathml.4ht): work arounds for displaying + lines for Ulem commands. + 2022-04-26 Michal Hoftich * tex4ht-4ht.tex (ulem.4ht), diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex index d9d3ae88ada..cd6cf2992e4 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 1119 2022-04-26 15:53:45Z michal_h21 $ +% $Id: tex4ht-html4.tex 1120 2022-04-27 10:47:56Z michal_h21 $ % Compile 4 times: latex tex4ht-html4 % Copy html4.4ht into the work directory before all but the last compilation. % @@ -22056,44 +22056,44 @@ gets something wrong there. \Configure{uline} {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Configure{uline-math} - {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Css{.uline,.uline-math{ text-decoration:underline; }} \Configure{uuline} {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Configure{uuline-math} - {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Css{.uuline,.uuline-math{ text-decoration:underline double; }} \Configure{sout} {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Configure{sout-math} - {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Css{span.sout, .sout-math {text-decoration: line-through }} \Configure{xout} {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Configure{xout-math} - {\HCode{}\NoFonts} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Css{span.xout, .xout-math {text-decoration: line-through underline }} \Configure{uwave} {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Configure{uwave-math} - {\HCode{}\NoFonts} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Css{span.uwave, .uwave-math {text-decoration:underline wavy; }} \Configure{dashuline} {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Configure{dashuline-math} - {\HCode{}\NoFonts} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Css{span.dashuline, .dashuline-math {text-decoration:underline dashed;}} \Configure{dotuline} - {\HCode{}\NoFonts} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Configure{dotuline-math} - {\HCode{}\NoFonts} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Css{span.dotuline, .dotuline-math {text-decoration:underline dotted;}} >>> diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex index 5f5da30c082..5c277625e5e 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 1119 2022-04-26 15:53:45Z michal_h21 $$ +% $Id: tex4ht-mathml.tex 1120 2022-04-27 10:47:56Z michal_h21 $$ % compile 3 times: latex tex4ht-mathltx % or xhlatex tex4ht-mathltx "html,3,sections+" % @@ -3828,33 +3828,32 @@ accent="true">&\#x0332;}% {\HCode{}} >>> -Support for the Ulem package in MathML +Support for the Ulem package in MathML. It seems that text-decoration CSS +property doesn't work in browsers for Mathml, so we need to use various tricks +to emulate effects, especially double, dotted and dashed lines. + \<<< \Configure{uline-math} - {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} -\Css{.uline-math{ text-decoration:underline; }} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Configure{uuline-math} - {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} -\Css{.uuline-math{ text-decoration:underline double; }} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} +\Css{.uuline-math{ border-bottom:3px double black; }} \Configure{sout-math} - {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} -\Css{.sout-math {text-decoration: line-through }} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Configure{xout-math} - {\HCode{}\NoFonts} - {\EndNoFonts\HCode{}} -\Css{.xout-math {text-decoration: line-through underline }} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} \Configure{uwave-math} - {\HCode{}\NoFonts} - {\EndNoFonts\HCode{}} -\Css{.uwave-math {text-decoration:underline wavy; }} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} \Configure{dashuline-math} - {\HCode{}\NoFonts} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} -\Css{.dashuline-math {text-decoration:underline dashed;}} +\Css{.dashuline-math {border-bottom: 1px dashed black;}} \Configure{dotuline-math} - {\HCode{}\NoFonts} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} -\Css{.dotuline-math {text-decoration:underline dotted;}} +\Css{.dotuline-math {border-bottom: 1px dotted black;}} >>> diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht index 70c092e7164..c6747362b82 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-26-14:01), generated from tex4ht-html4.tex +% html4.4ht (2022-04-27-13:58), 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-26-14:01} +\immediate\write-1{version 2022-04-27-13:58} \exit:ifnot{8859-6,% CJK,% @@ -37154,44 +37154,44 @@ description">}% \Configure{uline} {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Configure{uline-math} - {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Css{.uline,.uline-math{ text-decoration:underline; }} \Configure{uuline} {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Configure{uuline-math} - {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Css{.uuline,.uuline-math{ text-decoration:underline double; }} \Configure{sout} {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Configure{sout-math} - {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Css{span.sout, .sout-math {text-decoration: line-through }} \Configure{xout} {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Configure{xout-math} - {\HCode{}\NoFonts} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Css{span.xout, .xout-math {text-decoration: line-through underline }} \Configure{uwave} {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Configure{uwave-math} - {\HCode{}\NoFonts} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Css{span.uwave, .uwave-math {text-decoration:underline wavy; }} \Configure{dashuline} {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Configure{dashuline-math} - {\HCode{}\NoFonts} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Css{span.dashuline, .dashuline-math {text-decoration:underline dashed;}} \Configure{dotuline} - {\HCode{}\NoFonts} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Configure{dotuline-math} - {\HCode{}\NoFonts} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Css{span.dotuline, .dotuline-math {text-decoration:underline dotted;}} diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht index bf3fe8e2cdc..10e4b8006f6 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-04-26-14:01), generated from tex4ht-mathml.tex +% mathml.4ht (2022-04-27-13:58), generated from tex4ht-mathml.tex % Copyright 2009-2021 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-04-26-14:01} +\immediate\write-1{version 2022-04-27-13:58} \exit:ifnot{Preamble,% accents,% @@ -4134,30 +4134,26 @@ accent="true">&\#x0332;}% \ConfigureHinput{ulem} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \Configure{uline-math} - {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} -\Css{.uline-math{ text-decoration:underline; }} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Configure{uuline-math} - {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} -\Css{.uuline-math{ text-decoration:underline double; }} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} +\Css{.uuline-math{ border-bottom:3px double black; }} \Configure{sout-math} - {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} -\Css{.sout-math {text-decoration: line-through }} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} \Configure{xout-math} - {\HCode{}\NoFonts} - {\EndNoFonts\HCode{}} -\Css{.xout-math {text-decoration: line-through underline }} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} \Configure{uwave-math} - {\HCode{}\NoFonts} - {\EndNoFonts\HCode{}} -\Css{.uwave-math {text-decoration:underline wavy; }} + {\HCode{}\NoFonts} + {\EndNoFonts\HCode{}} \Configure{dashuline-math} - {\HCode{}\NoFonts} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} -\Css{.dashuline-math {text-decoration:underline dashed;}} +\Css{.dashuline-math {border-bottom: 1px dashed black;}} \Configure{dotuline-math} - {\HCode{}\NoFonts} + {\HCode{}\NoFonts} {\EndNoFonts\HCode{}} -\Css{.dotuline-math {text-decoration:underline dotted;}} +\Css{.dotuline-math {border-bottom: 1px dotted black;}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -- cgit v1.2.3