diff options
Diffstat (limited to 'tex/context/base/x-mathml.mkiv')
| -rw-r--r-- | tex/context/base/x-mathml.mkiv | 108 | 
1 files changed, 54 insertions, 54 deletions
| diff --git a/tex/context/base/x-mathml.mkiv b/tex/context/base/x-mathml.mkiv index e5da5f832..50092ef94 100644 --- a/tex/context/base/x-mathml.mkiv +++ b/tex/context/base/x-mathml.mkiv @@ -548,7 +548,7 @@          \doifelse \MMLbasesymbol \v!no {              \MMLcCNbasedata{\xmlflush{#1}}          } { -            \MMLcCNbasedata{\xmlflush{#1}}_{ +            \MMLcCNbasedata{\xmlflush{#1}}\normalsubscript{                  \hbox {$                      \mr                      \scriptscriptstyle @@ -583,7 +583,7 @@  \stopxmlsetups  \startxmlsetups mml:cn:polar:b -    {\mr e}^{\xmlsnippet{#1}{1}+\xmlsnippet{#1}{3}\thinspace{\mr i}} +    {\mr e}\normalsuperscript{\xmlsnippet{#1}{1}+\xmlsnippet{#1}{3}\thinspace{\mr i}}  \stopxmlsetups  \startxmlsetups mml:cn:polar:c @@ -617,7 +617,7 @@          \else              \first              \doifelse \MMLfloatsymbol {dot} \cdot \times -            10^{\last} +            10\normalsuperscript{\last}          \fi \fi      }  \stopxmlsetups @@ -634,7 +634,7 @@      } {          \xmlsnippet{#1}{1}          \doifelse \MMLenotationsymbol {dot} \cdot -        \times10^{\xmlsnippet{#1}{3}} +        \times10\normalsuperscript{\xmlsnippet{#1}{3}}      }  \stopxmlsetups @@ -842,7 +842,7 @@  \startxmlsetups mml:minmax      \xmldoif {#1} {/mml:bvar} { -        {}_{\xmlfirst{#1}{/mml:bvar}} +        {}\normalsubscript{\xmlfirst{#1}{/mml:bvar}}      }      \left\{      \xmlconcat{#1}{/!(mml:bvar\string|mml:max\string|mml:min)}{\MMLseparator,} @@ -951,13 +951,13 @@                  \gdef\MMLpowerelement{\mmlthird{#1}}% postpone, no xdef                  \MMLcreset\mmlsecond{#1}              } { -                \left(\MMLcreset\mmlsecond{#1}\right)^{\MMLcreset\mmlthird{#1}} +                \left(\MMLcreset\mmlsecond{#1}\right)\normalsuperscript{\MMLcreset\mmlthird{#1}}              }          } { -            \left(\MMLcreset\mmlsecond{#1}\right)^{\MMLcreset\mmlthird{#1}} +            \left(\MMLcreset\mmlsecond{#1}\right)\normalsuperscript{\MMLcreset\mmlthird{#1}}          }      } { -        \mmlsecond{#1}^{\MMLcreset\mmlthird{#1}} +        \mmlsecond{#1}\normalsuperscript{\MMLcreset\mmlthird{#1}}      }  \stopxmlsetups @@ -1043,7 +1043,7 @@  \def\mmlforallexistslist{mml:bvar\string|mml:forall\string|mml:exists\string|mml:condition}  \startxmlsetups mml:forallexists -    _{\xmlconcat{#1}{/mml:bvar}{\MMLseparator,}} +    \normalsubscript{\xmlconcat{#1}{/mml:bvar}{\MMLseparator,}}      \xmldoifelse {#1} {/mml:condition} {          \thickspace          \begingroup @@ -1185,17 +1185,17 @@  \startxmlsetups mml:int      \MMLcreset      \xmldoifelse {#1} {/mml:domainofapplication} { -        \int \doMMLlimits{int}_{\xmlfirst{#1}{/mml:domainofapplication}}\relax +        \int \doMMLlimits{int}\normalsubscript{\xmlfirst{#1}{/mml:domainofapplication}}\relax      } {          \xmldoifelse {#1} {/mml:condition} { -            \int \doMMLlimits{int}_{\xmlfirst{#1}{/mml:condition}}\relax +            \int \doMMLlimits{int}\normalsubscript{\xmlfirst{#1}{/mml:condition}}\relax          } {              \xmldoifelse {#1} {/mml:lowlimit} { -                \int \doMMLlimits{int}_{\xmlfirst{#1}{/mml:lowlimit}}^{\xmlfirst{#1}{/mml:uplimit}} +                \int \doMMLlimits{int}\normalsubscript{\xmlfirst{#1}{/mml:lowlimit}}\normalsuperscript{\xmlfirst{#1}{/mml:uplimit}}              } {                  % funny, why do we have lowlimit/uplimit then                  \xmldoifelse {#1} {/mml:apply/mml:interval} { -                    \int \doMMLlimits{int}_{\xmlindex{#1}{/mml:apply}{2}}^{\xmlindex{#1}{/mml:apply}{3}} +                    \int \doMMLlimits{int}\normalsubscript{\xmlindex{#1}{/mml:apply}{2}}\normalsuperscript{\xmlindex{#1}{/mml:apply}{3}}                  } {                      \int                  } @@ -1228,19 +1228,19 @@          \xmldoifelse {#1} {/mml:lambda} {              % a special case (mathadore/openmath)              \frac { -                d^{\xmlfirst{#1}{/mml:bvar}\xmlfirst{#1}{/mml:cn}}{\xmlfirst{#1}{/mml:lambda}\xmlfirst{#1}{/mml:ci}} +                d\normalsuperscript{\xmlfirst{#1}{/mml:bvar}\xmlfirst{#1}{/mml:cn}}{\xmlfirst{#1}{/mml:lambda}\xmlfirst{#1}{/mml:ci}}              } { -                d{\xmlfirst{#1}{/mml:bvar}\xmlfirst{#1}{/mml:ci}}^{\xmlfirst{#1}{/mml:bvar}\xmlfirst{#1}{/mml:cn}} +                d{\xmlfirst{#1}{/mml:bvar}\xmlfirst{#1}{/mml:ci}}\normalsuperscript{\xmlfirst{#1}{/mml:bvar}\xmlfirst{#1}{/mml:cn}}              }          } {              \xmldoifelse {#1} {/mml:bvar} {                  \frac {                      {\mr d}{                          \xmldoifelse {#1} {/mml:degree} { -                            ^{\xmlconcat{#1}{/mml:degree}\empty} +                            \normalsuperscript{\xmlconcat{#1}{/mml:degree}\empty}                          } {                              \xmldoif {#1} {/mml:bvar/mml:degree} { -                                ^{\xmlconcat{#1}{/mml:bvar/mml:degree}+} +                                \normalsuperscript{\xmlconcat{#1}{/mml:bvar/mml:degree}+}                              }                          }                      } @@ -1256,22 +1256,22 @@                      {\mr d}                      \xmlfirst{#1}{/mml:bvar/!mml:degree}                      \xmldoif {#1} {/mml:bvar/mml:degree} { -                        ^{\xmlfirst{#1}{/mml:bvar/mml:degree}} +                        \normalsuperscript{\xmlfirst{#1}{/mml:bvar/mml:degree}}                      }                  }                  \doifnot \MMLdifflocation \v!top {                      \left(\MMLcreset\xmlfirst{#1}{/(mml:apply\string|mml:ci)}\right)                  }              } { -                \xmlconcatrange{#1}{/*}{2}{}^\prime +                \xmlconcatrange{#1}{/*}{2}{}\normalsuperscript\prime              }          }      } {          \MMLcreset          \xmlfirst{#1}{/(mml:apply\string|mml:ci)} -        % there can be problems with nested diff's: ^^{} error +        % there can be problems with nested diff's: \normalsuperscript\normalsuperscript{} error          % so we add an empty group here -        {}^ +        {}\normalsuperscript          {              \xmldoifelse {#1} {/mml:degree} {                  \edef\mmldegree{\xmlfirst{#1}{/mml:degree/mml:cn}} @@ -1289,7 +1289,7 @@  \startxmlsetups mml:partialdiff      \xmldoifelse {#1} {/mml:list} { -        {\mr D}_{ +        {\mr D}\normalsubscript{              \begingroup                  \setfalse\mmllistdelimiters                  \xmlall{#1}{/mml:list} @@ -1299,7 +1299,7 @@      } {          \xmldoifelse {#1} {/mml:bvar} {              \frac { -                {\mr d}^{ +                {\mr d}\normalsuperscript{                      \xmldoifelse {#1} {/mml:degree} {                          \xmlconcat{#1}{/mml:degree}\empty                      } { @@ -1314,7 +1314,7 @@                  }                  {\mr d}\xmlfirst{#1}{/(mml:apply\string|mml:reln\string|mml:ci\string|mml:cn)}                  \xmldoif {#1} {/mml:bvar/mml:degree} { -                    ^{\xmlfirst{#1}{/mml:bvar/mml:degree}} +                    \normalsuperscript{\xmlfirst{#1}{/mml:bvar/mml:degree}}                  }              }          } { @@ -1326,7 +1326,7 @@  \startxmlsetups mml:divergence \mathopnolimits{div}      \xmlall{#1}{/!mml:divergence} \stopxmlsetups  \startxmlsetups mml:grad       \mathopnolimits{grad}     \xmlall{#1}{/!mml:grad}       \stopxmlsetups  \startxmlsetups mml:curl       \mathopnolimits{curl}     \xmlall{#1}{/!mml:curl}       \stopxmlsetups -\startxmlsetups mml:laplacian  \nabla^2                  \xmlall{#1}{/!mml:laplacian}  \stopxmlsetups +\startxmlsetups mml:laplacian  \nabla\normalsuperscript2 \xmlall{#1}{/!mml:laplacian}  \stopxmlsetups  \startxmlsetups mml:ident      \mathopnolimits{identity} \xmlall{#1}{/!mml:ident}      \stopxmlsetups  \setupMMLappearance[domain]  [symbol=] @@ -1336,7 +1336,7 @@      \doifelsenothing \MMLdomainsymbol {          \mathopnolimits{domain}\MMLcreset\xmlall{#1}{/!mml:domain}      } { -        \MMLdomainsymbol_{\xmlall{#1}{/!mml:domain}} +        \MMLdomainsymbol\normalsubscript{\xmlall{#1}{/!mml:domain}}      }  \stopxmlsetups @@ -1344,7 +1344,7 @@      \doifelsenothing \MMLcodomainsymbol {          \mathopnolimits{codomain}\MMLcreset\xmlall{#1}{/!mml:codomain}      } { -        \MMLcodomainsymbol_{\xmlall{#1}{/!mml:codomain}} +        \MMLcodomainsymbol\normalsubscript{\xmlall{#1}{/!mml:codomain}}      }  \stopxmlsetups @@ -1414,7 +1414,7 @@      \begingroup      \xmldoifelse {#1} {/(mml:condition\string|mml:bvar\string|mml:lowlimit)} {          \def\mmlsumprodlower{ -            _{ +            \normalsubscript{                  \xmldoifelse {#1} {/mml:condition} {                      \mmlstackedsubscripts{\xmlconcat{#1}{/mml:condition}{\crcr}}                  } { @@ -1430,7 +1430,7 @@          \let\mmlsumprodlower\empty      }      \xmldoifelse {#1} {/mml:uplimit} { -        \def\mmlsumprodupper{^{\xmlfirst{#1}{/mml:uplimit}}} +        \def\mmlsumprodupper{\normalsuperscript{\xmlfirst{#1}{/mml:uplimit}}}      } {          \let\mmlsumprodupper\empty      } @@ -1438,10 +1438,10 @@          \edef\mmlintervalfrom{\xmlindex{#1}{/mml:interval}{1}}          \edef\mmlintervalto  {\xmlindex{#1}{/mml:interval}{2}}          \ifx \mmlintervalfrom \empty \else -            \def\mmlsumprodlower{_{\xmldoif{#1}{/mml:bvar}{\xmlfirst{#1}{/mml:bvar}{=}}\mmlintervalfrom}} +            \def\mmlsumprodlower{\normalsubscript{\xmldoif{#1}{/mml:bvar}{\xmlfirst{#1}{/mml:bvar}{=}}\mmlintervalfrom}}          \fi          \ifx \mmlintervalto \empty \else -            \def\mmlsumprodupper{^{\mmlintervalto}} +            \def\mmlsumprodupper{\normalsuperscript{\mmlintervalto}}          \fi      }      \MMLcreset @@ -1459,7 +1459,7 @@  \startxmlsetups mml:limit      \MMLcreset \lim -    \doMMLlimits {limit}_{ +    \doMMLlimits {limit}\normalsubscript{          \MMLcreset          \xmldoifelse {#1} {/mml:condition} {              \xmlfirst{#1}{/mml:condition} @@ -1495,18 +1495,18 @@  \setupMMLappearance[log][\c!location=\v!right]  \startxmlsetups mml:exp -%   {\mr e}^{\xmlfirst{#1}{/mml:apply\string|mml:reln\string|mml:ci\string|mml:cn}} -    {\mr e}^{\xmlfirst{#1}{/!mml:exp}} +%   {\mr e}\normalsuperscript{\xmlfirst{#1}{/mml:apply\string|mml:reln\string|mml:ci\string|mml:cn}} +    {\mr e}\normalsuperscript{\xmlfirst{#1}{/!mml:exp}}  \stopxmlsetups  \startxmlsetups mml:log     \xmldoifelse {#1} {/mml:logbase} {          \doifelse \MMLloglocation \v!left {              \mathop { -                {}^{\xmlfirst{#1}{/mml:logbase}}\negthinspace\mathopnolimits{log} +                {}\normalsuperscript{\xmlfirst{#1}{/mml:logbase}}\negthinspace\mathopnolimits{log}              }          } { -            \mathopnolimits{log}_{\xmlfirst{#1}{/mml:logbase}} +            \mathopnolimits{log}\normalsubscript{\xmlfirst{#1}{/mml:logbase}}          }  %         \MMLcreset          \xmlfirst{#1}{/(mml:apply\string|mml:reln\string|mml:ci\string|mml:cn)} @@ -1528,20 +1528,20 @@  % statistics -\startxmlsetups mml:mean     \overline                             {\mmlsecond{#1}}         \stopxmlsetups -\startxmlsetups mml:sdev     \sigma                 \left(\MMLcreset\mmlsecond{#1}\right)   \stopxmlsetups -\startxmlsetups mml:variance \sigma                 \left(\MMLcreset\mmlsecond{#1}\right)^2 \stopxmlsetups -\startxmlsetups mml:median   \mathopnolimits{median}\left(\MMLcreset\mmlsecond{#1}\right)   \stopxmlsetups -\startxmlsetups mml:mode     \mathopnolimits{mode}  \left(\MMLcreset\mmlsecond{#1}\right)   \stopxmlsetups +\startxmlsetups mml:mean     \overline                             {\mmlsecond{#1}}                          \stopxmlsetups +\startxmlsetups mml:sdev     \sigma                 \left(\MMLcreset\mmlsecond{#1}\right)                    \stopxmlsetups +\startxmlsetups mml:variance \sigma                 \left(\MMLcreset\mmlsecond{#1}\right)\normalsuperscript2 \stopxmlsetups +\startxmlsetups mml:median   \mathopnolimits{median}\left(\MMLcreset\mmlsecond{#1}\right)                    \stopxmlsetups +\startxmlsetups mml:mode     \mathopnolimits{mode}  \left(\MMLcreset\mmlsecond{#1}\right)                    \stopxmlsetups  % moments  \startxmlsetups mml:moment      \left\langle -        \xmlfirst{#1}{/(mml:apply\string|mml:reln\string|mml:ci\string|mml:cn)}^{\xmlfirst{#1}{/mml:degree}} +        \xmlfirst{#1}{/(mml:apply\string|mml:reln\string|mml:ci\string|mml:cn)}\normalsuperscript{\xmlfirst{#1}{/mml:degree}}      \right\rangle      \xmldoif {#1} {mml:momentabout} { -        _{\xmlfirst{#1}{mml:momentabout}} +        \normalsubscript{\xmlfirst{#1}{mml:momentabout}}      }  \stopxmlsetups @@ -1596,11 +1596,11 @@  \stopxmlsetups  \startxmlsetups mml:transpose -    \mmlsecond{#1}^{\mathopnolimits{T}} +    \mmlsecond{#1}\normalsuperscript{\mathopnolimits{T}}  \stopxmlsetups  \startxmlsetups mml:selector -    \MMLmathinner{\mmlsecond{#1}_{\MMLcreset\xmlconcatrange{#1}{/*}{3}{}{\MMLseparator,}}} +    \MMLmathinner{\mmlsecond{#1}\normalsubscript{\MMLcreset\xmlconcatrange{#1}{/*}{3}{}{\MMLseparator,}}}  \stopxmlsetups  \startxmlsetups mml:vectorproduct \mmlsecond{#1}\times \mmlthird{#1} \stopxmlsetups @@ -1700,10 +1700,10 @@  \startxmlsetups mml:function      \ifx\MMLpowerelement\empty -        \ifconditional\xmlinversefunction^{-1}\fi +        \ifconditional\xmlinversefunction\normalsuperscript{-1}\fi          \setfalse\xmlinversefunction      \else -        ^{\ifconditional\xmlinversefunction-\fi\MMLpowerelement} +        \normalsuperscript{\ifconditional\xmlinversefunction-\fi\MMLpowerelement}          \setfalse\xmlinversefunction          \glet\MMLpowerelement\empty      \fi @@ -2075,25 +2075,25 @@  \startxmlsetups mml:msub      \doifelse\MMLscriptsalternative\v!a { -        {\mmlfirst{#1}}_{\mmlsecond{#1}} +        {\mmlfirst{#1}}\normalsubscript{\mmlsecond{#1}}      } { -         \mmlfirst{#1} _{\mmlsecond{#1}} +         \mmlfirst{#1} \normalsubscript{\mmlsecond{#1}}      }  \stopxmlsetups  \startxmlsetups mml:msup      \doifelse\MMLscriptsalternative\v!a { -        {\mmlfirst{#1}}^{\mmlsecond{#1}} +        {\mmlfirst{#1}}\normalsuperscript{\mmlsecond{#1}}      } { -         \mmlfirst{#1} ^{\mmlsecond{#1}} +         \mmlfirst{#1} \normalsuperscript{\mmlsecond{#1}}      }  \stopxmlsetups  \startxmlsetups mml:msubsup      \doifelse\MMLscriptsalternative\v!a { -        {\mmlfirst{#1}}_{\mmlsecond{#1}}^{\mmlthird{#1}} +        {\mmlfirst{#1}}\normalsubscript{\mmlsecond{#1}}\normalsuperscript{\mmlthird{#1}}      } { -         \mmlfirst{#1} _{\mmlsecond{#1}}^{\mmlthird{#1}} +         \mmlfirst{#1} \normalsubscript{\mmlsecond{#1}}\normalsuperscript{\mmlthird{#1}}      }  \stopxmlsetups @@ -2158,7 +2158,7 @@  \startxmlsetups mml:munderover      \edef\mmlbasetoken{\xmlraw{#1}{/mml:*[1]}}      \edef\mmlbasecommand{\utfmathcommand\mmlbasetoken} -    \mmlexecuteifdefined\mmlbasecommand{\mathematics{\mmlfirst{#1}}}_{\mmlsecond{#1}}^{\mmlthird{#1}} +    \mmlexecuteifdefined\mmlbasecommand{\mathematics{\mmlfirst{#1}}}\normalsubscript{\mmlsecond{#1}}\normalsuperscript{\mmlthird{#1}}  \stopxmlsetups  % tables (mml:mtable, mml:mtr, mml:mlabledtr, mml:mtd) | 
