diff options
10 files changed, 93 insertions, 59 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index c01b437555c..e6939da8cc2 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,33 @@ +2022-07-05 Karl Berry <karl@freefriends.org> + + * Makefile (tex4ht_4ht_derived): add texpower. + (all): rm texput.log, no need to check it. + * tex4ht-4ht.tex (\writesixteen), + * tex4ht-sty.tex (\writesixteen): just one "Verify length" + is enough, without exclamation points (irritating match when + searching for TeX error messages), especially we don't do any such + verification. + +2022-07-05 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-4ht.tex (latex.4ht): don't redefine \MakeUppercase, + \MakeLowercase and \@tabacckludge. + https://puszcza.gnu.org.ua/bugs/?477 + +2022-07-04 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-options.tex (tex4ht.4ht): load jats.4ht before mathml.4ht. + + * tex4ht-mathml.tex (mathml.4ht): added \a:mathml prefix for more + elements where it was missing. + + * tex4ht-mathml.tex (mathml.4ht): use \a:mathml prefix for Ulem + commands. + + * tex4ht-4ht.tex (nameref.4ht): use \protected@xdef in definition of + caption title, to prevent further errors. + https://tex.stackexchange.com/a/649734/2891 + 2022-07-03 Michal Hoftich <michal.h21@gmail.com> * tex4ht-4ht.tex (colortbl.4ht): fixed error when \arrayrulecolor is diff --git a/Master/texmf-dist/source/generic/tex4ht/Makefile b/Master/texmf-dist/source/generic/tex4ht/Makefile index ca129d9aeb5..3c48521b3d7 100644 --- a/Master/texmf-dist/source/generic/tex4ht/Makefile +++ b/Master/texmf-dist/source/generic/tex4ht/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 1148 2022-06-13 20:58:49Z michal_h21 $ +# $Id: Makefile 1171 2022-07-05 21:29:31Z karl $ # This file is public domain. Originally written 2010, Karl Berry. # Assumes GNU make. diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index e5c61d58e4a..753ebab863d 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 1165 2022-07-03 18:18:19Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1171 2022-07-05 21:29:31Z karl $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2022 TeX Users Group @@ -13,10 +13,7 @@ \DrawOff \def\writesixteen#1{\immediate\write1616{#1}} -\writesixteen{----------Verify length of lines!!!!------------} -\writesixteen{----------Verify length of lines!!!!------------} -\writesixteen{----------Verify length of lines!!!!------------} -\writesixteen{----------Verify length of lines!!!!------------} +\writesixteen{----------Verify length of lines (4ht)------------} \newif\ifalprotex \alprotexfalse @@ -3482,7 +3479,7 @@ definitions. \begingroup% \let\index\:gobble% \let\label\:gobble% - \xdef\NR:Title{\a:newlabel{#2}}% + \protected@xdef\NR:Title{\a:newlabel{#2}}% \endgroup% \o:NR@@caption{#1}[{#2}]% } @@ -14405,12 +14402,20 @@ and it causes a loss of spaces in tex4ht. \Section{Accents} %%%%%%%%%%%%%%%%%% -The following is for +The following was for \`'/n/candy/0/tex/teTeX/texmf/tex/latex/base/inputenc.sty' and files like \`'/n/candy/0/tex/teTeX/texmf/tex/latex/base/latin1.def'. -\<latex accents\><<< +But 2022 release of LaTeX don't need special handling of \`'\@tabacckcludge', +the accents works even when we remove the following redefinitions. + +What is more serious is that these redefinitions of MakeUppercase and +MakeLowercase don't change text case anymore, and it also causes +compilation error for the \`'\chapter' command. So we need to +disable it even if it was useful in some older documents. + +\<latex accents not used anymore\><<< \let\:tabacckludge|=\@tabacckludge \def\@tabacckludge#1{\csname #1\endcsname} \long\def\:temp#1{\bgroup \let\@tabacckludge|=\:tabacckludge @@ -14421,6 +14426,9 @@ and files like \expandafter\HLet\csname MakeLowercase \endcsname|=\:temp >>> +The following is the reasoning why the previous lines were included in the +first place: + \Verbatim > Really, [latin1] redefines "=E1" as {\@tabacckludge'a}, and TeX4ht is diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex index 3eb94430764..1d32d1d22c3 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 1163 2022-06-30 15:37:22Z michal_h21 $$ +% $Id: tex4ht-mathml.tex 1168 2022-07-04 14:00:59Z michal_h21 $$ % compile 3 times: latex tex4ht-mathltx % or xhlatex tex4ht-mathltx "html,3,sections+" % @@ -657,7 +657,7 @@ We reserve code 254 (and 255) for unknown symbols. \<configure mathml amsmath\><<< -\Configure{boldsymbol}{\bgroup\HCode{<mstyle mathvariant="bold-italic">}}{\HCode{</mstyle>}\egroup} +\Configure{boldsymbol}{\bgroup\HCode{<\a:mathml mstyle mathvariant="bold-italic">}}{\HCode{</\a:mathml mstyle>}\egroup} >>> \<configure mathml amsmath\><<< @@ -939,8 +939,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="..."><mtext> >>> \<mml fonts\><<< -\Configure{htf}{0}{+}{<mstyle\Hnewline - class="}{\%s}{-\%s}{x-x-\%d}{}{">}{</mstyle>}% +\Configure{htf}{0}{+}{<\a:mathml mstyle\Hnewline + class="}{\%s}{-\%s}{x-x-\%d}{}{">}{</\a:mathml mstyle>}% >>> \<tex compiler mathml\><<< @@ -3848,25 +3848,25 @@ to emulate effects, especially double, dotted and dashed lines. \<configure mathml ulem\><<< \Configure{uline-math} - {\HCode{<menclose class="uline-math" notation="bottom">}\NoFonts} {\EndNoFonts\HCode{</menclose>}} + {\HCode{<\a:mathml menclose class="uline-math" notation="bottom">}\NoFonts} {\EndNoFonts\HCode{</\a:mathml menclose>}} \Configure{uuline-math} - {\HCode{<menclose class="uuline-math" notation="bottom">}\NoFonts} {\EndNoFonts\HCode{</menclose>}} + {\HCode{<\a:mathml menclose class="uuline-math" notation="bottom">}\NoFonts} {\EndNoFonts\HCode{</\a:mathml menclose>}} \Css{.uuline-math{ border-bottom:3px double black; }} \Configure{sout-math} - {\HCode{<menclose class="sout-math" notation="horizontalstrike">}\NoFonts} {\EndNoFonts\HCode{</menclose>}} + {\HCode{<\a:mathml menclose class="sout-math" notation="horizontalstrike">}\NoFonts} {\EndNoFonts\HCode{</\a:mathml menclose>}} \Configure{xout-math} - {\HCode{<menclose class="xout-math" notation="horizontalstrike bottom">}\NoFonts} - {\EndNoFonts\HCode{</menclose>}} + {\HCode{<\a:mathml menclose class="xout-math" notation="horizontalstrike bottom">}\NoFonts} + {\EndNoFonts\HCode{</\a:mathml menclose>}} \Configure{uwave-math} - {\HCode{<menclose class="uwave-math" notation="bottom">}\NoFonts} - {\EndNoFonts\HCode{</menclose>}} + {\HCode{<\a:mathml menclose class="uwave-math" notation="bottom">}\NoFonts} + {\EndNoFonts\HCode{</\a:mathml menclose>}} \Configure{dashuline-math} - {\HCode{<mstyle class="dashuline-math" notation="bottom">}\NoFonts} - {\EndNoFonts\HCode{</mstyle>}} + {\HCode{<\a:mathml mstyle class="dashuline-math" notation="bottom">}\NoFonts} + {\EndNoFonts\HCode{</\a:mathml mstyle>}} \Css{.dashuline-math {border-bottom: 1px dashed black;}} \Configure{dotuline-math} - {\HCode{<mstyle class="dotuline-math" notation="bottom">}\NoFonts} - {\EndNoFonts\HCode{</mstyle>}} + {\HCode{<\a:mathml mstyle class="dotuline-math" notation="bottom">}\NoFonts} + {\EndNoFonts\HCode{</\a:mathml mstyle>}} \Css{.dotuline-math {border-bottom: 1px dotted black;}} >>> @@ -5389,9 +5389,9 @@ with small shifting. \Configure{color}% {\Configure{SetHColor} {\Css{.textcolor\textcolorN{color:\HColor}}}}% - \HCode{<\ifmathml mstyle\else span\fi + \HCode{<\ifmathml\a:mathml mstyle\else span\fi \space id="textcolor\textcolorN">}}% - {\HCode{</\ifmathml mstyle\else span\fi>}} + {\HCode{</\ifmathml\a:mathml mstyle\else span\fi>}} >>> @@ -5400,7 +5400,7 @@ with small shifting. {\ifmathml \Configure{color}% {\Configure{SetHColor} - {\HCode{<mstyle mathcolor="\HColor">}}}% + {\HCode{<\a:mathml mstyle mathcolor="\HColor">}}}% \else \gHAdvance\textcolorN by 1 \Configure{color}% @@ -5409,7 +5409,7 @@ with small shifting. \HCode{<span id="textcolor\textcolorN">}% \fi }% - {\HCode{</\ifmathml mstyle\else span\fi>}} + {\HCode{</\ifmathml\a:mathml mstyle\else span\fi>}} >>> diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-options.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-options.tex index 2f059e93ccf..3a5a36eee81 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-options.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-options.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-options.tex 1125 2022-05-01 15:26:13Z karl $ +% $Id: tex4ht-options.tex 1169 2022-07-04 14:03:16Z michal_h21 $ % latex tex4ht-options or xhlatex tex4ht-options % % Copyright 2009-2022 TeX Users Group @@ -328,10 +328,10 @@ Allows cleanup using xtpipes. \<jats settings\><<< \Configure{jats}{% \Hinclude[*]{html4.4ht}% we will build upon HTML + \Hinclude[*]{jats.4ht}% \Hinclude[*]{mathml.4ht}% \Hinclude[*]{html-mml.4ht}% \Hinclude[*]{unicode.4ht}% - \Hinclude[*]{jats.4ht}% } >>> diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex index 1ff2a961510..02b759ca684 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex @@ -1,7 +1,7 @@ -% $Id: tex4ht-sty.tex 1137 2022-05-23 07:58:41Z michal_h21 $ +% $Id: tex4ht-sty.tex 1171 2022-07-05 21:29:31Z karl $ % tex tex4ht-sty or ht tex tex4ht-sty % -% Copyright 2009-2020 TeX Users Group +% Copyright 2009-2022 TeX Users Group % Copyright 1996-2009 Eitan M. Gurari % Released under LPPL 1.3c+. % See tex4ht-cpright.tex for license text. @@ -12,11 +12,7 @@ \DrawOff -\writesixteen{----------Verify length of lines!!!!------------} -\writesixteen{----------Verify length of lines!!!!------------} -\writesixteen{----------Verify length of lines!!!!------------} -\writesixteen{----------Verify length of lines!!!!------------} - +\writesixteen{----------Verify length of lines (sty)------------} \newif\ifalprotex \alprotexfalse diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht index bc8fcd909d7..13875e0616b 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-06-30-13:48), generated from tex4ht-mathml.tex +% mathml.4ht (2022-07-05-14:37), 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-06-30-13:48} +\immediate\write-1{version 2022-07-05-14:37} \exit:ifnot{Preamble,% accents,% @@ -1989,7 +1989,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% \HCode{</\a:mathml mtd></\a:mathml mtr>}% \fi\fi } -\Configure{boldsymbol}{\bgroup\HCode{<mstyle mathvariant="bold-italic">}}{\HCode{</mstyle>}\egroup} +\Configure{boldsymbol}{\bgroup\HCode{<\a:mathml mstyle mathvariant="bold-italic">}}{\HCode{</\a:mathml mstyle>}\egroup} \Configure{maketag} {\ifmathml \ifmtext \expandafter\expandafter\expandafter\no:maketag\fi @@ -4141,25 +4141,25 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% \ConfigureHinput{ulem} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \Configure{uline-math} - {\HCode{<menclose class="uline-math" notation="bottom">}\NoFonts} {\EndNoFonts\HCode{</menclose>}} + {\HCode{<\a:mathml menclose class="uline-math" notation="bottom">}\NoFonts} {\EndNoFonts\HCode{</\a:mathml menclose>}} \Configure{uuline-math} - {\HCode{<menclose class="uuline-math" notation="bottom">}\NoFonts} {\EndNoFonts\HCode{</menclose>}} + {\HCode{<\a:mathml menclose class="uuline-math" notation="bottom">}\NoFonts} {\EndNoFonts\HCode{</\a:mathml menclose>}} \Css{.uuline-math{ border-bottom:3px double black; }} \Configure{sout-math} - {\HCode{<menclose class="sout-math" notation="horizontalstrike">}\NoFonts} {\EndNoFonts\HCode{</menclose>}} + {\HCode{<\a:mathml menclose class="sout-math" notation="horizontalstrike">}\NoFonts} {\EndNoFonts\HCode{</\a:mathml menclose>}} \Configure{xout-math} - {\HCode{<menclose class="xout-math" notation="horizontalstrike bottom">}\NoFonts} - {\EndNoFonts\HCode{</menclose>}} + {\HCode{<\a:mathml menclose class="xout-math" notation="horizontalstrike bottom">}\NoFonts} + {\EndNoFonts\HCode{</\a:mathml menclose>}} \Configure{uwave-math} - {\HCode{<menclose class="uwave-math" notation="bottom">}\NoFonts} - {\EndNoFonts\HCode{</menclose>}} + {\HCode{<\a:mathml menclose class="uwave-math" notation="bottom">}\NoFonts} + {\EndNoFonts\HCode{</\a:mathml menclose>}} \Configure{dashuline-math} - {\HCode{<mstyle class="dashuline-math" notation="bottom">}\NoFonts} - {\EndNoFonts\HCode{</mstyle>}} + {\HCode{<\a:mathml mstyle class="dashuline-math" notation="bottom">}\NoFonts} + {\EndNoFonts\HCode{</\a:mathml mstyle>}} \Css{.dashuline-math {border-bottom: 1px dashed black;}} \Configure{dotuline-math} - {\HCode{<mstyle class="dotuline-math" notation="bottom">}\NoFonts} - {\EndNoFonts\HCode{</mstyle>}} + {\HCode{<\a:mathml mstyle class="dotuline-math" notation="bottom">}\NoFonts} + {\EndNoFonts\HCode{</\a:mathml mstyle>}} \Css{.dotuline-math {border-bottom: 1px dotted black;}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/generic/tex4ht/nameref.4ht b/Master/texmf-dist/tex/generic/tex4ht/nameref.4ht index 264739db7bd..ef6805f0a54 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/nameref.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/nameref.4ht @@ -1,4 +1,4 @@ -% nameref.4ht (2022-06-27-13:57), generated from tex4ht-4ht.tex +% nameref.4ht (2022-07-05-14:35), generated from tex4ht-4ht.tex % Copyright 2005-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-06-27-13:57} +\immediate\write-1{version 2022-07-05-14:35} \let\NR:Type\relax \let\ltx@label\label @@ -93,7 +93,7 @@ \begingroup% \let\index\:gobble% \let\label\:gobble% - \xdef\NR:Title{\a:newlabel{#2}}% + \protected@xdef\NR:Title{\a:newlabel{#2}}% \endgroup% \o:NR@@caption{#1}[{#2}]% } diff --git a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht index a267651a50d..a3ebf5e1858 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht @@ -1,7 +1,7 @@ \ifnum\the\catcode`\%=14\else \expandafter\edef\csname \string:RestoreCatcodes\endcsname{\catcode`\%\the \catcode`\%}\catcode`\%14\fi -% tex4ht.4ht (2022-05-01-08:24), generated from tex4ht-options.tex +% tex4ht.4ht (2022-07-05-14:37), generated from tex4ht-options.tex % Copyright 2009-2022 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari % @@ -20,7 +20,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-05-01-08:24} +\immediate\write-1{version 2022-07-05-14:37} \expandafter\edef\csname :RestoreCatcodes\endcsname{% \expandafter\ifx \csname :RestoreCatcodes\endcsname\relax\else @@ -225,10 +225,10 @@ \Configure{jats}{% \Hinclude[*]{html4.4ht}% we will build upon HTML + \Hinclude[*]{jats.4ht}% \Hinclude[*]{mathml.4ht}% \Hinclude[*]{html-mml.4ht}% \Hinclude[*]{unicode.4ht}% - \Hinclude[*]{jats.4ht}% } \Configure{docbook}{% diff --git a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty index 01e1480b4a1..fe1980a741e 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty +++ b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty @@ -1,7 +1,7 @@ \ifnum\the\catcode`\%=14\else\expandafter\edef\csname \string:RestoreCatcodes\endcsname{\catcode`\%\the \catcode`\%}\catcode`\%14\fi -% tex4ht.sty (2022-05-23-13:42), generated from tex4ht-sty.tex +% tex4ht.sty (2022-07-05-14:35), generated from tex4ht-sty.tex % Copyright 2009-2022 TeX Users Group % Copyright 1996-2009 Eitan M. Gurari % @@ -20,7 +20,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-05-23-13:42} +\immediate\write-1{version 2022-07-05-14:35} \ifx \Preamble\UnDef \else |