diff options
| -rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/mathml.4ht | 76 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht | 111 |
2 files changed, 65 insertions, 122 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht index 9b50d32ebc2..7b56da2a078 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 (2016-08-11-16:11), generated from tex4ht-mathml.tex +% mathml.4ht (2016-11-23-15:58), generated from tex4ht-mathml.tex % Copyright 2009-2015 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 2016-08-11-16:11} +\immediate\write-1{version 2016-11-23-15:58} \exit:ifnot{Preamble,% accents,% @@ -410,15 +410,15 @@ vanilla} \HCode{</\a:mathml mrow>}\o:over: \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml mrow></\a:mathml mfrac>} \else - \Send{GROUP}{0}{<\a:mathml mfenced separators=""\Hnewline - open="\expandafter + \Send{GROUP}{0}{<\a:mathml mfenced \a:mathml separators=""\Hnewline + \a:mathml open="\expandafter \ifx \csname \string#2:lr del\endcsname\relax #2\else \csname \string#2:lr del\endcsname\fi -" close="\expandafter +" \a:mathml close="\expandafter \ifx \csname \string#3:lr del\endcsname\relax #3\else \csname \string#3:lr del\endcsname\fi "><\a:mathml mfrac - linethickness="\the\tmp:dim"><\a:mathml mrow>}% + \a:mathml linethickness="\the\tmp:dim"><\a:mathml mrow>}% \HCode{</\a:mathml mrow>}\o:over: \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml mrow></\a:mathml mfrac></\a:mathml mfenced>} @@ -434,15 +434,15 @@ vanilla} \HCode{</\a:mathml mrow>}\o:atop: \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml mrow></\a:mathml mfrac>} \else - \Send{GROUP}{0}{<\a:mathml mfenced separators=""\Hnewline - open="\expandafter + \Send{GROUP}{0}{<\a:mathml mfenced \a:mathml separators=""\Hnewline + \a:mathml open="\expandafter \ifx \csname \string#2:lr del\endcsname\relax #2\else \csname \string#2:lr del\endcsname\fi -" close="\expandafter +" \a:mathml close="\expandafter \ifx \csname \string#3:lr del\endcsname\relax #3\else \csname \string#3:lr del\endcsname\fi "><\a:mathml mfrac - linethickness="0"><\a:mathml mrow>}% + \a:mathml linethickness="0"><\a:mathml mrow>}% \HCode{</\a:mathml mrow>}\o:atop: \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml mrow></\a:mathml mfrac></\a:mathml mfenced>} @@ -457,11 +457,11 @@ vanilla} \HCode{</\a:mathml mrow>}\o:over: \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml mrow></\a:mathml mfrac>} \else - \Send{GROUP}{0}{<\a:mathml mfenced separators=""\Hnewline - open="\expandafter + \Send{GROUP}{0}{<\a:mathml mfenced \a:mathml separators=""\Hnewline + \a:mathml open="\expandafter \ifx \csname \string#2:lr del\endcsname\relax #2\else \csname \string#2:lr del\endcsname\fi -" close="\expandafter +" \a:mathml close="\expandafter \ifx \csname \string#3:lr del\endcsname\relax #3\else \csname \string#3:lr del\endcsname\fi "><\a:mathml mfrac><\a:mathml mrow>}% @@ -552,6 +552,7 @@ vanilla} {$\Tg</\a:mathml mrow>\EndDviMath\csname b:mathml()\endcsname} \NewConfigure{mathml[]}{2} \NewConfigure{mathml()}{2} +\let\columnlines\empty \Configure{halignTB<>}{array}{\HCode{\Hnewline \a:mathml equalrows="false" \a:mathml columnlines="\columnlines" @@ -862,14 +863,14 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% \def\:temp#1{\a:right{#1}\o:right:.\b:right{#1}}\HLet\right\:temp \Configure{left} {} - {\HCode{<\a:mathml mfenced separators=""\Hnewline - open="\expandafter + {\HCode{<\a:mathml mfenced \a:mathml separators=""\Hnewline + \a:mathml open="\expandafter \ifx \csname \string#1:lr del\endcsname\relax #1\else \csname \string#1:lr del\endcsname\fi "\space }\bgroup \HCode{><\a:mathml mrow>}\bgroup} \Configure{right} - {\egroup\Send{GROUP}{0}{ close="\expandafter + {\egroup\Send{GROUP}{0}{ \a:mathml close="\expandafter \ifx \csname \string#1:lr del\endcsname\relax #1\else \csname \string#1:lr del\endcsname\fi "\space}\egroup} @@ -1751,15 +1752,15 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% \HCode{</\a:mathml mrow>}\o:over: \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml mrow></\a:mathml mfrac>} \else - \Send{GROUP}{0}{<\a:mathml mfenced separators=""\Hnewline - open="\expandafter + \Send{GROUP}{0}{<\a:mathml mfenced \a:mathml separators=""\Hnewline + \a:mathml open="\expandafter \ifx \csname \string#2:lr del\endcsname\relax #2\else \csname \string#2:lr del\endcsname\fi -" close="\expandafter +" \a:mathml close="\expandafter \ifx \csname \string#3:lr del\endcsname\relax #3\else \csname \string#3:lr del\endcsname\fi "><\a:mathml mfrac - linethickness="0"><\a:mathml mrow>}% + \a:mathml linethickness="0"><\a:mathml mrow>}% \HCode{</\a:mathml mrow>}\o:@@over: \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml mrow></\a:mathml mfrac></\a:mathml mfenced>} @@ -1968,15 +1969,15 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% \HCode{</\a:mathml mrow>}\o:@@over: \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml mrow></\a:mathml mfrac>} \else - \Send{GROUP}{0}{<\a:mathml mfenced separators=""\Hnewline - open="\expandafter + \Send{GROUP}{0}{<\a:mathml mfenced \a:mathml separators=""\Hnewline + \a:mathml open="\expandafter \ifx \csname \string#2:lr del\endcsname\relax #2\else \csname \string#2:lr del\endcsname\fi -" close="\expandafter +" \a:mathml close="\expandafter \ifx \csname \string#3:lr del\endcsname\relax #3\else \csname \string#3:lr del\endcsname\fi "><\a:mathml mfrac - linethickness="\the\tmp:dim"><\a:mathml mrow>}% + \a:mathml linethickness="\the\tmp:dim"><\a:mathml mrow>}% \HCode{</\a:mathml mrow>}\o:@@over: \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml mrow></\a:mathml mfrac></\a:mathml mfenced>} @@ -1988,19 +1989,19 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% {} \def\atopwithdelims:III#1#2#3{% \def\:temp{#2#3}\def\:tempa{..}\ifx \:temp\:tempa - \Send{GROUP}{0}{<\a:mathml mfrac linethickness="0"><\a:mathml mrow>}% + \Send{GROUP}{0}{<\a:mathml mfrac \a:mathml linethickness="0"><\a:mathml mrow>}% \HCode{</\a:mathml mrow>}\o:@@atop: \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml mrow></\a:mathml mfrac>} \else - \Send{GROUP}{0}{<\a:mathml mfenced separators=""\Hnewline - open="\expandafter + \Send{GROUP}{0}{<\a:mathml mfenced \a:mathml separators=""\Hnewline + \a:mathml open="\expandafter \ifx \csname \string#2:lr del\endcsname\relax #2\else \csname \string#2:lr del\endcsname\fi -" close="\expandafter +" \a:mathml close="\expandafter \ifx \csname \string#3:lr del\endcsname\relax #3\else \csname \string#3:lr del\endcsname\fi "><\a:mathml mfrac - linethickness="0"><\a:mathml mrow>}% + \a:mathml linethickness="0"><\a:mathml mrow>}% \HCode{</\a:mathml mrow>}\o:@@atop: \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml mrow></\a:mathml mfrac></\a:mathml mfenced>} @@ -2015,11 +2016,11 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% \HCode{</\a:mathml mrow>}\o:@@over: \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml mrow></\a:mathml mfrac>} \else - \Send{GROUP}{0}{<\a:mathml mfenced separators=""\Hnewline - open="\expandafter + \Send{GROUP}{0}{<\a:mathml mfenced \a:mathml separators=""\Hnewline + \a:mathml open="\expandafter \ifx \csname \string#2:lr del\endcsname\relax #2\else \csname \string#2:lr del\endcsname\fi -" close="\expandafter +" \a:mathml close="\expandafter \ifx \csname \string#3:lr del\endcsname\relax #3\else \csname \string#3:lr del\endcsname\fi "><\a:mathml mfrac><\a:mathml mrow>}% @@ -2682,14 +2683,14 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% \def\:temp#1{\a:right{#1}\o:right:.\b:right{#1}}\HLet\right\:temp \Configure{left} {} - {\HCode{<\a:mathml mfenced separators=""\Hnewline - open="\expandafter + {\HCode{<\a:mathml mfenced \a:mathml separators=""\Hnewline + \a:mathml open="\expandafter \ifx \csname \string#1:lr del\endcsname\relax #1\else \csname \string#1:lr del\endcsname\fi "\space }\bgroup \HCode{><\a:mathml mrow>}\bgroup} \Configure{right} - {\egroup\Send{GROUP}{0}{ close="\expandafter + {\egroup\Send{GROUP}{0}{ \a:mathml close="\expandafter \ifx \csname \string#1:lr del\endcsname\relax #1\else \csname \string#1:lr del\endcsname\fi "\space}\egroup} @@ -3208,7 +3209,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{array} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \Configure{halignTB<>}{array}{\HCode{\Hnewline + \let\columnlines\empty +\Configure{halignTB<>}{array}{\HCode{\Hnewline \a:mathml equalrows="false" \a:mathml columnlines="\columnlines" \a:mathml equalcolumns="false" \a:mathml class="array"}<>\HAlign} @@ -4141,7 +4143,5 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% - - \endinput diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht index 08e1ac10d7c..fe0ee024e36 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht @@ -1,42 +1,28 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% ooffice-mml.4ht 2009-06-11-09:32 % -% Copyright (C) 2001--2009 Maarten Wisse % -% James Naughton % -% Eitan M. Gurari % -% % -% This work may be distributed and/or modified under the % -% conditions of the LaTeX Project Public License, either % -% version 1.3 of this license or (at your option) any % -% later version. The latest version of this license is % -% in % -% http://www.latex-project.org/lppl.txt % -% and version 1.3 or later is part of all distributions % -% of LaTeX version 2003/12/01 or later. % -% % -% This work has the LPPL maintenance status "maintained".% -% % -% This Current Maintainer of this work % -% is Eitan M. Gurari. % -% % -% If you modify this program your changing its signature % -% with a directive of the following form will be % -% appreciated. % -% \message{signature} % -% % -% Maarten.Wisse@urz.uni-heidelberg.de % -% http://home.wanadoo.nl/pmwisse % -% % -% james.naughton@st-edmund-hall.oxford.ac.uk % -% % -% gurari@cse.ohio-state.edu % -% http://www.cse.ohio-state.edu/~gurari % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\immediate\write-1{version 2009-06-11-09:32} +% ooffice-mml.4ht (2016-11-23-15:49), generated from tex4ht-ooffice.tex +% Copyright 2009-2016 TeX Users Group +% Copyright 2001-2009 Maarten Wisse, James Naughton, Eitan M. Gurari +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either +% version 1.3c of this license or (at your option) any +% later version. The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions +% of LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% The Current Maintainer of this work +% is the TeX4ht Project <http://tug.org/tex4ht>. +% +% If you modify this program, changing the +% version identification would be appreciated. +\immediate\write-1{version 2016-11-23-15:49} + \exit:ifnot{Preamble,% amsmath,% array,% latex,% -plain,% rlbabel,% tex4ht} @@ -138,7 +124,7 @@ tex4ht} <!-- \jobname-m\math:obj \space by TeX4ht from \jobname.tex line \the\inputlineno\space - 2009-06-11-09:32\Hnewline + 2016-11-23-15:49\Hnewline (http://www.cse.ohio-state.edu/\string ~gurari/TeX4ht/) -->\Hnewline }% @@ -482,26 +468,6 @@ tex4ht} {\ifmathml \HCode{</\a:mathml mrow><\a:mathml mo\Hnewline accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% \else \HCode{</text:span>}\fi \egroup} -\Configure{left} - {} - {\HCode{<\a:mathml mrow>\expandafter - \ifx \csname \string#1:lr del\endcsname\relax - <\a:mathml mo form="prefix" >#1</\a:mathml mo\space>\else - \expandafter\ifx \csname \string#1:lr del\endcsname\empty \else - <\a:mathml mo form="prefix" >\csname - \string#1:lr del\endcsname</\a:mathml mo>\fi - \fi<\a:mathml mrow>}} -\Configure{right} - {\HCode{</\a:mathml mrow>\expandafter - \ifx \csname \string#1:lr del\endcsname\relax - <\a:mathml mo form="postfix" >#1</\a:mathml mo>\else - \expandafter\ifx \csname \string#1:lr del\endcsname\empty \else - <\a:mathml mo form="postfix" >\csname - \string#1:lr del\endcsname</\a:mathml mo>\fi - \fi - }} - {\HCode{</\a:mathml mrow>}} - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -533,7 +499,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsmath} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -657,35 +622,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \ConfigureHinput{plain} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \Configure{left} - {} - {\HCode{<\a:mathml mrow>\expandafter - \ifx \csname \string#1:lr del\endcsname\relax - <\a:mathml mo form="prefix" >#1</\a:mathml mo\space>\else - \expandafter\ifx \csname \string#1:lr del\endcsname\empty \else - <\a:mathml mo form="prefix" >\csname - \string#1:lr del\endcsname</\a:mathml mo>\fi - \fi<\a:mathml mrow>}} -\Configure{right} - {\HCode{</\a:mathml mrow>\expandafter - \ifx \csname \string#1:lr del\endcsname\relax - <\a:mathml mo form="postfix" >#1</\a:mathml mo>\else - \expandafter\ifx \csname \string#1:lr del\endcsname\empty \else - <\a:mathml mo form="postfix" >\csname - \string#1:lr del\endcsname</\a:mathml mo>\fi - \fi - }} - {\HCode{</\a:mathml mrow>}} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\endinput\empty\empty\empty\empty\empty\empty -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - @@ -818,6 +756,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{rlbabel} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1104,5 +1044,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% + + + \endinput |