From 9d5343983bbbf90fbc5a577e90f4624e2e7e41e1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 2 Feb 2011 01:05:03 +0000 Subject: mathastext (1feb11) git-svn-id: svn://tug.org/texlive/trunk@21253 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/mathastext/mathastext.sty | 588 ++++++++++++--------- 1 file changed, 337 insertions(+), 251 deletions(-) (limited to 'Master/texmf-dist/tex/latex/mathastext') diff --git a/Master/texmf-dist/tex/latex/mathastext/mathastext.sty b/Master/texmf-dist/tex/latex/mathastext/mathastext.sty index d8bd8134bba..8991a2c7aab 100644 --- a/Master/texmf-dist/tex/latex/mathastext/mathastext.sty +++ b/Master/texmf-dist/tex/latex/mathastext/mathastext.sty @@ -30,7 +30,8 @@ %% of the distribution. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesFile{mathastext.sty}[2011/01/25 1.0 use text font also in math] +\ProvidesFile{mathastext.sty} + [2011/02/01 1.1 Use the text font in simple mathematics] \def\mt@font@info@off{ \let\m@stext@info\@font@info \let\m@stext@warning\@font@warning @@ -42,24 +43,31 @@ \mt@font@info@off \newif\ifmt@need@euler\mt@need@eulerfalse \newif\ifmt@need@symbol\mt@need@symbolfalse -\newif\ifmt@defaultvec\mt@defaultvecfalse \newif\ifmt@defaultnormal\mt@defaultnormalfalse \newif\ifmt@defaultrm\mt@defaultrmfalse \newif\ifmt@defaultbf\mt@defaultbffalse \newif\ifmt@defaultsizes\mt@defaultsizesfalse \newif\ifmt@twelve\mt@twelvefalse -\newif\ifall@OTone -\newif\ifall@Tone -\DeclareOption{noparenthesis}{\let\mt@noparen\@empty} -\DeclareOption{nopunctuation}{\let\mt@nopunct\@empty} -\DeclareOption{noplusnominus}{\let\mt@noplusnominus\@empty} -\DeclareOption{noequal}{\let\mt@noequal\@empty} -\DeclareOption{noexclam}{\let\mt@noexclam\@empty} -\DeclareOption{noasterisk}{\let\mt@noast\@empty} -\DeclareOption{nospecials}{\let\mt@nospecials\@empty} +\newif\ifmt@endash\mt@endashfalse +\newif\ifmt@emdash\mt@emdashfalse +\def\mt@oti{OT1}\def\mt@ti{T1} +\DeclareOption{noparenthesis}{\let\mtno@paren\@empty} +\DeclareOption{nopunctuation}{\let\mtno@punct\@empty} +%% new in v1.1: +\DeclareOption{endash}{\mt@endashtrue} +\DeclareOption{emdash}{\mt@emdashtrue} +\DeclareOption{noplus}{\let\mtno@plus\@empty} +\DeclareOption{nominus}{\let\mtno@minus\@empty} +\DeclareOption{nohbar}{\let\mtno@hbar\@empty} +%% +\DeclareOption{noplusnominus}{\ExecuteOptions{noplus,nominus}} +\DeclareOption{noequal}{\let\mtno@equal\@empty} +\DeclareOption{noexclam}{\let\mtno@exclam\@empty} +\DeclareOption{noasterisk}{\let\mtno@ast\@empty} +\DeclareOption{nospecials}{\let\mtno@specials\@empty} \DeclareOption{basic}{\ExecuteOptions{noparenthesis,% nopunctuation,noplusnominus,noequal,noexclam,nospecials}} -\DeclareOption{nodigits}{\let\mt@nodigits\@empty} +\DeclareOption{nodigits}{\let\mtno@digits\@empty} \DeclareOption{defaultimath}{\let\mt@defaultimath\@empty} \DeclareOption{alldelims}{\let\mt@alldelims\@empty} \DeclareOption{mathaccents}{\let\mt@mathaccents\@empty} @@ -83,90 +91,115 @@ nopunctuation,noplusnominus,noequal,noexclam,nospecials}} \DeclareOption{defaultbf}{\mt@defaultbftrue} \DeclareOption{defaultmathsizes}{\mt@defaultsizestrue} \DeclareOption{12pt}{\mt@twelvetrue} -\DeclareOption{defaultvec}{\mt@defaultvectrue} +%% deprecated in v1.1, rather a command \fouriervec is provided +%% \DeclareOption{defaultvec}{\mt@defaultvectrue} +%% new in v1.1 +\DeclareOption{italic}{\let\mt@italic\@empty} +\DeclareOption{frenchmath}{\let\mt@frenchmath\@empty} \DeclareOption*{\PackageWarning{mathastext}{Unknown option `\CurrentOption'}} \ProcessOptions\relax +%% \DeclareRobustCommand\pmvec[1]{\mathord{\stackrel{\raisebox{-.5ex}% {\tiny\boldmath$\mathord{\rightarrow}$}}{{}#1}}} -\ifmt@defaultvec\else \DeclareFontEncoding{FML}{}{} \DeclareFontSubstitution{FML}{futm}{m}{it} - \DeclareSymbolFont{justepourvec}{FML}{futm}{m}{it} - \SetSymbolFont{justepourvec}{bold}{FML}{futm}{b}{it} - \DeclareMathAccent{\vec}{\mathord}{justepourvec}{"7E} -\fi + \DeclareSymbolFont{mtjustepourvec}{FML}{futm}{m}{it} + \SetSymbolFont{mtjustepourvec}{bold}{FML}{futm}{b}{it} + \DeclareMathAccent{\fouriervec}{\mathord}{mtjustepourvec}{"7E} \edef\m@stextenc{\encodingdefault} \edef\m@stextfam{\familydefault} \edef\m@stextser{\seriesdefault} \edef\m@stextsh{\shapedefault} \edef\m@stextbold{\bfdefault} -\DeclareRobustCommand\Mathastextencoding[1]{\edef\m@stextenc{#1}} -\DeclareRobustCommand\Mathastextfamily[1]{\edef\m@stextfam{#1}} -\DeclareRobustCommand\Mathastextseries[1]{\edef\m@stextser{#1}} -\DeclareRobustCommand\Mathastextshape[1]{\edef\m@stextsh{#1}} -\DeclareRobustCommand\Mathastextboldvariant[1]{\edef\m@stextbold{#1}} + \edef\m@stextshletter{\shapedefault} + \ifx\mt@italic\@empty\edef\m@stextshletter{\itdefault}\fi +\DeclareSymbolFont{mtoperatorfont} + {\m@stextenc}{\m@stextfam}{\m@stextser}{\m@stextsh} +\DeclareSymbolFont{mtletterfont} + {\m@stextenc}{\m@stextfam}{\m@stextser}{\m@stextshletter} +\DeclareSymbolFontAlphabet{\Mathnormal}{mtletterfont} +\DeclareSymbolFontAlphabet{\Mathrm}{mtoperatorfont} \ifmt@need@euler \DeclareSymbolFont{mteulervm}{U}{zeur}{m}{n} +\DeclareSymbolFontAlphabet{\MathEuler}{mteulervm} %% \SetSymbolFont{mteulervm}{bold}{U}{zeur}{\m@stextbold}{n} -\DeclareSymbolFontAlphabet{\MathastextEuler}{mteulervm} \fi \newcommand\MathastextEulerScale[1]{\edef\zeu@Scale{#1}} \ifmt@need@symbol \def\psy@scale{1} \DeclareSymbolFont{mtpsymbol}{U}{psy}{m}{n} %% \SetSymbolFont{mtpsymbol}{bold}{U}{psy}{\m@stextbold}{n} - \DeclareSymbolFontAlphabet{\MathastextSymbol}{mtpsymbol} + \DeclareSymbolFontAlphabet{\MathPSymbol}{mtpsymbol} \fi \newcommand\MathastextSymbolScale[1]{\edef\psy@scale{#1}} -\DeclareSymbolFont{mtcurrentfont} - {\m@stextenc}{\m@stextfam}{\m@stextser}{\m@stextsh} -\DeclareSymbolFontAlphabet{\Mathnormal}{mtcurrentfont} -\DeclareRobustCommand\MathastextWillUse[4]{ - \Mathastextencoding{#1} - \Mathastextfamily{#2} - \Mathastextseries{#3} - \Mathastextshape{#4} +\DeclareRobustCommand\Mathastextencoding[1]{\edef\m@stextenc{#1}} +\DeclareRobustCommand\Mathastextfamily[1]{\edef\m@stextfam{#1}} +\DeclareRobustCommand\Mathastextseries[1]{\edef\m@stextser{#1}} +\DeclareRobustCommand\Mathastextshape[1]{\edef\m@stextsh{#1}} +\DeclareRobustCommand\Mathastextboldvariant[1]{\edef\m@stextbold{#1}} +\DeclareRobustCommand\Mathastextlettershape[1]{\edef\m@stextshletter{#1}} +\DeclareRobustCommand\MathastextWillUse[5][\@empty]{ + \ifx\@empty#1\else\Mathastextlettershape{#1}\fi + \Mathastextencoding{#2} + \Mathastextfamily{#3} + \Mathastextseries{#4} + \Mathastextshape{#5} \Mathastext} \DeclareRobustCommand\Mathastext{ \mt@font@info@off - \def\tmp@a{OT1} - \def\tmp@b{T1} - \ifx\tmp@a\m@stextenc - \all@OTonetrue\else\all@OTonefalse\fi - \ifx\tmp@b\m@stextenc - \all@Tonetrue\else\all@Tonefalse\fi \edef\mt@encoding@normal{\m@stextenc} \edef\mt@family@normal{\m@stextfam} \edef\mt@series@normal{\m@stextser} \edef\mt@shape@normal{\m@stextsh} + \edef\mt@ltshape@normal{\m@stextshletter} \edef\mt@boldvariant@normal{\m@stextbold} \edef\mt@encoding@bold{\m@stextenc} \edef\mt@family@bold{\m@stextfam} \edef\mt@series@bold{\m@stextbold} \edef\mt@shape@bold{\m@stextsh} + \edef\mt@ltshape@bold{\m@stextshletter} \edef\mt@boldvariant@bold{\m@stextbold} - \SetSymbolFont{mtcurrentfont}{normal}{\mt@encoding@normal} +%% + \SetSymbolFont{mtletterfont}{normal}{\mt@encoding@normal} + {\mt@family@normal} + {\mt@series@normal} + {\mt@ltshape@normal} + \SetSymbolFont{mtletterfont}{bold} {\mt@encoding@bold} + {\mt@family@bold} + {\mt@series@bold} + {\mt@ltshape@bold} + \SetSymbolFont{mtoperatorfont}{normal}{\mt@encoding@normal} {\mt@family@normal} {\mt@series@normal} {\mt@shape@normal} - \SetSymbolFont{mtcurrentfont}{bold} {\mt@encoding@bold} + \SetSymbolFont{mtoperatorfont}{bold} {\mt@encoding@bold} {\mt@family@bold} {\mt@series@bold} {\mt@shape@bold} - \DeclareMathAlphabet{\Mathbf} {\mt@encoding@bold} + \DeclareMathAlphabet{\Mathbf} {\mt@encoding@bold} {\mt@family@bold} {\mt@series@bold} {\mt@shape@bold} - \ifmt@need@euler\SetSymbolFont{mteulervm}{bold}{U}{zeur}{\m@stextbold}{n}\fi + \DeclareMathAlphabet{\mathnormalbold} {\mt@encoding@bold} + {\mt@family@bold} + {\mt@series@bold} + {\mt@ltshape@bold} + \ifmt@need@euler + \SetSymbolFont{mteulervm}{bold}{U}{zeur}{\m@stextbold}{n} + \DeclareMathAlphabet{\MathEulerBold}{U}{zeur}{\m@stextbold}{n} + \fi \ifmt@need@symbol\SetSymbolFont{mtpsymbol}{bold}{U}{psy}{\m@stextbold}{n}\fi \typeout{** Latin letters in math versions normal (resp. bold) are now^^J% - ** set up to use fonts -\mt@encoding@normal/\mt@family@normal/\mt@series@normal(\m@stextbold)/\mt@shape@normal} - \mt@font@info@on + ** set up to use the fonts +\mt@encoding@normal/\mt@family@normal/\mt@series@normal(\m@stextbold)/\mt@ltshape@normal} +\ifx\mtno@digits\@empty\else + \typeout{** Other characters (digits, ...) and + \protect\log-like names will be^^J% +** typeset with the \expandafter`\mt@shape@normal' shape.} +\fi } -\def\operator@font{\mathgroup\symmtcurrentfont} +\def\operator@font{\mathgroup\symmtoperatorfont} \Mathastext -\newcommand{\Mathrm}{\Mathnormal} \let\mt@saved@mathnormal\mathnormal \@ifpackageloaded{fourier}{\ifsloped\else\let\mt@saved@mathnormal\mathrm\fi}{} \ifmt@defaultnormal\else\renewcommand{\mathnormal}{\Mathnormal}\fi @@ -184,20 +217,41 @@ nopunctuation,noplusnominus,noequal,noexclam,nospecials}} \typeout{** Capital Greek letters from the fonts declared for latin letters:^^J% ** only for OT1 or compatible encodings; glyphs may be unavailable.} \fi -\DeclareRobustCommand\MathastextDeclareVersion[5]{ +\DeclareRobustCommand\MathastextDeclareVersion[6][\@empty]{ \mt@font@info@off - \update@the@ifs{#2} - \DeclareMathVersion{#1} - \SetSymbolFont{mtcurrentfont}{#1}{#2}{#3}{#4}{#5} - \SetMathAlphabet{\Mathbf}{#1}{#2}{#3}{\m@stextbold}{#5} - \edef\mt@tmp{@#1} - \expandafter\edef\csname mt@encoding\mt@tmp\endcsname{#2} - \expandafter\edef\csname mt@family\mt@tmp\endcsname{#3} - \expandafter\edef\csname mt@series\mt@tmp\endcsname{#4} - \expandafter\edef\csname mt@shape\mt@tmp\endcsname{#5} + \DeclareMathVersion{#2} + \edef\mt@tmp{@#2} + \expandafter\edef\csname mt@encoding\mt@tmp\endcsname{#3} + \expandafter\edef\csname mt@family\mt@tmp\endcsname{#4} + \expandafter\edef\csname mt@series\mt@tmp\endcsname{#5} + \expandafter\edef\csname mt@shape\mt@tmp\endcsname{#6} \expandafter\edef\csname mt@boldvariant\mt@tmp\endcsname{\m@stextbold} - \typeout{** Latin letters in math version `#1' will use fonts - #2/#3/#4(\m@stextbold)/#5} + \ifx\@empty#1 + \ifx\mt@italic\@empty + \SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{\m@stextshletter} + \typeout{** Latin letters in math version `#2' will use the font + #3/#4/#5/\m@stextshletter^^J% + ** Other characters (digits, ...) and \protect\log-like names + will be in `#6' shape.} + \expandafter\def\csname mt@ltshape\mt@tmp\endcsname{\m@stextshletter} + \else + \SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{#6} + \typeout{** Latin letters in math version `#2' will use the fonts + #3/#4/#5(\m@stextbold)/#6} + \expandafter\edef\csname mt@ltshape\mt@tmp\endcsname{#6} + \fi + \else + \SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{#1} + \typeout{** Latin letters in math version `#2' will use the font + #3/#4/#5/#1^^J% + ** Other characters (digits, ...) and \protect\log-like names will be in `#6' shape.} + \expandafter\edef\csname mt@ltshape\mt@tmp\endcsname{#1} + \fi + \SetMathAlphabet{\Mathbf}{#2}{#3}{#4}{\m@stextbold}{#6} + \SetSymbolFont{mtoperatorfont}{#2}{#3}{#4}{#5}{#6} + \ifmt@need@euler + \SetMathAlphabet{\MathEulerBold}{#2}{U}{zeur}{\m@stextbold}{n} + \fi \mt@font@info@on } \DeclareRobustCommand\MathastextVersion[2][\@empty]{% @@ -219,65 +273,63 @@ nopunctuation,noplusnominus,noequal,noexclam,nospecials}} \edef\mt@@boldvariant{\csname mt@boldvariant\mt@tmp\endcsname}% \renewcommand{\bfdefault}{\mt@@boldvariant}% \fi} -\newcommand\update@the@ifs[1]{ - \edef\tmp@enc{#1} - \def\tmp@a{OT1}\ifall@OTone\ifx\tmp@a\tmp@enc\else\all@OTonefalse\fi\fi - \def\tmp@b{T1}\ifall@Tone\ifx\tmp@b\tmp@enc\else\all@Tonefalse\fi\fi -} -\DeclareMathSymbol{a}{\mathalpha}{mtcurrentfont}{`a} -\DeclareMathSymbol{b}{\mathalpha}{mtcurrentfont}{`b} -\DeclareMathSymbol{c}{\mathalpha}{mtcurrentfont}{`c} -\DeclareMathSymbol{d}{\mathalpha}{mtcurrentfont}{`d} -\DeclareMathSymbol{e}{\mathalpha}{mtcurrentfont}{`e} -\DeclareMathSymbol{f}{\mathalpha}{mtcurrentfont}{`f} -\DeclareMathSymbol{g}{\mathalpha}{mtcurrentfont}{`g} -\DeclareMathSymbol{h}{\mathalpha}{mtcurrentfont}{`h} -\DeclareMathSymbol{i}{\mathalpha}{mtcurrentfont}{`i} -\DeclareMathSymbol{j}{\mathalpha}{mtcurrentfont}{`j} -\DeclareMathSymbol{k}{\mathalpha}{mtcurrentfont}{`k} -\DeclareMathSymbol{l}{\mathalpha}{mtcurrentfont}{`l} -\DeclareMathSymbol{m}{\mathalpha}{mtcurrentfont}{`m} -\DeclareMathSymbol{n}{\mathalpha}{mtcurrentfont}{`n} -\DeclareMathSymbol{o}{\mathalpha}{mtcurrentfont}{`o} -\DeclareMathSymbol{p}{\mathalpha}{mtcurrentfont}{`p} -\DeclareMathSymbol{q}{\mathalpha}{mtcurrentfont}{`q} -\DeclareMathSymbol{r}{\mathalpha}{mtcurrentfont}{`r} -\DeclareMathSymbol{s}{\mathalpha}{mtcurrentfont}{`s} -\DeclareMathSymbol{t}{\mathalpha}{mtcurrentfont}{`t} -\DeclareMathSymbol{u}{\mathalpha}{mtcurrentfont}{`u} -\DeclareMathSymbol{v}{\mathalpha}{mtcurrentfont}{`v} -\DeclareMathSymbol{w}{\mathalpha}{mtcurrentfont}{`w} -\DeclareMathSymbol{x}{\mathalpha}{mtcurrentfont}{`x} -\DeclareMathSymbol{y}{\mathalpha}{mtcurrentfont}{`y} -\DeclareMathSymbol{z}{\mathalpha}{mtcurrentfont}{`z} -\DeclareMathSymbol{A}{\mathalpha}{mtcurrentfont}{`A} -\DeclareMathSymbol{B}{\mathalpha}{mtcurrentfont}{`B} -\DeclareMathSymbol{C}{\mathalpha}{mtcurrentfont}{`C} -\DeclareMathSymbol{D}{\mathalpha}{mtcurrentfont}{`D} -\DeclareMathSymbol{E}{\mathalpha}{mtcurrentfont}{`E} -\DeclareMathSymbol{F}{\mathalpha}{mtcurrentfont}{`F} -\DeclareMathSymbol{G}{\mathalpha}{mtcurrentfont}{`G} -\DeclareMathSymbol{H}{\mathalpha}{mtcurrentfont}{`H} -\DeclareMathSymbol{I}{\mathalpha}{mtcurrentfont}{`I} -\DeclareMathSymbol{J}{\mathalpha}{mtcurrentfont}{`J} -\DeclareMathSymbol{K}{\mathalpha}{mtcurrentfont}{`K} -\DeclareMathSymbol{L}{\mathalpha}{mtcurrentfont}{`L} -\DeclareMathSymbol{M}{\mathalpha}{mtcurrentfont}{`M} -\DeclareMathSymbol{N}{\mathalpha}{mtcurrentfont}{`N} -\DeclareMathSymbol{O}{\mathalpha}{mtcurrentfont}{`O} -\DeclareMathSymbol{P}{\mathalpha}{mtcurrentfont}{`P} -\DeclareMathSymbol{Q}{\mathalpha}{mtcurrentfont}{`Q} -\DeclareMathSymbol{R}{\mathalpha}{mtcurrentfont}{`R} -\DeclareMathSymbol{S}{\mathalpha}{mtcurrentfont}{`S} -\DeclareMathSymbol{T}{\mathalpha}{mtcurrentfont}{`T} -\DeclareMathSymbol{U}{\mathalpha}{mtcurrentfont}{`U} -\DeclareMathSymbol{V}{\mathalpha}{mtcurrentfont}{`V} -\DeclareMathSymbol{W}{\mathalpha}{mtcurrentfont}{`W} -\DeclareMathSymbol{X}{\mathalpha}{mtcurrentfont}{`X} -\DeclareMathSymbol{Y}{\mathalpha}{mtcurrentfont}{`Y} -\DeclareMathSymbol{Z}{\mathalpha}{mtcurrentfont}{`Z} -\ifx\mt@nodigits\@empty\else -\def\mt@font@tbu{mtcurrentfont} +\DeclareMathSymbol{a}{\mathalpha}{mtletterfont}{`a} +\DeclareMathSymbol{b}{\mathalpha}{mtletterfont}{`b} +\DeclareMathSymbol{c}{\mathalpha}{mtletterfont}{`c} +\DeclareMathSymbol{d}{\mathalpha}{mtletterfont}{`d} +\DeclareMathSymbol{e}{\mathalpha}{mtletterfont}{`e} +\DeclareMathSymbol{f}{\mathalpha}{mtletterfont}{`f} +\DeclareMathSymbol{g}{\mathalpha}{mtletterfont}{`g} +\DeclareMathSymbol{h}{\mathalpha}{mtletterfont}{`h} +\DeclareMathSymbol{i}{\mathalpha}{mtletterfont}{`i} +\DeclareMathSymbol{j}{\mathalpha}{mtletterfont}{`j} +\DeclareMathSymbol{k}{\mathalpha}{mtletterfont}{`k} +\DeclareMathSymbol{l}{\mathalpha}{mtletterfont}{`l} +\DeclareMathSymbol{m}{\mathalpha}{mtletterfont}{`m} +\DeclareMathSymbol{n}{\mathalpha}{mtletterfont}{`n} +\DeclareMathSymbol{o}{\mathalpha}{mtletterfont}{`o} +\DeclareMathSymbol{p}{\mathalpha}{mtletterfont}{`p} +\DeclareMathSymbol{q}{\mathalpha}{mtletterfont}{`q} +\DeclareMathSymbol{r}{\mathalpha}{mtletterfont}{`r} +\DeclareMathSymbol{s}{\mathalpha}{mtletterfont}{`s} +\DeclareMathSymbol{t}{\mathalpha}{mtletterfont}{`t} +\DeclareMathSymbol{u}{\mathalpha}{mtletterfont}{`u} +\DeclareMathSymbol{v}{\mathalpha}{mtletterfont}{`v} +\DeclareMathSymbol{w}{\mathalpha}{mtletterfont}{`w} +\DeclareMathSymbol{x}{\mathalpha}{mtletterfont}{`x} +\DeclareMathSymbol{y}{\mathalpha}{mtletterfont}{`y} +\DeclareMathSymbol{z}{\mathalpha}{mtletterfont}{`z} +\ifx\mt@frenchmath\@empty\def\mt@font@tbu{mtoperatorfont} + \else\def\mt@font@tbu{mtletterfont}\fi +\DeclareMathSymbol{A}{\mathalpha}{\mt@font@tbu}{`A} +\DeclareMathSymbol{B}{\mathalpha}{\mt@font@tbu}{`B} +\DeclareMathSymbol{C}{\mathalpha}{\mt@font@tbu}{`C} +\DeclareMathSymbol{D}{\mathalpha}{\mt@font@tbu}{`D} +\DeclareMathSymbol{E}{\mathalpha}{\mt@font@tbu}{`E} +\DeclareMathSymbol{F}{\mathalpha}{\mt@font@tbu}{`F} +\DeclareMathSymbol{G}{\mathalpha}{\mt@font@tbu}{`G} +\DeclareMathSymbol{H}{\mathalpha}{\mt@font@tbu}{`H} +\DeclareMathSymbol{I}{\mathalpha}{\mt@font@tbu}{`I} +\DeclareMathSymbol{J}{\mathalpha}{\mt@font@tbu}{`J} +\DeclareMathSymbol{K}{\mathalpha}{\mt@font@tbu}{`K} +\DeclareMathSymbol{L}{\mathalpha}{\mt@font@tbu}{`L} +\DeclareMathSymbol{M}{\mathalpha}{\mt@font@tbu}{`M} +\DeclareMathSymbol{N}{\mathalpha}{\mt@font@tbu}{`N} +\DeclareMathSymbol{O}{\mathalpha}{\mt@font@tbu}{`O} +\DeclareMathSymbol{P}{\mathalpha}{\mt@font@tbu}{`P} +\DeclareMathSymbol{Q}{\mathalpha}{\mt@font@tbu}{`Q} +\DeclareMathSymbol{R}{\mathalpha}{\mt@font@tbu}{`R} +\DeclareMathSymbol{S}{\mathalpha}{\mt@font@tbu}{`S} +\DeclareMathSymbol{T}{\mathalpha}{\mt@font@tbu}{`T} +\DeclareMathSymbol{U}{\mathalpha}{\mt@font@tbu}{`U} +\DeclareMathSymbol{V}{\mathalpha}{\mt@font@tbu}{`V} +\DeclareMathSymbol{W}{\mathalpha}{\mt@font@tbu}{`W} +\DeclareMathSymbol{X}{\mathalpha}{\mt@font@tbu}{`X} +\DeclareMathSymbol{Y}{\mathalpha}{\mt@font@tbu}{`Y} +\DeclareMathSymbol{Z}{\mathalpha}{\mt@font@tbu}{`Z} +%% +\ifx\mtno@digits\@empty\else +\def\mt@font@tbu{mtoperatorfont} \ifx\mt@symboldigits\@empty \def\mt@font@tbu{mtpsymbol} \fi \ifx\mt@eulerdigits\@empty \def\mt@font@tbu{mteulervm} \fi \DeclareMathSymbol{0}{\mathalpha}{\mt@font@tbu}{`0} @@ -294,16 +346,16 @@ nopunctuation,noplusnominus,noequal,noexclam,nospecials}} \ifx\mt@symbolmax\@empty \def\mt@font@tbu{mtpsymbol} \else -\def\mt@font@tbu{mtcurrentfont} +\def\mt@font@tbu{mtoperatorfont} \fi -\ifx\mt@noexclam\@empty\else +\ifx\mtno@exclam\@empty\else \DeclareMathSymbol{!}{\mathclose}{\mt@font@tbu}{"21} \DeclareMathSymbol{?}{\mathclose}{\mt@font@tbu}{"3F} \fi -\ifx\mt@noast\@empty\else +\ifx\mtno@ast\@empty\else \DeclareMathSymbol{*}{\mathalpha}{\mt@font@tbu}{"2A} \fi -\ifx\mt@nopunct\@empty\else +\ifx\mtno@punct\@empty\else \DeclareMathSymbol{,}{\mathpunct}{\mt@font@tbu}{"2C} \DeclareMathSymbol{.}{\mathord}{\mt@font@tbu}{"2E} \DeclareMathSymbol{:}{\mathrel}{\mt@font@tbu}{"3A} @@ -313,13 +365,7 @@ nopunctuation,noplusnominus,noequal,noexclam,nospecials}} \DeclareMathSymbol{\colon}{\mathpunct}{\mt@font@tbu}{"3A}} \DeclareMathSymbol{;}{\mathpunct}{\mt@font@tbu}{"3B} \fi -\DeclareMathSymbol{\inodot}{\mathord}{mtcurrentfont}{"10} -\DeclareMathSymbol{\jnodot}{\mathord}{mtcurrentfont}{"11} -\ifx\mt@defaultimath\@empty\else - \renewcommand{\imath}{\inodot} - \renewcommand{\jmath}{\jnodot} -\fi -\ifx\mt@noplusnominus\@empty\else +\ifx\mtno@minus\@empty\else \edef\mt@minus@sign{\mathord{\expandafter\mathchar\number\mathcode`\-}} \def\relbar{\mathrel{\smash\mt@minus@sign}} \def\rightarrowfill{$\m@th\mt@minus@sign\mkern-7mu% @@ -328,15 +374,39 @@ nopunctuation,noplusnominus,noequal,noexclam,nospecials}} \def\leftarrowfill{$\m@th\mathord\leftarrow\mkern-7mu% \cleaders\hbox{$\mkern-2mu\mt@minus@sign\mkern-2mu$}\hfill \mkern-7mu\smash\mt@minus@sign$} -\DeclareMathSymbol{+}{\mathbin}{\mt@font@tbu}{"2B} +\ifmt@endash +\edef\@tmpa{\m@stextenc} +\DeclareMathSymbol{-}{\mathbin}{mtoperatorfont} +{\expandafter\the\expandafter\csname\@tmpa\string\textendash\endcsname} +\else +\ifmt@emdash +\edef\@tmpa{\m@stextenc} +\DeclareMathSymbol{-}{\mathbin}{mtoperatorfont} +{\expandafter\the\expandafter\csname\@tmpa\string\textemdash\endcsname} +\else \DeclareMathSymbol{-}{\mathbin}{\mt@font@tbu}{"2D} +\fi\fi\fi +%%\def\hbar{{\mathchar'26\mkern-9muh}} +%% (original definition from latex.ltx) +\def\mathrlap{\mathpalette\mathrlapinternal} +\def\mathrlapinternal#1#2{\rlap{$\mathsurround=0pt#1{#2}$}} +\ifx\mt@ti\m@stextenc + \DeclareMathAccent{\mt@ltbar}{\mathalpha}{mtletterfont}{9} + \else + \DeclareMathAccent{\mt@ltbar}{\mathalpha}{mtletterfont}{22} +\fi +\ifx\mtno@hbar\@empty\else + \def\hbar{\mathrlap{\mt@ltbar{\ }}h} \fi -\ifx\mt@noequal\@empty\else +\ifx\mtno@plus\@empty\else +\DeclareMathSymbol{+}{\mathbin}{\mt@font@tbu}{"2B} +\fi +\ifx\mtno@equal\@empty\else \edef\mt@equal@sign{{\expandafter\mathchar\number\mathcode`\=}} \DeclareRobustCommand\Relbar{\mathrel{\mt@equal@sign}} \DeclareMathSymbol{=}{\mathrel}{\mt@font@tbu}{"3D} \fi -\ifx\mt@noparen\@empty\else +\ifx\mtno@paren\@empty\else \DeclareMathDelimiter{(}{\mathopen} {\mt@font@tbu}{"28}{largesymbols}{"00} \DeclareMathDelimiter{)}{\mathclose}{\mt@font@tbu}{"29}{largesymbols}{"01} \DeclareMathDelimiter{[}{\mathopen} {\mt@font@tbu}{"5B}{largesymbols}{"02} @@ -345,15 +415,21 @@ nopunctuation,noplusnominus,noequal,noexclam,nospecials}} \DeclareMathSymbol{/}{\mathord}{\mt@font@tbu}{"2F} \fi \ifx\mt@alldelims\@empty + \ifx\mt@symbolmax\@empty\else + \ifx\mt@ti\m@stextenc\else + \typeout{** mathastext: `alldelims'. Characters <,>,{,},| will be assumed + to^^J% + ** be located as in ascii. True for T1 fonts or OT1 fixed-width fonts.} + \fi\fi \DeclareMathDelimiter{<}{\mathopen}{\mt@font@tbu}{"3C}{largesymbols}{"0A} \DeclareMathDelimiter{>}{\mathclose}{\mt@font@tbu}{"3E}{largesymbols}{"0B} \DeclareMathSymbol{<}{\mathrel}{\mt@font@tbu}{"3C} \DeclareMathSymbol{>}{\mathrel}{\mt@font@tbu}{"3E} \expandafter\DeclareMathDelimiter\@backslashchar - {\mathord}{mtcurrentfont}{"5C}{largesymbols}{"0F} + {\mathord}{mtoperatorfont}{"5C}{largesymbols}{"0F} \DeclareMathDelimiter{\backslash} - {\mathord}{mtcurrentfont}{"5C}{largesymbols}{"0F} -\DeclareMathSymbol\setminus\mathbin{mtcurrentfont}{"5C} + {\mathord}{mtoperatorfont}{"5C}{largesymbols}{"0F} +\DeclareMathSymbol\setminus\mathbin{mtoperatorfont}{"5C} \DeclareMathSymbol{|}\mathord{\mt@font@tbu}{"7C} \DeclareMathDelimiter{|}{\mt@font@tbu}{"7C}{largesymbols}{"0C} \DeclareMathDelimiter\vert @@ -364,14 +440,14 @@ nopunctuation,noplusnominus,noequal,noexclam,nospecials}} \DeclareMathDelimiter{\rbrace} {\mathclose}{\mt@font@tbu}{"7D}{largesymbols}{"09} \fi -\ifx\mt@nospecials\@empty\else -\renewcommand{\#}{\ifmmode\edef\ms@tmp{7\the\symmtcurrentfont23}% +\ifx\mtno@specials\@empty\else +\renewcommand{\#}{\ifmmode\edef\ms@tmp{7\the\symmtoperatorfont23}% \mathchar\expandafter"\ms@tmp\relax\else\char"23\relax\fi} -\renewcommand{\$}{\ifmmode\edef\ms@tmp{7\the\symmtcurrentfont24}% +\renewcommand{\$}{\ifmmode\edef\ms@tmp{7\the\symmtoperatorfont24}% \mathchar\expandafter"\ms@tmp\relax\else\char"24\relax\fi} -\renewcommand{\%}{\ifmmode\edef\ms@tmp{7\the\symmtcurrentfont25}% +\renewcommand{\%}{\ifmmode\edef\ms@tmp{7\the\symmtoperatorfont25}% \mathchar\expandafter"\ms@tmp\relax\else\char"25\relax\fi} -\renewcommand{\&}{\ifmmode\edef\ms@tmp{7\the\symmtcurrentfont26}% +\renewcommand{\&}{\ifmmode\edef\ms@tmp{7\the\symmtoperatorfont26}% \mathchar\expandafter"\ms@tmp\relax\else\char"26\relax\fi} \fi \ifx\mt@symbolmisc\@empty @@ -448,81 +524,102 @@ nopunctuation,noplusnominus,noequal,noexclam,nospecials}} \DeclareMathSymbol{\Im}{\mathord}{mtpsymbol}{"C1} \DeclareMathSymbol{\DotTriangle}{\mathord}{mtpsymbol}{92} \fi -\ifx\mt@selfGreek\@empty -\DeclareMathSymbol{\Gamma}{\mathalpha}{mtcurrentfont}{"00} -\DeclareMathSymbol{\Delta}{\mathalpha}{mtcurrentfont}{"01} -\DeclareMathSymbol{\Theta}{\mathalpha}{mtcurrentfont}{"02} -\DeclareMathSymbol{\Lambda}{\mathalpha}{mtcurrentfont}{"03} -\DeclareMathSymbol{\Xi}{\mathalpha}{mtcurrentfont}{"04} -\DeclareMathSymbol{\Pi}{\mathalpha}{mtcurrentfont}{"05} -\DeclareMathSymbol{\Sigma}{\mathalpha}{mtcurrentfont}{"06} -\DeclareMathSymbol{\Upsilon}{\mathalpha}{mtcurrentfont}{"07} -\DeclareMathSymbol{\Phi}{\mathalpha}{mtcurrentfont}{"08} -\DeclareMathSymbol{\Psi}{\mathalpha}{mtcurrentfont}{"09} -\DeclareMathSymbol{\Omega}{\mathalpha}{mtcurrentfont}{"0A} -\else -\ifx\mt@eulergreek\@empty -\DeclareMathSymbol\Gamma {\mathord}{mteulervm}{"00} -\DeclareMathSymbol\Delta {\mathord}{mteulervm}{"01} -\DeclareMathSymbol\Theta {\mathord}{mteulervm}{"02} -\DeclareMathSymbol\Lambda {\mathord}{mteulervm}{"03} -\DeclareMathSymbol\Xi {\mathord}{mteulervm}{"04} -\DeclareMathSymbol\Pi {\mathord}{mteulervm}{"05} -\DeclareMathSymbol\Sigma {\mathord}{mteulervm}{"06} -\DeclareMathSymbol\Upsilon {\mathord}{mteulervm}{"07} -\DeclareMathSymbol\Phi {\mathord}{mteulervm}{"08} -\DeclareMathSymbol\Psi {\mathord}{mteulervm}{"09} -\DeclareMathSymbol\Omega {\mathord}{mteulervm}{"0A} -\else +\def\mt@font@tbu{operators} +\let\mt@mathord\mathord +\ifx\digamma\undefined\else\def\mt@font@tbu{1}\fi +\ifx\mt@selfGreek\@empty \def\mt@font@tbu{mtoperatorfont} + \let\mt@mathord\mathalpha + \else +\ifx\mt@eulergreek\@empty \def\mt@font@tbu{mteulervm} + \let\mt@mathord\mathalpha + \else +\ifx\mt@symbolgreek\@empty \def\mt@font@tbu{mtpsymbol} +\fi\fi\fi +\def\mt@tmp{1} +\ifx\mt@font@tbu\mt@tmp\else +\DeclareMathSymbol{\Digamma}{\mt@mathord}{\mt@font@tbu}{"46} +\DeclareMathSymbol{\Alpha}{\mt@mathord}{\mt@font@tbu}{"41} +\DeclareMathSymbol{\Beta}{\mt@mathord}{\mt@font@tbu}{"42} +\DeclareMathSymbol{\Epsilon}{\mt@mathord}{\mt@font@tbu}{"45} +\DeclareMathSymbol{\Zeta}{\mt@mathord}{\mt@font@tbu}{"5A} +\DeclareMathSymbol{\Eta}{\mt@mathord}{\mt@font@tbu}{"48} +\DeclareMathSymbol{\Iota}{\mt@mathord}{\mt@font@tbu}{"49} +\DeclareMathSymbol{\Kappa}{\mt@mathord}{\mt@font@tbu}{"4B} +\DeclareMathSymbol{\Mu}{\mt@mathord}{\mt@font@tbu}{"4D} +\DeclareMathSymbol{\Nu}{\mt@mathord}{\mt@font@tbu}{"4E} +\DeclareMathSymbol{\Omicron}{\mt@mathord}{\mt@font@tbu}{"4F} +\DeclareMathSymbol{\Rho}{\mt@mathord}{\mt@font@tbu}{"50} +\DeclareMathSymbol{\Tau}{\mt@mathord}{\mt@font@tbu}{"54} +\DeclareMathSymbol{\Chi}{\mt@mathord}{\mt@font@tbu}{"58} +%% we now treat the other capital Greek letters \ifx\mt@symbolgreek\@empty +%% attention le P de Symbol est un \Pi pas un \Rho +\DeclareMathSymbol{\Rho}{\mt@mathord}{\mt@font@tbu}{"52} +%% attention le X de Symbol est un \Xi pas un \Chi +\DeclareMathSymbol{\Chi}{\mt@mathord}{\mt@font@tbu}{"43} +%% attention le F de Symbol est un \Phi. Il n'y a pas de \Digamma +\let\Digamma\undefined \DeclareMathSymbol{\Gamma}{\mathord}{mtpsymbol}{"47} \DeclareMathSymbol{\Delta}{\mathord}{mtpsymbol}{"44} \DeclareMathSymbol{\Theta}{\mathord}{mtpsymbol}{"51} \DeclareMathSymbol{\Lambda}{\mathord}{mtpsymbol}{"4C} -\DeclareMathSymbol{\Xi}{\mathord}{mtpsymbol}{"59} +\DeclareMathSymbol{\Xi}{\mathord}{mtpsymbol}{"58} %% was "59 in v10 \DeclareMathSymbol{\Pi}{\mathord}{mtpsymbol}{"50} \DeclareMathSymbol{\Sigma}{\mathord}{mtpsymbol}{"53} \DeclareMathSymbol{\Upsilon}{\mathord}{mtpsymbol}{"A1} \DeclareMathSymbol{\Phi}{\mathord}{mtpsymbol}{"46} \DeclareMathSymbol{\Psi}{\mathord}{mtpsymbol}{"59} \DeclareMathSymbol{\Omega}{\mathord}{mtpsymbol}{"57} -\fi\fi\fi +\else +\DeclareMathSymbol\Gamma {\mathalpha}{\mt@font@tbu}{"00} +\DeclareMathSymbol\Delta {\mathalpha}{\mt@font@tbu}{"01} +\DeclareMathSymbol\Theta {\mathalpha}{\mt@font@tbu}{"02} +\DeclareMathSymbol\Lambda {\mathalpha}{\mt@font@tbu}{"03} +\DeclareMathSymbol\Xi {\mathalpha}{\mt@font@tbu}{"04} +\DeclareMathSymbol\Pi {\mathalpha}{\mt@font@tbu}{"05} +\DeclareMathSymbol\Sigma {\mathalpha}{\mt@font@tbu}{"06} +\DeclareMathSymbol\Upsilon {\mathalpha}{\mt@font@tbu}{"07} +\DeclareMathSymbol\Phi {\mathalpha}{\mt@font@tbu}{"08} +\DeclareMathSymbol\Psi {\mathalpha}{\mt@font@tbu}{"09} +\DeclareMathSymbol\Omega {\mathalpha}{\mt@font@tbu}{"0A} +\fi +\fi \let\omicron\undefined \newcommand\omicron{\mt@saved@mathnormal{o}} \ifx\mt@eulergreek\@empty -\DeclareMathSymbol{\alpha} {\mathord}{mteulervm}{"0B} -\DeclareMathSymbol{\beta} {\mathord}{mteulervm}{"0C} -\DeclareMathSymbol{\gamma} {\mathord}{mteulervm}{"0D} -\DeclareMathSymbol{\delta} {\mathord}{mteulervm}{"0E} -\DeclareMathSymbol{\epsilon}{\mathord}{mteulervm}{"0F} -\DeclareMathSymbol{\zeta} {\mathord}{mteulervm}{"10} -\DeclareMathSymbol{\eta} {\mathord}{mteulervm}{"11} -\DeclareMathSymbol{\theta} {\mathord}{mteulervm}{"12} -\DeclareMathSymbol{\iota} {\mathord}{mteulervm}{"13} -\DeclareMathSymbol{\kappa} {\mathord}{mteulervm}{"14} -\DeclareMathSymbol{\lambda} {\mathord}{mteulervm}{"15} -\DeclareMathSymbol{\mu} {\mathord}{mteulervm}{"16} -\DeclareMathSymbol{\nu} {\mathord}{mteulervm}{"17} -\DeclareMathSymbol{\xi} {\mathord}{mteulervm}{"18} -\renewcommand\omicron{\mathord{\MathastextEuler{o}}} -\DeclareMathSymbol{\pi} {\mathord}{mteulervm}{"19} -\DeclareMathSymbol{\rho} {\mathord}{mteulervm}{"1A} -\DeclareMathSymbol{\sigma} {\mathord}{mteulervm}{"1B} -\DeclareMathSymbol{\tau} {\mathord}{mteulervm}{"1C} -\DeclareMathSymbol{\upsilon}{\mathord}{mteulervm}{"1D} -\DeclareMathSymbol{\phi} {\mathord}{mteulervm}{"1E} -\DeclareMathSymbol{\chi} {\mathord}{mteulervm}{"1F} -\DeclareMathSymbol{\psi} {\mathord}{mteulervm}{"20} -\DeclareMathSymbol{\omega} {\mathord}{mteulervm}{"21} -\DeclareMathSymbol{\varepsilon}{\mathord}{mteulervm}{"22} -\DeclareMathSymbol{\vartheta}{\mathord}{mteulervm}{"23} -\DeclareMathSymbol{\varpi} {\mathord}{mteulervm}{"24} +\DeclareMathSymbol{\alpha} {\mathalpha}{mteulervm}{"0B} +\DeclareMathSymbol{\beta} {\mathalpha}{mteulervm}{"0C} +\DeclareMathSymbol{\gamma} {\mathalpha}{mteulervm}{"0D} +\DeclareMathSymbol{\delta} {\mathalpha}{mteulervm}{"0E} +\DeclareMathSymbol{\epsilon}{\mathalpha}{mteulervm}{"0F} +\DeclareMathSymbol{\zeta} {\mathalpha}{mteulervm}{"10} +\DeclareMathSymbol{\eta} {\mathalpha}{mteulervm}{"11} +\DeclareMathSymbol{\theta} {\mathalpha}{mteulervm}{"12} +\DeclareMathSymbol{\iota} {\mathalpha}{mteulervm}{"13} +\DeclareMathSymbol{\kappa} {\mathalpha}{mteulervm}{"14} +\DeclareMathSymbol{\lambda} {\mathalpha}{mteulervm}{"15} +\DeclareMathSymbol{\mu} {\mathalpha}{mteulervm}{"16} +\DeclareMathSymbol{\nu} {\mathalpha}{mteulervm}{"17} +\DeclareMathSymbol{\xi} {\mathalpha}{mteulervm}{"18} +\renewcommand\omicron{\MathEuler{o}} +\DeclareMathSymbol{\pi} {\mathalpha}{mteulervm}{"19} +\DeclareMathSymbol{\rho} {\mathalpha}{mteulervm}{"1A} +\DeclareMathSymbol{\sigma} {\mathalpha}{mteulervm}{"1B} +\DeclareMathSymbol{\tau} {\mathalpha}{mteulervm}{"1C} +\DeclareMathSymbol{\upsilon}{\mathalpha}{mteulervm}{"1D} +\DeclareMathSymbol{\phi} {\mathalpha}{mteulervm}{"1E} +\DeclareMathSymbol{\chi} {\mathalpha}{mteulervm}{"1F} +\DeclareMathSymbol{\psi} {\mathalpha}{mteulervm}{"20} +\DeclareMathSymbol{\omega} {\mathalpha}{mteulervm}{"21} +\DeclareMathSymbol{\varepsilon}{\mathalpha}{mteulervm}{"22} +\DeclareMathSymbol{\vartheta}{\mathalpha}{mteulervm}{"23} +\DeclareMathSymbol{\varpi} {\mathalpha}{mteulervm}{"24} \let\varrho=\rho \let\varsigma=\sigma -\DeclareMathSymbol{\varphi} {\mathord}{mteulervm}{"27} -\DeclareMathSymbol{\partial}{\mathord}{mteulervm}{"40} -\DeclareMathSymbol{\wp}{\mathord}{mteulervm}{"7D} -\DeclareMathSymbol{\ell}{\mathord}{mteulervm}{"60} +\DeclareMathSymbol{\varphi} {\mathalpha}{mteulervm}{"27} +\DeclareMathSymbol{\partial}{\mathalpha}{mteulervm}{"40} +\DeclareMathSymbol{\wp}{\mathalpha}{mteulervm}{"7D} +\DeclareMathSymbol{\ell}{\mathalpha}{mteulervm}{"60} \else \ifx\mt@symbolgreek\@empty \DeclareMathSymbol{\alpha}{\mathord}{mtpsymbol}{"61} @@ -539,7 +636,7 @@ nopunctuation,noplusnominus,noequal,noexclam,nospecials}} \DeclareMathSymbol{\mu}{\mathord}{mtpsymbol}{"6D} \DeclareMathSymbol{\nu}{\mathord}{mtpsymbol}{"6E} \DeclareMathSymbol{\xi}{\mathord}{mtpsymbol}{"78} -\renewcommand\omicron{\mathord{\MathastextSymbol{o}}} +\renewcommand\omicron{\mathord{\MathPSymbol{o}}} \DeclareMathSymbol{\pi}{\mathord}{mtpsymbol}{"70} \DeclareMathSymbol{\rho}{\mathord}{mtpsymbol}{"72} \DeclareMathSymbol{\sigma}{\mathord}{mtpsymbol}{"73} @@ -558,6 +655,45 @@ nopunctuation,noplusnominus,noequal,noexclam,nospecials}} \DeclareMathSymbol{\partial}{\mathord}{mtpsymbol}{"B6} \DeclareMathSymbol{\wp}{\mathord}{mtpsymbol}{"C3} \fi\fi +\ifx\m@stextenc\mt@oti +\DeclareMathSymbol{\inodot}{\mathalpha}{mtletterfont}{16} +\DeclareMathSymbol{\jnodot}{\mathalpha}{mtletterfont}{17} +\else +%% assumed to be as in T1 +\DeclareMathSymbol{\inodot}{\mathalpha}{mtletterfont}{25} +\DeclareMathSymbol{\jnodot}{\mathalpha}{mtletterfont}{26} +\fi +\ifx\mt@defaultimath\@empty\else + \renewcommand{\imath}{\inodot} + \renewcommand{\jmath}{\jnodot} +\fi +\ifx\mt@mathaccents\@empty +\ifx\mt@ti\m@stextenc +\DeclareMathAccent{\acute}{\mathalpha}{mtoperatorfont}{1} +\DeclareMathAccent{\grave}{\mathalpha}{mtoperatorfont}{0} +\DeclareMathAccent{\ddot}{\mathalpha}{mtoperatorfont}{4} +\DeclareMathAccent{\tilde}{\mathalpha}{mtoperatorfont}{3} +\DeclareMathAccent{\bar}{\mathalpha}{mtoperatorfont}{9} +\DeclareMathAccent{\breve}{\mathalpha}{mtoperatorfont}{8} +\DeclareMathAccent{\check}{\mathalpha}{mtoperatorfont}{7} +\DeclareMathAccent{\hat}{\mathalpha}{mtoperatorfont}{2} +\DeclareMathAccent{\dot}{\mathalpha}{mtoperatorfont}{10} +\DeclareMathAccent{\mathring}{\mathalpha}{mtoperatorfont}{6} +\else +\DeclareMathAccent{\acute}{\mathalpha}{mtoperatorfont}{19} +\DeclareMathAccent{\grave}{\mathalpha}{mtoperatorfont}{18} +\DeclareMathAccent{\ddot}{\mathalpha}{mtoperatorfont}{127} +\DeclareMathAccent{\tilde}{\mathalpha}{mtoperatorfont}{126} +\DeclareMathAccent{\bar}{\mathalpha}{mtoperatorfont}{22} +\DeclareMathAccent{\breve}{\mathalpha}{mtoperatorfont}{21} +\DeclareMathAccent{\check}{\mathalpha}{mtoperatorfont}{20} +\DeclareMathAccent{\hat}{\mathalpha}{mtoperatorfont}{94} +\DeclareMathAccent{\dot}{\mathalpha}{mtoperatorfont}{95} +\DeclareMathAccent{\mathring}{\mathalpha}{mtoperatorfont}{23} +\ifx\mt@oti\m@stextenc\else + \typeout{** mathastext: `mathaccents'; accents have been assumed to be^^J% + ** as in OT1 encoding.} +\fi\fi\fi \ifmt@defaultsizes\else \providecommand\@xxxpt{29.86} \providecommand\@xxxvipt{35.83} @@ -584,56 +720,6 @@ nopunctuation,noplusnominus,noequal,noexclam,nospecials}} \typeout{** mathastext has declared larger sizes for subscripts.^^J% ** To keep LaTeX defaults, use option `defaultmathsizes'.} \fi -\AtBeginDocument{ -\ifx\mt@alldelims\@empty -\ifx\mt@symbolmax\@empty\else -\ifall@OTone -\typeout{** mathastext: option `alldelims', and OT1 encodings; characters - <,>,{,},| ^^J% -** will display correctly only for the fixed-width fonts.} -\else -\ifall@Tone\else -\typeout{** mathastext: option `alldelims'; <,>,{,},| have been assumed - to be located^^J% -** as in T1 (or OT1 fixed-width) fonts.)} -\fi\fi\fi\fi -\ifall@OTone\else -\DeclareMathSymbol{\inodot}{\mathord}{mtcurrentfont}{"19} -\DeclareMathSymbol{\jnodot}{\mathord}{mtcurrentfont}{"1A} -\fi -} -\AtBeginDocument{ -\ifx\mt@mathaccents\@empty -\ifall@OTone -\DeclareMathAccent{\acute}{\mathalpha}{mtcurrentfont}{"13} -\DeclareMathAccent{\grave}{\mathalpha}{mtcurrentfont}{"12} -\DeclareMathAccent{\ddot}{\mathalpha}{mtcurrentfont}{"7F} -\DeclareMathAccent{\tilde}{\mathalpha}{mtcurrentfont}{"7E} -\DeclareMathAccent{\bar}{\mathalpha}{mtcurrentfont}{"16} -\DeclareMathAccent{\breve}{\mathalpha}{mtcurrentfont}{"15} -\DeclareMathAccent{\check}{\mathalpha}{mtcurrentfont}{"14} -\DeclareMathAccent{\hat}{\mathalpha}{mtcurrentfont}{"5E} -\DeclareMathAccent{\dot}{\mathalpha}{mtcurrentfont}{"5F} -\DeclareMathAccent{\mathring}{\mathalpha}{mtcurrentfont}{"17} -\else -\DeclareMathAccent{\acute}{\mathalpha}{mtcurrentfont}{"01} -\DeclareMathAccent{\grave}{\mathalpha}{mtcurrentfont}{"00} -\DeclareMathAccent{\ddot}{\mathalpha}{mtcurrentfont}{"04} -\DeclareMathAccent{\tilde}{\mathalpha}{mtcurrentfont}{"03} -\DeclareMathAccent{\bar}{\mathalpha}{mtcurrentfont}{"09} -\DeclareMathAccent{\breve}{\mathalpha}{mtcurrentfont}{"08} -\DeclareMathAccent{\check}{\mathalpha}{mtcurrentfont}{"07} -\DeclareMathAccent{\hat}{\mathalpha}{mtcurrentfont}{"02} -\DeclareMathAccent{\dot}{\mathalpha}{mtcurrentfont}{"0A} -\DeclareMathAccent{\mathring}{\mathalpha}{mtcurrentfont}{"06} -\ifall@Tone -\else\typeout{** mathastext: option `mathaccents'; accents have been assumed - to be^^J% - ** as in T1 encoding but one of the math versions has a non-T1 encoding.} -\fi -\fi -\fi -} \AtBeginDocument{ \ifmt@need@symbol \DeclareFontFamily{U}{psy}{} -- cgit v1.2.3