From 5696e41092268f76b82d65994fb41cfd2f48d833 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 6 Feb 2021 22:54:11 +0000 Subject: \protect in \:nbsp, tex4ht r880 git-svn-id: svn://tug.org/texlive/trunk@57651 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/tex4ht/latex.4ht | 8 ++-- Master/texmf-dist/tex/generic/tex4ht/mathml.4ht | 56 ++++++++++++++++-------- Master/texmf-dist/tex/generic/tex4ht/unicode.4ht | 28 +++++++----- 3 files changed, 59 insertions(+), 33 deletions(-) (limited to 'Master/texmf-dist/tex/generic') diff --git a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht index bada7d6466f..7102f0cdca5 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht @@ -1,4 +1,4 @@ -% latex.4ht (2021-01-24-13:56), generated from tex4ht-4ht.tex +% latex.4ht (2021-02-06-14:21), generated from tex4ht-4ht.tex % Copyright 1997-2009 Eitan M. Gurari % Copyright 2009-2021 TeX Users Group % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2021-01-24-13:56} +\immediate\write-1{version 2021-02-06-14:21} \ifx\SaveMkHalignConf:g\:UnDef \else \expandafter\endinput\fi @@ -1994,10 +1994,10 @@ $\vcenter \else \sp:c\fi} \NewConfigure{ }[1]{\def\:temp{#1}% \ifx \:temp\empty \let\a:sp\sp:c\else\def\a:sp{#1}\fi} -\def\:nbsp{\leavevmode\special{t4ht@+\string&{35}x00A0{59}}x} -\def\:ensp{\leavevmode\special{t4ht@+\string&{35}x2002{59}}x} \Configure{ }{\:nbsp} +\def\:nbsp{\protect\leavevmode\special{t4ht@+\string&{35}x00A0{59}}x} +\def\:ensp{\protect\leavevmode\special{t4ht@+\string&{35}x2002{59}}x} \let\nobreakspace\:nbsp diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht index 87cdf6652cc..2440519ed28 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 (2020-09-08-14:03), generated from tex4ht-mathml.tex +% mathml.4ht (2021-02-06-14:21), generated from tex4ht-mathml.tex % Copyright 2009-2020 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 2020-09-08-14:03} +\immediate\write-1{version 2021-02-06-14:21} \exit:ifnot{Preamble,% accents,% @@ -1295,13 +1295,20 @@ accent="true">&\#x0332;}% \def\mathop:prefix#1{% \Configure{mathop}{*}{<\a:mathml mo #1\Hnewline>}{}% {\Configure{mathop}{*}{<\a:mathml mo>}{}{}}} -\def\:nbsp{\ifmtext \leavevmode\special{t4ht@+\string&{35}x00A0{59}}x% +\ifdefined\protect% +\def\:unicodespace{\protect\leavevmode\special{t4ht@+\string&{35}x00A0{59}}x}% +\def\:unicodenspace{\protect\leavevmode\special{t4ht@+\string&{35}x2002{59}}x}% +\else% +\def\:unicodespace{\leavevmode\special{t4ht@+\string&{35}x00A0{59}}x}% +\def\:unicodenspace{\leavevmode\special{t4ht@+\string&{35}x2002{59}}x}% +\fi +\def\:nbsp{\ifmtext \:unicodespace% \else\ifmathml - \Tg<\a:mathml mspace />\else \leavevmode\special{t4ht@+\string&{35}x00A0{59}}x% + \Tg<\a:mathml mspace />\else \:unicodespace% \fi\fi} -\def\:ensp{\ifmtext \leavevmode\special{t4ht@+\string&{35}x2002{59}}x% +\def\:ensp{\ifmtext \:unicodenspace% \else\ifmathml - \Tg<\a:mathml mspace />\else \leavevmode\special{t4ht@+\string&{35}x2002{59}}x% + \Tg<\a:mathml mspace />\else \:unicodenspace% \fi\fi} \Configure{cases} {}{} {\Tg<\a:mathml mtable>}{\Tg} @@ -1713,6 +1720,7 @@ accent="true">&\#x0332;}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsbsy} @@ -2082,7 +2090,6 @@ accent="true">&\#x0332;}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsfonts} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2104,6 +2111,7 @@ accent="true">&\#x0332;}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amstex1} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2167,7 +2175,6 @@ accent="true">&\#x0332;}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amstex} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3115,13 +3122,20 @@ accent="true">&\#x0332;}% \def\mathop:prefix#1{% \Configure{mathop}{*}{<\a:mathml mo #1\Hnewline>}{}% {\Configure{mathop}{*}{<\a:mathml mo>}{}{}}} -\def\:nbsp{\ifmtext \leavevmode\special{t4ht@+\string&{35}x00A0{59}}x% +\ifdefined\protect% +\def\:unicodespace{\protect\leavevmode\special{t4ht@+\string&{35}x00A0{59}}x}% +\def\:unicodenspace{\protect\leavevmode\special{t4ht@+\string&{35}x2002{59}}x}% +\else% +\def\:unicodespace{\leavevmode\special{t4ht@+\string&{35}x00A0{59}}x}% +\def\:unicodenspace{\leavevmode\special{t4ht@+\string&{35}x2002{59}}x}% +\fi +\def\:nbsp{\ifmtext \:unicodespace% \else\ifmathml - \Tg<\a:mathml mspace />\else \leavevmode\special{t4ht@+\string&{35}x00A0{59}}x% + \Tg<\a:mathml mspace />\else \:unicodespace% \fi\fi} -\def\:ensp{\ifmtext \leavevmode\special{t4ht@+\string&{35}x2002{59}}x% +\def\:ensp{\ifmtext \:unicodenspace% \else\ifmathml - \Tg<\a:mathml mspace />\else \leavevmode\special{t4ht@+\string&{35}x2002{59}}x% + \Tg<\a:mathml mspace />\else \:unicodenspace% \fi\fi} \Configure{cases} {}{} {\Tg<\a:mathml mtable>}{\Tg} @@ -3224,6 +3238,7 @@ accent="true">&\#x0332;}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3299,8 +3314,6 @@ accent="true">&\#x0332;}% - - @@ -3396,6 +3409,8 @@ accent="true">&\#x0332;}% + + @@ -3627,6 +3642,7 @@ accent="true">&\#x0332;}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{gauss} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3686,6 +3702,7 @@ accent="true">&\#x0332;}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{rlbabel} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3722,7 +3739,6 @@ accent="true">&\#x0332;}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3786,7 +3802,6 @@ accent="true">&\#x0332;}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3924,7 +3939,6 @@ accent="true">&\#x0332;}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3950,6 +3964,7 @@ accent="true">&\#x0332;}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{subeqnarray} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3999,7 +4014,6 @@ accent="true">&\#x0332;}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{sistyle} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4013,6 +4027,7 @@ accent="true">&\#x0332;}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{ushort} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4050,7 +4065,6 @@ accent="true">&\#x0332;}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{bm} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4196,6 +4210,10 @@ accent="true">&\#x0332;}% + + + + diff --git a/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht b/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht index bd4bf933856..5b471d0cab1 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht @@ -1,4 +1,4 @@ -% unicode.4ht (2020-09-18-15:30), generated from tex4ht-unicode.tex +% unicode.4ht (2021-02-06-14:21), generated from tex4ht-unicode.tex % Copyright 2009-2019 TeX Users Group % Copyright 1998-2009 Eitan M. Gurari % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2020-09-18-15:30} +\immediate\write-1{version 2021-02-06-14:21} \exit:ifnot{8859-6,% SIunits,% @@ -56,7 +56,11 @@ tex4ht} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{tex4ht} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \def\x:unicode#1{\leavevmode\ht:special{t4ht@+\string&{35}x#1{59}}x} + \ifdefined\protect% +\def\x:unicode#1{\protect\leavevmode\ht:special{t4ht@+\string&{35}x#1{59}}x} +\else +\def\x:unicode#1{\leavevmode\ht:special{t4ht@+\string&{35}x#1{59}}x} +\fi \Configure{htf}{12}{+} {}{}{}{}{}{}{} @@ -562,6 +566,7 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsart} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -573,7 +578,6 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsproc} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -594,6 +598,7 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsthm} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -703,7 +708,6 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{babel} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1175,6 +1179,7 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1243,7 +1248,6 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{8859-6} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1426,6 +1430,8 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% + + @@ -1439,7 +1445,6 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{cp852} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1470,6 +1475,7 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{cp1252} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1480,7 +1486,6 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{cp437} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1516,6 +1521,7 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{romanian} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1643,7 +1649,6 @@ y{0233}G{1E20}g{1E21}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{slovak} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1769,6 +1774,7 @@ y{0233}G{1E20}g{1E21}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{slovene} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1894,7 +1900,6 @@ y{0233}G{1E20}g{1E21}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{spanish} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2090,6 +2095,7 @@ y{0233}G{1E20}g{1E21}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{greek} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2132,6 +2138,8 @@ s{015B}u{00FA}y{00FD}z{017A}j{FFFD}J{FFDD}\i{00ED}\j{FFFD}% + + -- cgit v1.2.3