summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-06-25 15:21:51 +0000
committerKarl Berry <karl@freefriends.org>2014-06-25 15:21:51 +0000
commit688cf1a97b5e9414afabf65b39e09326c21d80fa (patch)
treedee3c5efdf60bc02eefbf9c05f6a85e5d6b74c87 /Master
parent889e817205bf90bb7e360255960acd44c780afad (diff)
mathastext (24may14)
git-svn-id: svn://tug.org/texlive/trunk@34411 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/mathastext/README22
-rw-r--r--Master/texmf-dist/doc/latex/mathastext/mathastext.pdfbin372494 -> 383239 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mathastext/mathastext.tex32
-rw-r--r--Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.pdfbin41503 -> 41580 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.tex256
-rw-r--r--Master/texmf-dist/doc/latex/mathastext/mathastexttestmathversions.tex39
-rw-r--r--Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodelinux.tex97
-rw-r--r--Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodemacos.tex99
-rw-r--r--Master/texmf-dist/source/latex/mathastext/mathastext.dtx1028
-rw-r--r--Master/texmf-dist/source/latex/mathastext/mathastext.ins8
-rw-r--r--Master/texmf-dist/tex/latex/mathastext/mathastext.sty732
11 files changed, 1001 insertions, 1312 deletions
diff --git a/Master/texmf-dist/doc/latex/mathastext/README b/Master/texmf-dist/doc/latex/mathastext/README
index 1575a9eaedc..50814553760 100644
--- a/Master/texmf-dist/doc/latex/mathastext/README
+++ b/Master/texmf-dist/doc/latex/mathastext/README
@@ -1,11 +1,10 @@
-Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol.
-`mathastext' is a LaTeX2e package.
+Copyright (C) 2011-2014 Jean-Francois Burnol.
+-------------------------------------------+
+ mathastext +
+ +
+ `Use the text font in math mode' +
- + v1.3c 2013/12/14 +
+ + v1.3d 2014/05/23 +
+ jfbu (at) free.fr +
+-------------------------------------------+
@@ -101,6 +100,11 @@ Examples available there:
Installation:
=============
+
+The fastest way is: unzip -d <destination> mathastext.tds.zip, where
+<destination> could be ~/texmf or, on mac os x, ~/Library/texmf, or
+the working repertory of your project. Else, download mathastext.dtx,
+possibly also mathastext.ins, and follow these instructions:
* with mathastext.ins: run tex on mathastext.ins to generate the package
style file mathastext.sty as well as mathastext.tex and some test files.
@@ -128,6 +132,18 @@ other options therein.
CHANGE LOG
+1.3d [2014/05/23]
+
+ * new commands \MTstandardgreek and \MTcustomgreek.
+
+ * The Greek letters, in case of use of one of the package related options,
+are left to their defaults in the normal and bold math versions if the
+subdued option was also used (this was so far the case only with options
+LGRgreek/LGRgreeks).
+
+ * \newmcodes@ of amsmath is left untouched if package lualatex-math
+is detected.
+
1.3c [2013/12/14]
* added a starred variant to \MTversion which tells mathastext to
diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastext.pdf b/Master/texmf-dist/doc/latex/mathastext/mathastext.pdf
index 939e9dca396..23b5241071f 100644
--- a/Master/texmf-dist/doc/latex/mathastext/mathastext.pdf
+++ b/Master/texmf-dist/doc/latex/mathastext/mathastext.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastext.tex b/Master/texmf-dist/doc/latex/mathastext/mathastext.tex
deleted file mode 100644
index 4a0befb79d4..00000000000
--- a/Master/texmf-dist/doc/latex/mathastext/mathastext.tex
+++ /dev/null
@@ -1,32 +0,0 @@
-\def\MSTpkgdate {2013/12/14}
-\def\MSTpkgversion {1.3c}
-%%----------------------------------------------------------------
-%% The mathastext package (version 1.3c of December 14, 2013)
-%% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol
-%% Examples of use of mathastext:
-%% http://jf.burnol.free.fr/mathastext.html
-%% http://jf.burnol.free.fr/showcase.html
-%%----------------------------------------------------------------
-%% This is a generated file. Run latex thrice on this file mathastext.tex then
-%% run dvipdfmx on mathastext.dvi to produce the documentation mathastext.pdf,
-%% with the package source code included.
-%%
-%% Customize as desired the class options and the two toggles below.
-%%
-%% See mathastext.dtx for the copyright and the conditions for distribution
-%% and/or modification of this work.
-%%
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{mathastext.tex}%
-[\MSTpkgdate\space v\MSTpkgversion\space
- driver file for mathastext documentation (jfB)]%
-\PassOptionsToClass{a4paper,fontsize=11pt}{scrdoc}
-\chardef\Withdvipdfmx 1 % replace 1<space> by 0<space> for using latex/pdflatex
-\chardef\NoSourceCode 0 % replace 0<space> by 1<space> for no source code
-\input mathastext.dtx
-%%% Local Variables:
-%%% mode: latex
-%%% End:
-\endinput
-%%
-%% End of file `mathastext.tex'.
diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.pdf b/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.pdf
index 176c5003408..01c403bbacb 100644
--- a/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.pdf
+++ b/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.tex b/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.tex
deleted file mode 100644
index 04e5d6c53b5..00000000000
--- a/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.tex
+++ /dev/null
@@ -1,256 +0,0 @@
-\def\testfileincipit{Test file to accompany \texttt{mathastext}
-version \texttt{1.3c} of \texttt{2013/12/14}}
-%%----------------------------------------------------------------
-%% The mathastext package (version 1.3c of December 14, 2013)
-%% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol
-%% Examples of use of mathastext:
-%% http://jf.burnol.free.fr/mathastext.html
-%% http://jf.burnol.free.fr/showcase.html
-%%----------------------------------------------------------------
-%% This file `mathastexttestalphabets.tex' is for testing the extended
-%% scope of the math alphabet commands with package `mathastext', via
-%% the package command \MTnonlettersobeymathxx.
-%%
-%% Compile either with latex, pdflatex, lualatex (pdf output) or xelatex.
-%%
-%% See `mathastext.dtx' for the copyright and conditions of distribution or
-%% modification.
-%%
-\documentclass{article}
-\usepackage[hscale=0.66]{geometry}
-\usepackage{amsmath}
-\usepackage{mathtools}\mathtoolsset{centercolon}
-%% WARNING THIS IS INCOMPATIBLE WITH BABEL+FRENCHB
-%% BUT WITH MATHASTEXT LOADED THIS IS CORRECTED
-%% *IF* \MTnonlettersobeymathxx IS MADE USE OF.
-\usepackage{iftex}
-\ifXeTeX
-\expandafter\def\expandafter\testfileincipit\expandafter
- {\testfileincipit\ (compiled with \XeLaTeX)}
-\usepackage[no-math]{fontspec}
-\setmainfont[ExternalLocation,
- Mapping=tex-text,
- BoldFont=texgyretermes-bold,
- ItalicFont=texgyretermes-italic,
- BoldItalicFont=texgyretermes-bolditalic]{texgyretermes-regular}
-\setmonofont[ExternalLocation,
- Mapping=tex-text]{texgyrecursor-regular}
-\setsansfont[ExternalLocation,
- Mapping=tex-text]{texgyreheros-regular}
-\else
-\ifLuaTeX % for pdf output
-\expandafter\def\expandafter\testfileincipit\expandafter
- {\testfileincipit\ (compiled with \LuaLaTeX)}
-\usepackage[no-math]{fontspec}
-\setmainfont[Ligatures=TeX]{TeX Gyre Termes}
-\setmonofont[Ligatures=TeX]{TeX Gyre Cursor}
-\setsansfont[Ligatures=TeX]{TeX Gyre Heros}
-\else
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{tgtermes}
-\usepackage{tgcursor}
-\usepackage{tgheros}
-\fi\fi
-\usepackage{metalogo} % must be loaded /after/ [no-math]fontspec
-\usepackage[french]{babel}
-\usepackage[italic,asterisk]{mathastext}
-\MTlettershape{n}\Mathastext[upright]
-\MTnonlettersobeymathxx
-\MTexplicitbracesobeymathxx
-\delimitershortfall-1pt
-\begin{document}
-\testfileincipit
-
-\begin{center}
- \bfseries Two features of \texttt{mathastext}:\\
-extended scope of the math alphabets and added italic corrections\par
-\end{center}
-
-The package makes
-${!}\,{?}\,{,}\,{:}\,{;}\,{+}\,{-}\,{=}\,{(}\,{)}\,{[}\,{]}\,{<}\,{>}\,{\{}\,{\}}$,
-the asterisk $*$, and $.\,/\,\vert\,\backslash\,{\#}\,{\$}\,{\%}\,{\&}$ obey the
-math alphabet commands (this is the maximal list, some characters may have been
-excluded by the corresponding package options). For the characters listed first
-the mechanism involves a `mathematical activation'.
-
-As this process may create incompatibilities, it will be put into action
-for
-${!}\,{?}\,{,}\,{:}\,{;}\,{+}\,{-}\,{=}\,{(}\,{)}\,{[}\,{]}\,{<}\,{>}$
-only if the user makes use of the package command
-\verb|\MTnonlettersobeymathxx| (and the braces necessitate
-\verb|\MTexplicitbracesobeymathxx|).
-
-It could be that one such character has been made `active' in the entire
-document by some other package, typically a language definition file for the
-\verb|babel| system. Here for example we have used \verb|babel| with the
-\verb|french| option, which makes the high punctuation characters !?:; active
-throughout the document (extra spacing is put in front of the character when
-used in text; no change in math but perhaps for other languages and characters
-this could happen, it is up to the language definition file to decide).
-
-When \verb|mathastext| detects that a character it wants to `mathematically
-activate' is already `active', it does not go further except if it seems that
-the activation was done by Babel. If the activation was done by Babel, then
-\verb|mathastext| replaces the expansion of the active character in math mode by
-what is necessary to achieve its goal. It does not additionally mathematically
-activate the character; rather it makes sure that the character is \emph{not}
-mathematically active. In the present document the colon was made mathematically
-active by \verb|mathtools| but this was already canceled in the preamble by
-\verb|mathastext| as it was loaded later. And it is better so, because the
-combination \verb|babel| (with option \verb|frenchb|) +\verb|mathtools| (with
-\verb|centercolon|) makes \verb|$:$| create an infinite loop!
-
-But even if someone had mathematically activated the colon after the preamble,
-or after the loading of \verb|mathastext|, this would be canceled again
-automatically for each inline or displayed mathematical formula (if the user
-does \verb|\MTnonlettersobeymathxx|).
-
-The conclusion with \verb|\MTnonlettersobeymathxx| is: if some package has tried
-to make the character mathematically active, this will be overruled by
-\verb|mathastext|; if some package has made the character globally active, then
-the package wins except if it is Babel, as \verb|mathastext| may in the latter
-case safely modify the action in math mode (paying attention to the fact that
-the character should be usable in \verb|\label| and \verb|\ref| in and outside
-of math mode).
-
-The displayed equations next illustrate the extended scope of the math alphabets
-which now apply to $=$, $-$, $($, $)$, $[$, $]$ (but not to the large delimiters
-of course). Furthermore, for testing purposes the equations were labeled using
-such characters, for example the last one has label \verb|eq=7|, to check that
-the mathematical activation of $=$ does not cause problems with
-\verb|\label/\ref|.
-
-\def\testformula{\quad\Biggl\lbrace\biggl(\left(\left[[\sin(a) + \cos(b) - \log(c) =
-\sec(d)]\right]\right)\biggr)\Biggr\rbrace}
-\begin{equation}\testformula\label{eq:1}\end{equation}
-\begin{equation}\mathnormalbold{mathnormalbold:\testformula}\label{eq;2}\end{equation}
-\begin{equation}\mathrm{mathrm:\testformula}\label{eq?3}\end{equation}
-\begin{equation}\mathbf{mathbf:\testformula}\label{eq!4}\end{equation}
-\begin{equation}\mathit{mathit:\testformula}\label{eq(5}\end{equation}
-\begin{equation}\mathtt{mathtt:\testformula}\label{eq)6}\end{equation}
-\begin{equation}\mathsf{mathsf:\testformula}\label{eq=7}\end{equation}
-
-Equations above are numbered \ref{eq:1}, \ref{eq;2}, \ref{eq?3}, \ref{eq!4}, and
-$\ref{eq(5}$, $\ref{eq)6}$, and $\ref{eq=7}$.
-
-\def\testline#1{$#1$&$\mathnormalbold{#1}$&$\mathrm{#1}$&$\mathbf{#1}$&$\mathit{#1}$&$\mathtt{#1}$&$\mathsf{#1}$}
-
-\centerline{\begin{tabular}{ccccccc}
-\testline{a!b}\\
-\testline{a?b}\\
-\testline{a,b}\\
-\testline{a;b}\\
-\testline{a:b}\\
-\testline{a:=b}\\
-\testline{a\vcentcolon= b}\\
-\testline{a\colon b}\\
-\testline{a.b}\\
-\testline{a-b}\\
-\testline{a+b}\\
-\testline{a=b}\\
-\testline{a<b}\\
-\testline{a>b}\\
-\testline{<x,y>}\\
-\testline{\mathopen{<} x,y\mathclose{>}}\\
-\testline{\left< x,y\right>}\\
-\testline{a/b}\\
-\testline{a\backslash b}\\
-\testline{a\setminus b}\\
-\testline{a|b}\\
-\testline{a\mid b}\\
-\testline{(a,b)}\\
-\testline{[a,b]}\\
-\testline{\{a,b\}}
-\end{tabular}}
-
-The question mark has been made active by \verb|babel+frenchb|.
-\verb|mathastext| has imposed in math mode its ways (now \verb|$\mathbf{???}$|
-gives $\mathbf{???}$). As the extra spacing is added by \verb|frenchb| only in
-text, we had to use the math alphabet to check that indeed \verb|mathastext|
-overruled Babel.
-
-To double-check we will now make \string? mathematically active:
-\verb|\mathcode`?="8000|\mathcode`?="8000. This is a sure cause for disaster
-normally with Babel (don't do this at home without \verb|mathastext|!). But here
-with \verb|$?$| no bad surprise (infinite loop!) awaits us: just $?$.
-
-Let's take some other character, for example the opening parenthesis, and make
-it catcode active:
-\verb|\catcode`(=\active \def ({X}|.
-Let's try the input
-\verb|( and $($|.
-\begingroup
-\catcode`(=\active \gdef ({X}
-This gives ( and $($. We see that \verb|mathastext| does not attempt to modify
-the definition of the active character, as this activation was not done via the
-\verb|babel| services. \catcode`\(=12 \mathcode`(="8000 We now revert the
-parenthesis to catcode other (but maintain \verb|\def ({X}| as definition of its
-active version), and then make it mathematically active using the command
-\verb|\mathcode`(="8000|. If we try \verb|$((($| we see that the parenthesis is
-not converted into an $X$: $((($. The mathematically active character was
-overruled by \verb|mathastext|.
-
-Issuing \verb|\MTnonlettersdonotobeymathxx|\MTnonlettersdonotobeymathxx\ we do
-get the $X$'s from the input \verb|$((($|: $((($
-\endgroup
-This shows that \verb|mathastext| now does not modify in math mode the
-non-letter \verb|(|.
-
-\MTversion{upright}\MTnonlettersobeymathxx
-We defined in the preamble of the document a \verb|mathastext|-enhanced
-math version (named \verb|upright|) having the Latin letters upright in
-math mode. Let's switch to
-it: \newline
-\hbox to\linewidth{\hss\verb|\MTversion{upright}|\hss}
-
-With a font which is neither italic nor slanted, \verb|mathastext| automatically
-inserts italic corrections for better positioning of the subscript:
-\verb|$f_i^i$| gives
-$f_i^i$.
-After \verb|\MTnoicinmath| which turns off this feature\MTnoicinmath{}, the same
-input gives $f_i^i$, which is different.
-\footnote{last time I tried, this only worked with PDF\LaTeX{}, not with
- \LuaLaTeX{} or \XeTeX{}.}
-
-Again with italic corrections on (\verb|\MTicinmath|)\MTicinmath{}
-\verb|$f_{abc}^{def}$| gives $f_{abc}^{def}$, and here is another one:
-$f^{f_{abc}^{def}}_u$. Without italic corrections\MTnoicinmath: $f_{abc}^{def}$,
-and respectively $f^{f_{abc}^{def}}_u$.\MTicinmath We can also check that the
-added italic corrections do not prevent the formation of ligatures when using
-the math alphabets, apart from \verb|\mathnormal| (which comes first):
-$\mathnormal{ff}$, $\mathrm{ff}$, $\mathit{ff}$, $\mathbf{ff}$, $\mathtt{ff}$
-(no ligature in teletype) and $\mathsf{ff}$.
-
-\centerline{\begin{tabular}{ccccccc}
-\testline{a!b}\\
-\testline{a?b}\\
-\testline{a,b}\\
-\testline{a;b}\\
-\testline{a:b}\\
-\testline{a:=b}\\
-\testline{a\vcentcolon= b}\\
-\testline{a\colon b}\\
-\testline{a.b}\\
-\testline{a-b}\\
-\testline{a+b}\\
-\testline{a=b}\\
-\testline{a<b}\\
-\testline{a>b}\\
-\testline{<x,y>}\\
-\testline{\mathopen{<} x,y\mathclose{>}}\\
-\testline{\left< x,y\right>}\\
-\testline{a/b}\\
-\testline{a\backslash b}\\
-\testline{a\setminus b}\\
-\testline{a|b}\\
-\testline{a\mid b}\\
-\testline{(a,b)}\\
-\testline{[a,b]}\\
-\testline{\{a,b\}}
-\end{tabular}}
-
-\end{document}
-\endinput
-%%
-%% End of file `mathastexttestalphabets.tex'.
diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastexttestmathversions.tex b/Master/texmf-dist/doc/latex/mathastext/mathastexttestmathversions.tex
deleted file mode 100644
index 41617ee37bc..00000000000
--- a/Master/texmf-dist/doc/latex/mathastext/mathastexttestmathversions.tex
+++ /dev/null
@@ -1,39 +0,0 @@
-\def\testfileincipit{Test file to accompany \texttt{mathastext}
-version \texttt{1.3c} of \texttt{2013/12/14}}
-%%----------------------------------------------------------------
-%% The mathastext package (version 1.3c of December 14, 2013)
-%% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol
-%% Examples of use of mathastext:
-%% http://jf.burnol.free.fr/mathastext.html
-%% http://jf.burnol.free.fr/showcase.html
-%%----------------------------------------------------------------
-%% This file `mathastexttestversions.tex' is for testing the enhanced
-%% concept of math versions provided by the package `mathastext'.
-%%
-%% See `mathastext.dtx' for the copyright and conditions of distribution or
-%% modification.
-%%
-\documentclass{article}
-\usepackage[T1]{fontenc}
-\usepackage{newcent}
-\usepackage[subdued]{mathastext}
-\Mathastext[newcent]
-\renewcommand\familydefault\ttdefault
-\Mathastext[courier]
-\renewcommand\familydefault\sfdefault
-\Mathastext[avantgarde]
-\renewcommand\familydefault\rmdefault
-\begin{document}
-\testfileincipit
-
-text in NewCentury and $math\ as\ in\ default$,%
-\MTversion{courier} text in Courier and $math\ in\ Courier$,%
-\MTversion{avantgarde} text in AvantGarde and $math\ in\ AvantGarde$,%
-\MTversion[newcent]{courier} text in NewCentury and $math\ in\
-Courier$,\MTversion{bold} text in bold NewCentury and $math\ as\ in\
-bold\ default$,\MTversion[courier]{avantgarde} text in Courier and
-$math\ in\ AvantGarde$.
-\end{document}
-\endinput
-%%
-%% End of file `mathastexttestmathversions.tex'.
diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodelinux.tex b/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodelinux.tex
deleted file mode 100644
index 284047b0fa7..00000000000
--- a/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodelinux.tex
+++ /dev/null
@@ -1,97 +0,0 @@
-\def\testfileincipit{Test file to accompany \texttt{mathastext}
-version \texttt{1.3c} of \texttt{2013/12/14}}
-%%----------------------------------------------------------------
-%% The mathastext package (version 1.3c of December 14, 2013)
-%% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol
-%% Examples of use of mathastext:
-%% http://jf.burnol.free.fr/mathastext.html
-%% http://jf.burnol.free.fr/showcase.html
-%%----------------------------------------------------------------
-%% This file `mathastexttestunicodelinux.tex' is for testing the use
-%% of the package `mathastext' with the unicode engines XeTeX or LuaLaTeX.
-%%
-%% Fonts available on a Linux machine are used.
-%%
-%% See `mathastext.dtx' for the copyright and conditions of distribution or
-%% modification.
-%%
-\documentclass{article}
-\usepackage[hscale=0.8]{geometry}
-\usepackage{multicol}
-\usepackage[no-math]{fontspec}
-\usepackage{lmodern}
-\usepackage{metalogo}
-\usepackage{iftex}
-\ifXeTeX
-\expandafter\def\expandafter\testfileincipit\expandafter
- {\testfileincipit\ (compiled with \XeLaTeX)}
-\else
-\ifLuaTeX
-\expandafter\def\expandafter\testfileincipit\expandafter
- {\testfileincipit\ (compiled with \LuaLaTeX)}
-\fi\fi
-\usepackage[subdued,italic,asterisk]{mathastext}
-\setmainfont[Color=999999]{Verdana} \Mathastext[Verdana]
-\setmainfont[Color=0000FF]{Arial} \Mathastext[Arial]
-\setmainfont[Color=00C000]{DejaVu Serif} \Mathastext[DejaVu]
-\setmainfont[Color=FF0000]{Andale Mono} \Mathastext[Andale]
-\setmainfont[Color=C000C0]{URW Chancery L} \Mathastext[Chancery]
-\setmainfont[Color=800080]{URW Palladio L} \Mathastext[Palladio]
-\setmainfont[Color=808000]{Liberation Serif} \Mathastext[Liberation]
-\MTDeclareVersion{Times}{T1}{ptm}{m}{n}
-\begin{document}
-\MTversion{normal}
-\testfileincipit
-
-This test uses \verb|mathastext| with its \emph{italic}, \emph{asterisk}, and
-\emph{subdued} options. The base document fonts are the Latin Modern ones (in
-OpenType format). The other fonts used were chosen from those of a Linux
-machine. We also used the Times font in T1 encoding, to illustrate a warning
-from the user manual when using different encodings in the various math
-versions: here the minus sign has disappeared from the Times math mode block,
-precisely for this matter of encoding.
-
-Furthermore we test if the non-letter characters obey the math alphabet
-\verb|\mathbf|. In the normal and bold math versions, this feature
-is de-activated, as option \emph{subdued} was used; and if activated we
-should then use in these math versions the package \verb|\Mathbf| rather
-than \verb|\mathbf| which is there still the original one, which will
-use encoding \verb|OT1| in the normal and bold versions, as we loaded
-\verb|fontspec| with its option \emph{no-math}.
-
-Some among the fonts tested have no bold variant or no italic variant.
-
-\newcommand\TEST[1]{\MTversion{#1}\def\tmpa{#1}%
- \def\tmpb{normal}\def\tmpc{bold}%
- \ifx\tmpa\tmpb\else\ifx\tmpa\tmpc\else \MTnonlettersobeymathxx
- \MTexplicitbracesobeymathxx\fi\fi
-\begin{multicols}{2}
-\hbox to\columnwidth{\hbox to\columnwidth{\hfil
- $abcdefghijklmnopqrstuvwxyz$\hfil}\kern-2.5em{#1}}
- \centerline{ $ABCDEFGHIJKLMNOPQRSTUVWXYZ$ }
- \centerline{ $0123456789$ }
- \centerline{ $!\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\backslash$ }
- \centerline{ $\mathbf{!\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\backslash}$ }
-\columnbreak
- \centerline{ abcdefghijklmnopqrstuvwxyz }
- \centerline{ ABCDEFGHIJKLMNOPQRSTUVWXYZ }
- \centerline{ 0123456789}
- \centerline{ !\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\char92 }
- \centerline{\bfseries !\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\char92 }
-\end{multicols}}
-\begin{multicols}{2}
- \centerline{\textbf{math mode}}
-\columnbreak
- \centerline{ \textbf{text} }
-\end{multicols}
-\TEST{DejaVu}\TEST{Verdana}\TEST{Andale}\TEST{Palladio}
-\TEST{Arial}\TEST{Chancery}\TEST{Liberation}
-\TEST{bold}\TEST{normal}\TEST{Times}
-\end{document}
-\endinput
-%%
-%% End of file `mathastexttestunicodelinux.tex'.
diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodemacos.tex b/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodemacos.tex
deleted file mode 100644
index 4adb2080fce..00000000000
--- a/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodemacos.tex
+++ /dev/null
@@ -1,99 +0,0 @@
-\def\testfileincipit{Test file to accompany \texttt{mathastext}
-version \texttt{1.3c} of \texttt{2013/12/14}}
-%%----------------------------------------------------------------
-%% The mathastext package (version 1.3c of December 14, 2013)
-%% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol
-%% Examples of use of mathastext:
-%% http://jf.burnol.free.fr/mathastext.html
-%% http://jf.burnol.free.fr/showcase.html
-%%----------------------------------------------------------------
-%% This file `mathastexttestunicodemacos.tex' is for testing the use
-%% of the package `mathastext' with the unicode engines XeTeX or LuaLaTeX.
-%%
-%% Mac OS X specific fonts are used (10.8.2).
-%%
-%% See `mathastext.dtx' for the copyright and conditions of distribution or
-%% modification.
-%%
-\documentclass{article}
-\usepackage[hscale=0.85]{geometry}
-\usepackage{multicol}
-\usepackage[no-math]{fontspec}
-\usepackage{lmodern}
-\usepackage{metalogo}
-\usepackage{iftex}
-\ifXeTeX
-\expandafter\def\expandafter\testfileincipit\expandafter
- {\testfileincipit\ (compiled with \XeLaTeX)}
-\else
-\ifLuaTeX
-\expandafter\def\expandafter\testfileincipit\expandafter
- {\testfileincipit\ (compiled with \LuaLaTeX)}
-\fi\fi
-\usepackage[subdued,italic,asterisk]{mathastext}
-\setmainfont[Color=FF0000]{Hoefler Text} \Mathastext[Hoefler]
-\setmainfont[Color=336633]{American Typewriter}\Mathastext[Typewriter]
-\setmainfont[Color=0000FF]{Herculanum} \Mathastext[Herculanum]
-\setmainfont[Color=FF00FF]{Didot} \Mathastext[Didot]
-\setmainfont[Color=999999]{Comic Sans MS} \Mathastext[Comic]
-\MTDeclareVersion{Times}{T1}{ptm}{m}{n}
-\begin{document}
-\MTversion{normal}
-\testfileincipit
-
-This test uses \verb|mathastext| with its \emph{italic}, \emph{asterisk}, and
-\emph{subdued} options. The base document fonts are the Latin Modern ones (in
-OpenType format). The other fonts used were chosen from those of a Mac OS
-machine. We also used the Times font in T1 encoding, to illustrate a warning
-from the user manual when using different encodings in the various math
-versions: here the minus sign has disappeared from the Times math mode block,
-precisely for this matter of encoding.
-
-Furthermore we test if the non-letter characters obey the math alphabet
-\verb|\mathbf|. In the normal and bold math versions, this feature is
-de-activated, as option \emph{subdued} was used; and if activated we
-should then use in these math versions the package \verb|\Mathbf| rather
-than \verb|\mathbf| which is there still the original one, which will
-use encoding \verb|OT1| in the normal and bold versions, as we loaded
-\verb|fontspec| with its option \emph{no-math}.
-
-Some among the fonts tested have no bold variant or no italic variant.
-
-Note (tested 2013/09/03): for some reason the \verb|Color| specifications in the
-\verb|\setmainfont| commands work only
-with \XeTeX{}, not with \LuaLaTeX{}; a few months back I had not noticed
-such a difference between the two engines.
-
-\newcommand\TEST[1]{\MTversion{#1}\def\tmpa{#1}%
- \def\tmpb{normal}\def\tmpc{bold}%
- \ifx\tmpa\tmpb\else\ifx\tmpa\tmpc\else \MTnonlettersobeymathxx
- \MTexplicitbracesobeymathxx\fi\fi
-\begin{multicols}{2}
-\hbox to\columnwidth{\hbox to\columnwidth{\hfil
- $abcdefghijklmnopqrstuvwxyz$\hfil}\kern-2.5em{#1}}
- \centerline{ $ABCDEFGHIJKLMNOPQRSTUVWXYZ$ }
- \centerline{ $0123456789$ }
- \centerline{ $!\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\backslash$ }
- \centerline{ $\mathbf{!\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\backslash}$ }
-\columnbreak
- \centerline{ abcdefghijklmnopqrstuvwxyz }
- \centerline{ ABCDEFGHIJKLMNOPQRSTUVWXYZ }
- \centerline{ 0123456789 }
- \centerline{ !\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\char92 }
- \centerline{\bfseries !\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\char92 }
-\end{multicols}}
-\begin{multicols}{2}
- \centerline{\textbf{math mode}}
-\columnbreak
- \centerline{ \textbf{text} }
-\end{multicols}
-\TEST{Didot}\TEST{Comic}\TEST{normal}\TEST{Herculanum}
-\TEST{Hoefler}\TEST{Typewriter}\TEST{bold}\TEST{Times}
-\end{document}
-\endinput
-%%
-%% End of file `mathastexttestunicodemacos.tex'.
diff --git a/Master/texmf-dist/source/latex/mathastext/mathastext.dtx b/Master/texmf-dist/source/latex/mathastext/mathastext.dtx
index 01e34f124f3..f7cc6ca4d55 100644
--- a/Master/texmf-dist/source/latex/mathastext/mathastext.dtx
+++ b/Master/texmf-dist/source/latex/mathastext/mathastext.dtx
@@ -1,21 +1,21 @@
% -*- coding: iso-latin-1; time-stamp-format: "%02d-%02m-%:y %02H:%02M:%02S %Z" -*-
-% File: mathastext.dtx, package: 1.3c (2013/12/14), documentation: 2013/12/14
+% File: mathastext.dtx, package: 1.3d (2014/05/23), documentation: 2014/05/23
% License: LaTeX Project Public License 1.3c or later.
-% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol <jfbu at free dot fr>
+% Copyright (C) 2011-2014 Jean-Francois Burnol <jfbu at free dot fr>
%<*dtx>
-\def\lasttimestamp{Time-stamp: <14-12-2013 17:31:20 CET>}
+\def\lasttimestamp{Time-stamp: <23-05-2014 18:44:40 CEST>}
%</dtx>
%<*drv|ins>
-\def\MSTpkgdate {2013/12/14}
-\def\MSTpkgversion {1.3c}
+\def\MSTpkgdate {2014/05/23}
+\def\MSTpkgversion {1.3d}
%</drv|ins>
% This file (mathastext.dtx) is to be processed with the pdfetex engine,
% it does not compile under the Unicode engines lualatex or xelatex.
%
%%----------------------------------------------------------------
-%% The mathastext package (version 1.3c of December 14, 2013)
+%% The mathastext package (version 1.3d of May 23, 2014)
%<package>%% Use the text font in math mode (jfB)
-%% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol
+%% Copyright (C) 2011-2014 Jean-Francois Burnol
%% Examples of use of mathastext:
%% http://jf.burnol.free.fr/mathastext.html
%% http://jf.burnol.free.fr/showcase.html
@@ -35,6 +35,11 @@
%
% Installation:
% =============
+%
+% The fastest way is: unzip -d <destination> mathastext.tds.zip, where
+% <destination> could be ~/texmf or, on mac os x, ~/Library/texmf, or
+% the working repertory of your project. Else, download mathastext.dtx,
+% possibly also mathastext.ins, and follow these instructions:
%
% * with mathastext.ins: run tex on mathastext.ins to generate the package
% style file mathastext.sty as well as mathastext.tex and some test files.
@@ -72,13 +77,13 @@
\chardef\extractfiles 0 % etex etc.. on mathastext.dtx
\else % latex/pdflatex on mathastext.tex or on mathastext.dtx
\expandafter\ifx\csname Withdvipdfmx\endcsname\relax
- % latex run is on etoc.dtx, we will extract all files
+ % latex run is on mathastext.dtx, we will extract all files
\chardef\extractfiles 1 % 1 = extract all and typeset doc
\chardef\Withdvipdfmx 0 % 0 = pdflatex or latex+dvips
\chardef\NoSourceCode 1 %
\NeedsTeXFormat{LaTeX2e}%
\PassOptionsToClass{a4paper,fontsize=11pt}{scrdoc}%
- \else % latex run is on etoc.tex,
+ \else % latex run is on mathastext.tex,
\chardef\extractfiles 2 % no extractions
\fi
\ProvidesFile{mathastext.dtx}%
@@ -125,7 +130,7 @@
% direct tex/etex/xetex/etc on mathastext.dtx, files now extracted, stop
\MessageDeFin\expandafter\end
\fi
-% no use of docstrip to extract files if latex compilation was on etoc.tex
+% no use of docstrip to extract files if latex compilation was on mathastext.tex
\ifdefined\MessageDeFin\AtEndDocument{\MessageDeFin}\fi
\catcode`\~0\catcode`\\12 % this is to fool TeX's recognition of \if...
~iffalse % conditionals, which are used in the test files
@@ -797,7 +802,12 @@ LGRgreek]{mathastext}
\MTgreekfont{txr}
\usepackage{times}
\Mathastext[times]
+\MTlettershape{\updefault}
+\MTseries{bx}
+\Mathastext[timesbold][bold]
+\MTlettershape{\itdefault}
+\MTseries{m}
\usepackage[scaled]{helvet}
\renewcommand\familydefault\sfdefault
\MTgreekfont{cmss}
@@ -896,6 +906,19 @@ This is the documentation for version \texttt{\MSTpkgversion} of
Changes for this release:
\begin{enumerate}[noitemsep]
+\item if one of the Greek related options (§LGRgreek§(s),
+ §selfGreek§(s), §eulergreek§, §symbolgreek§) has been passed to the
+ package, its action may be turned off and again on using
+ §\MTstandardgreek§ and §\MTcustomgreek§ at any location in the
+ document body.
+\item in the §subdued§ normal and bold math versions, the Greek letters in math
+ mode are the default ones, even if the package was loaded with one of the
+ Greek related options (previously, this was the case only for
+ §LGRgreek§ and §LGRgreeks§).
+\end{enumerate}
+
+Changes for release |1.3c| of |2013/12/14|:
+\begin{enumerate}[noitemsep]
\item §\Mathastext§ and §\MTDeclareVersion§ both accept a final optional
argument, a math version name whose settings regarding things not otherwise
changed by \mst (like most symbols and large symbols) will be inherited by
@@ -964,8 +987,15 @@ Earlier, version |1.15| introduced the concept of the
\subsection{Installation}
\begin{verbatim}
-Obtain mathastext.dtx, the README and optionally mathastext.ins and
-mathastext.tex from CTAN: http://ctan.org/pkg/mathastext
+The fastest way is to obtain mathastext.tds.zip from CTAN:
+ http://ctan.org/pkg/mathastext
+
+Then: unzip -d <destination> mathastext.tds.zip, where <destination>
+could be ~/texmf or, on mac os x, ~/Library/texmf, or the working
+repertory of your project.
+
+Else, download mathastext.dtx, possibly also mathastext.ins, and follow
+these instructions:
* with mathastext.ins: run tex on mathastext.ins to generate the package
style file mathastext.sty as well as mathastext.tex and some test files.
@@ -1166,15 +1196,16 @@ typeset in Times.\footnote{let's do as if we did not know the excellent
comparison to the CM fonts.} The exact list of characters concerned by
\mst is a subset of the basic |ASCII| set:
- \begin{framed}\centering
- \begingroup\color{joli}\bfseries
- {abcdefghijklmnopqrstuvwxyz}\\
- {ABCDEFGHIJKLMNOPQRSTUVWXYZ}\\
- {0123456789}\\
- \DeleteShortVerb{\|}%
- {!\,?\,\raisebox{-.3\height}{*}\,,\,.\,:\,;\,+\,\textendash\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\} {\color{black}\mdseries and
- }\char92}\endgroup\MakeShortVerb{\|}
+ \begin{framed}\centering\MTversion{timesbold}%
+ \begingroup\color{joli}%
+ $abcdefghijklmnopqrstuvwxyz$\par
+ $ABCDEFGHIJKLMNOPQRSTUVWXYZ$\par
+ $0123456789$\par
+ \DeleteShortVerb{\|}% global!
+ ${!}\,{?}\,{*}\,{,}\,{.}\,{:}\,{;}\,{+}\,{-}\,{=}\,{(}\,{)}\,
+ {[}\,{]}\,{/}\,{\#}\,{\$}\,{\%}\,{\&}\,{<}\,{>}\,{|}\,{\{}\,{\}}
+ \textrm{ \color{black}\mdseries and }{\backslash}$%
+ \endgroup\par\MakeShortVerb{\|}%
\end{framed}
As one can see, this is a very limited list! some possibilities are offered by
@@ -1202,8 +1233,22 @@ done optionally:
Nothing is changed to the ``large'' math symbols, except for
$\MToriginalprod$ and $\MToriginalsum$ in inline math which, like here:
$\prod\sum$, will be taken from the Symbol Font if option §symbolmisc§
-was used.
+was used.
+The left and right delimiters are taken from
+the text font only for the base size: any |\big|, |\bigl|, |\bigr|,
+etc\dots reverts to the original math symbols.
+
+
+\subsubsection{always load \mst last}
+
+The ``large'' math symbols are not modified in any way by \mst. Only loading
+some math font packages such as |fourier|, |kpfonts|, |mathabx|, |mathdesign|,
+|txfonts|, |newtxmath|, etc\dots{} will change them. Think of loading these
+packages before \mst, else they might undo what \mst did.
+
+More generally any package (such as |amsmath|) dealing with math mode should be
+loaded \emph{before} \mst.
\subsubsection{sans in math}
@@ -1217,16 +1262,35 @@ text.
\begin{document}
\end{verbatim}
-\subsubsection{always load \mst last}
+\subsubsection{using \mst with \texttt{beamer.sty}}
- As said already none of the ``large'' math symbols is modified in
- any way by \mst. Only loading some math font packages such as
- |fourier|, |kpfonts|, |mathabx|, |mathdesign|, |txfonts|, |newtxmath|,
-etc\dots{}
- will change them. Think of loading these packages before \mst, else
- they might undo what \mst did. The more common symbols can be taken
- from the Symbol font (option §symbolmisc§, or §symbolmax§ to get
- also the Greek letters from Symbol).
+It has been asked to add \mst to the list of packages recognized by
+|beamer| as math font packages. Until this is done, one needs to issue
+\centeredline{|\usefonttheme{professionalfonts}|} in the preamble.
+Random example:
+
+\begin{verbatim}
+\documentclass{beamer}
+\usefonttheme{professionalfonts}
+\usepackage{newcent}
+\usepackage[scaled=.9]{helvet}
+\renewcommand{\familydefault}{\rmdefault}
+\usepackage[defaultmathsizes,symbolgreek]{mathastext}
+\renewcommand{\familydefault}{\sfdefault}
+\begin{document}
+\begin{frame}
+ This is some text and next comes some math: $E=mc^2$
+ \[
+ E=mc^2=a^n+b^n-c^n=\alpha\beta\gamma
+ \]
+ \begin{align}
+ E&=mc^2\\
+ E&=h\nu
+ \end{align}
+ And again some text.
+\end{frame}
+\end{document}
+\end{verbatim}
\subsubsection{option \blueit{LGRgreek}}
@@ -1239,9 +1303,13 @@ etc\dots{}
that the default CM and its replacement Latin Modern for european
languages are (transparently to the user) extended with |LGR|
encoded fonts from the |cbfonts| (|cbgreek-complete|)
- package.} Of course it is always possible to leave the
- responsability to set up Greek letters in math mode to packages
- loaded previously to \mst.
+ package.}
+
+It is naturally possible to leave the
+ responsability to set up Greek letters to some other packages
+ loaded previously to \mst. And even if \mst has been loaded with one of its
+Greek related options the command §\MTstandardgreek§ will locally cancel its
+customization of Greek letters. See also §\MTcustomgreek§.
% \href{http://mirrors.ctan.org/help/Catalogue/entries/cbgreek-complete.html}{cbfonts}
@@ -1341,9 +1409,10 @@ as I think is illustrated by the examples given at the start of
this document, the §subdued§ option has its utility, and works
reasonably well.
-Furthermore, the §subdued§ action does \emph{not} extinguish
-package options §eulergreek§, §symbolgreek§ or §symbol§. But
-§LGRgreek§ is receptive to it.
+Starting with package version |1.3d|, the §subdued§ mode does extinguish
+in the normal and bold math versions the action of options §selfGreek§,
+§eulergreek§, and §symbolgreek§ (previously only §LGRgreek§ was
+subdue-able).
\subsection{Math versions}\label{sec:mathversions}
@@ -1386,7 +1455,7 @@ and three times the command §\Mathastext§, thus defining four
|fntguide.pdf| from your \TeX{} distribution.}: |lmvtt|, |newcent|,
|times|, and |helvet|. The names can be taken arbitrarily (they only
need to be suitable arguments to the \LaTeX{} \cs{DeclareMathVersion}
-command which is invoked internally, so no spaces in the names). Two
+command which is invoked internally). Two
additional math versions preexist: the |normal| and |bold|, which,
because there was the §subdued§ option, were left untouched by \mst.
@@ -1416,7 +1485,7 @@ math version to have distinct fonts for text and math:
In the body of the document the \LaTeX{} command
\cs{mathversion}\marg{version\_name} will change only the fonts used in math
mode. It is recommended to use instead the package command
-\csb{MTversion} (or its synonyms \cs{mathastextversion},
+\csb{MTversion} (or one of its synonyms \cs{mathastextversion},
\cs{Mathastextversion}, \cs{MTVersion}), with a mandatory argument
\marg{version\_name}. It
\begin{itemize}
@@ -1442,8 +1511,8 @@ mode. It is recommended to use instead the package command
decided by the user in the preamble on a \emph{per version} basis,
\item (see section \ref{sec:mathxx}) makes the math operator names as well as
the `easy' non letter characters (and the asterisk) obey the math alphabets,
-\item does some additional set up for Greek letters when the
- §LGRgreek§ option was used.
+\item does the additional set up for Greek letters in case of one the Greek
+ related options.
\end{itemize}
The scope is limited to the current \LaTeX{}
environment or group.
@@ -1977,14 +2046,13 @@ version the letters from the |LGR| encoded font used in that version,
and §selfGreeks§ to tell \mst to do as for §selfGreek§ but
separately in all math versions.
-The §subdued§ option interacts with the options for Greek letters in the
-following way:
-\begin{enumerate}
-\item in its presence, the §LGRgreek§ and §LGRgreeks§ options cease
- to have any effect in the normal and bold math versions,
-\item §selfGreek§\unskip(s), §eulergreek§ and §symbolgreek§ act normally,
- they are not affected by the presence or absence of §subdued§.
-\end{enumerate}
+Under the §subdued§ option the Greek letters in the normal and bold math
+versions are kept to their defaults as found at the time of loading the
+package.
+
+The commands §\MTstandardgreek§ allows at any point
+in the document to turn inactive any Greek related option passed to \mst. And
+conversely §\MTcustomgreek§ reactivates it.
\subsubsection{Shape of Greek letters}
@@ -2048,16 +2116,19 @@ on your system), etc\dots
\subsection{Unicode engines}
\mst has been made minimally unicode-aware and can be used with \XeTeX{} or
-\LuaLaTeX{}, but the user is strongly advised to look first at the |mathspec|
-package, which is a far more powerful package designed for
-unicode (only for \XeTeX{}), and to |unicode-math| (to use
-OpenType math fonts).
+\LuaLaTeX{}.
+
+With \XeTeX{} the user is strongly advised to first consider using the
+|mathspec| package, which isdesigned for Unicode, with a key-value interface.
+With both \XeTeX{} and \LuaLaTeX{}, |unicode-math| is recommended for OpenType
+math fonts.
-Of course \mst is extremely far from being able to define a math
-font, as it applies basically only to a subset of the 32-127 ascii range,
-and in particular it does not know how to use a given Unicode font
-simultaneously for Latin and Greek letters. Again the user is strongly
-advised to look at |mathspec| and |unicode-math|.
+Particularly in the latter case you probably don't need, don't want, and should
+not use \mst: it is extremely far from being able to define a math font, as it
+applies basically only to a subset of the 32-127 ascii range, and in particular
+it does not know how to use a given Unicode font simultaneously for Latin and
+Greek letters. Again the user is strongly advised to look at |mathspec| and
+|unicode-math|.
Let me point out explicitely that \mst has not been tested in any systematic
manner under the Unicode engines; and that it is expected to be most definitely
@@ -2080,7 +2151,12 @@ with its |no-math| option, and this \emph{must} happen before loading \mst.
\end{framed}
\begin{framed}
+ Starting with release |1.3| of \mst, the |luatex| engine binary must be at
+ least as recent as the one which was provided with the TL2013 distribution.
+
The |amsmath| package, if used, \emph{must} be loaded \emph{prior} to \mst.
+ Under |lualatex| engine, it is recommended to also load the package
+ |lualatex-math|.
\end{framed}
% obsolte with release 1.3:
@@ -2117,9 +2193,11 @@ fonts, or only old-fashioned \TeX{} fonts in a fixed encoding
The package was not extensively tested with unicode engines. I include
here two examples which compiled successfully with \XeTeX{} and
\LuaLaTeX{}, the first one on a Linux machine, the second one on a Mac
-OS X machine.\footnote{running |latex| (in a temporary repertory) on a
+OS X machine.\footnote{running |tex| (in a temporary repertory) on a
copy of the file |mathastext.dtx| will extract extended versions of
- these examples as test files.}
+ these examples as test files. Notice that the |Color=| specifications are not
+ recognized anymore under the current version of \LuaLaTeX{}, they used to be
+ in earlier versions.}
\begin{verbatim}
\documentclass{article}
\usepackage[hscale=0.8]{geometry}
@@ -2364,7 +2442,11 @@ the help of the \cs{DeclareMathOperator} macro, hence are
not the cause of an error in \XeTeX{}/\LuaLaTeX{}. What \mst
does is to let to relax the \cs{newmcodes@} macro, so it is
possible to save it before loading \mst and re-establish
-later, if really really this is what you want.}
+later, if really really this is what you want.}\footnote{new with
+\texttt{1.3d}: if \mst
+detacts the \texttt{lualatex-math} package which fixes this
+\texttt{amsmath} issue, it
+does not change \texttt{\char92newmcodes@}.}
This specific issue will perhaps be
fixed by some hypothetic future release of |amsmath|, or by other
packages providing patches, but I decided for a preemptive
@@ -2615,7 +2697,7 @@ option).
Another optional argument may be used as last argument. Similarly as its
use with §\Mathastext§ this makes the declared math version inherit, for
- things not modified by \mst like large symbols the font set up of the math
+ things not modified by \mst like large symbols, the font set up of the math
version whose name was passed as optional argument (typical use will be
with |[bold]|).
@@ -2788,6 +2870,22 @@ Greek letters in the versions which will be declared next.
math alphabets.} To cancel its effect either enclose it in a group or
environment or re-issue \cs{MTicinmath} after it.
+ \item §\MTstandardgreek§: in case \mst was loaded with one of the Greek
+ related options this command reverts the customization, it resets the Greek
+ letters to their definitions in force at package loading time. Can be used
+ in the preamble, but is mainly for the document body. Done automatically
+ under the |subdued| option when switching to the normal or bold math
+ version. Also available as |\Mathastextstandardgreek|.
+
+ \item §\MTcustomgreek§: in case \mst has been loaded with one of its
+ Greek related options, this activates the corresponding
+ customization of Greek letters in math mode. It is issued
+ automatically by the package in the preamble (except if loaded with
+ §subdued§ option) and at each switch of math version via
+ |\MTversion| or |\MTversion*| (except to the normal and bold math
+ version in subdued mode). Also available as
+ |\Mathastextcustomgreek|.
+
\end{enumerate}
\subsubsection{Body-only commands}
@@ -3076,6 +3174,18 @@ Numerous examples will be found there:\\
\begin{multicols}{2}
\begin{verbatim}
+1.3d [2014/05/23]
+
+ * new commands \MTstandardgreek and \MTcustomgreek.
+
+ * The Greek letters, in case of use of one of the package related options,
+are left to their defaults in the normal and bold math versions if the
+subdued option was also used (this was so far the case only with options
+LGRgreek/LGRgreeks).
+
+ * \newmcodes@ of amsmath is left untouched if package lualatex-math
+is detected.
+
1.3c [2013/12/14]
* added a starred variant to \MTversion which tells mathastext to only do the
@@ -3424,12 +3534,13 @@ encodings, Unicode inclusive.
%
% The comments have been accumulating through successive versions with only
% partial efforts to achieve some sort of coherence; as a result some are a
-% bit strange or obsolete to various degrees.
+% bit strange or obsolete to various degrees. And the similar remark
+% applies to some ancient parts of the code itself!
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage {mathastext}
- [2013/12/14 v1.3c Use the text font in math mode (jfB)]
+ [2014/05/23 v1.3d Use the text font in math mode (jfB)]
% \end{macrocode}
% Testing for XeTeX and LuaLaTeX. I should load some package for this code which
% I copied somewhere (perhaps from the |iftex| package? or some post on
@@ -3562,7 +3673,9 @@ encodings, Unicode inclusive.
\newif\ifmst@symboldigits
\DeclareOption{symboldigits}{\mst@needsymboltrue\mst@symboldigitstrue}
\newif\ifmst@symbolgreek
- \DeclareOption{symbolgreek}{\mst@needsymboltrue\mst@symbolgreektrue}
+\newif\ifmst@customgreek %% new with 1.3d
+ \DeclareOption{symbolgreek}{\mst@needsymboltrue\mst@symbolgreektrue
+ \mst@customgreektrue }
\newif\ifmst@symbolre
\DeclareOption{symbolre}{\mst@needsymboltrue\mst@symbolretrue}
\newif\ifmst@symbolmisc
@@ -3574,16 +3687,19 @@ encodings, Unicode inclusive.
\newif\ifmst@eulerdigits
\DeclareOption{eulerdigits}{\mst@needeulertrue\mst@eulerdigitstrue}
\newif\ifmst@eulergreek
- \DeclareOption{eulergreek}{\mst@needeulertrue\mst@eulergreektrue}
+ \DeclareOption{eulergreek}{\mst@needeulertrue\mst@eulergreektrue
+ \mst@customgreektrue }
%%
\newif\ifmst@selfGreek
- \DeclareOption{selfGreek}{\mst@selfGreektrue}
+ \DeclareOption{selfGreek}{\mst@selfGreektrue\mst@customgreektrue}
\newif\ifmst@selfGreeks
- \DeclareOption{selfGreeks}{\mst@selfGreekstrue\mst@selfGreektrue}
+ \DeclareOption{selfGreeks}{\mst@selfGreekstrue\mst@selfGreektrue
+ \mst@customgreektrue }
\newif\ifmst@LGRgreek
- \DeclareOption{LGRgreek}{\mst@LGRgreektrue}
+ \DeclareOption{LGRgreek}{\mst@LGRgreektrue\mst@customgreektrue}
\newif\ifmst@LGRgreeks
- \DeclareOption{LGRgreeks}{\mst@LGRgreekstrue\mst@LGRgreektrue}
+ \DeclareOption{LGRgreeks}{\mst@LGRgreekstrue\mst@LGRgreektrue
+ \mst@customgreektrue}
%%
\def\mst@greek@select{0}
\newif\ifmst@itgreek
@@ -4187,11 +4303,18 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
% behavior (although the tick will give a prime).
%
% |1.3|: now tests if `basic' option was used.
+%
+% |1.3d|: I should re-examine the situation with |\newmcodes@|. In the
+% meantime its relaxification will not be done if lualatex-math is
+% loaded. And the whole thing is put at begin document.
% \begin{macrocode}
\ifmst@basic\else
+\AtBeginDocument {%
\@ifpackageloaded{amsmath}
- {\let\newmcodes@\relax} % brutal, but bye bye and don't come back.
- {}
+ {\@ifpackageloaded{lualatex-math}
+ {\@ifpackagelater{lualatex-math}{2013/08/03}{}{\let\newmcodes@\relax}}
+ {\let\newmcodes@\relax}}
+ {}}
\fi
% \end{macrocode}
% \end{macro}
@@ -4215,7 +4338,8 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
% or a Unicode mathcode. On the other hand the much saner
% \cs{XeTeXmathcodenum} always return a Unicode mathcode.
%
-% \textbf{UPDATE for \mst\ 1.3: since the release of lualatex as included in
+% {UPDATE for \mst\ 1.3 (2013/09/02): since the release of lualatex as
+% included in
% TL2013, \cs{luatexUmathcodenum} behaves as \cs{XeTeXmathcodenum} so \mst 1.3
% treats identically under both unicode engines the equal and minus signs (and
% the vertical bar).}
@@ -4310,8 +4434,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
% set up the normal and bold math versions, so we will
% also employ \cs{SetSymbolFont} later.
% \begin{macrocode}
-\DeclareSymbolFont{mtoperatorfont}
- {\mst@enc}{\mst@fam}{\mst@ser}{\mst@opsh}
+\DeclareSymbolFont{mtoperatorfont}{\mst@enc}{\mst@fam}{\mst@ser}{\mst@opsh}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\operator@font}
@@ -4344,8 +4467,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
% digits. Thanks to Tariq~\textsc{Perwez} and
% Kevin~\textsc{Klement} who asked for such a feature.
% \begin{macrocode}
-\DeclareSymbolFont{mtletterfont}
- {\mst@enc}{\mst@fam}{\mst@ser}{\mst@ltsh}
+\DeclareSymbolFont{mtletterfont}{\mst@enc}{\mst@fam}{\mst@ser}{\mst@ltsh}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\Mathnormal}
@@ -4376,13 +4498,17 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\DeclareSymbolFontAlphabet{\Mathrm}{mtoperatorfont}
\ifmst@nonormalbold\else
\DeclareMathAlphabet{\mathnormalbold}{\mst@enc}{\mst@fam}{\mst@bold}{\mst@ltsh}
-\fi\ifmst@defaultbf\else
+\fi
+\ifmst@defaultbf\else
\DeclareMathAlphabet{\Mathbf}{\mst@enc}{\mst@fam}{\mst@bold}{\mst@opsh}
-\fi\ifmst@defaultit\else
+\fi
+\ifmst@defaultit\else
\DeclareMathAlphabet{\Mathit}{\mst@enc}{\mst@fam}{\mst@ser}{\itdefault}
-\fi\ifmst@defaultsf\else
+\fi
+\ifmst@defaultsf\else
\DeclareMathAlphabet{\Mathsf}{\mst@enc}{\sfdefault}{\mst@ser}{\mst@opsh}
-\fi\ifmst@defaulttt\else
+\fi
+\ifmst@defaulttt\else
\DeclareMathAlphabet{\Mathtt}{\mst@enc}{\ttdefault}{\mst@ser}{\mst@opsh}
\fi
\let\mst@original@normal\mathnormal
@@ -4466,14 +4592,11 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\mst@update@greeksh
\ifmst@LGRgreek
\DeclareFontEncoding{LGR}{}{}
- \DeclareSymbolFont{mtlgrfontlower}{LGR}
- {\mst@fam}{\mst@ser}{\mst@greek@lsh}
- \DeclareSymbolFont{mtlgrfontupper}{LGR}
- {\mst@fam}{\mst@ser}{\mst@greek@ush}
+ \DeclareSymbolFont{mtlgrfontlower}{LGR}{\mst@fam}{\mst@ser}{\mst@greek@lsh}
+ \DeclareSymbolFont{mtlgrfontupper}{LGR}{\mst@fam}{\mst@ser}{\mst@greek@ush}
\else
\ifmst@selfGreek
- \DeclareSymbolFont{mtselfGreekfont}{OT1}
- {\mst@fam}{\mst@ser}{\mst@greek@ush}
+ \DeclareSymbolFont{mtselfGreekfont}{OT1}{\mst@fam}{\mst@ser}{\mst@greek@ush}
\fi\fi
% \end{macrocode}
% \end{macro}
@@ -5035,23 +5158,23 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\SetSymbolFont{mtlgrfontlower}{#2}{LGR}{#4}{#5}{\mst@greek@lsh@loc}%
\SetSymbolFont{mtlgrfontupper}{#2}{LGR}{#4}{#5}{\mst@greek@ush@loc}%
\typeout{** Greek letters (\mst@greek@lsh@loc/\mst@greek@ush@loc) will use
- LGR font #4}%
+ LGR font #4\ifmst@subdued ^^J** (in non subdued versions)\fi}%
\else
\ifmst@selfGreeks
\SetSymbolFont{mtselfGreekfont}{#2}{OT1}{#4}{#5}{\mst@greek@ush@loc}%
\typeout{** Capital Greek letters (\mst@greek@lsh@loc/\mst@greek@ush@loc)
- will use OT1 font #4}%
+ will use OT1 font #4\ifmst@subdued ^^J** (in non subdued versions)\fi}%
\else
\ifmst@LGRgreek
\SetSymbolFont{mtlgrfontlower}{#2}{LGR}{\mst@greekfont}{#5}{\mst@greek@lsh@loc}%
\SetSymbolFont{mtlgrfontupper}{#2}{LGR}{\mst@greekfont}{#5}{\mst@greek@ush@loc}%
\typeout{** Greek letters (\mst@greek@lsh@loc/\mst@greek@ush@loc) will use
- LGR font \mst@greekfont}%
+ LGR font \mst@greekfont\ifmst@subdued ^^J** (in non subdued versions)\fi}%
\else
\ifmst@selfGreek
\SetSymbolFont{mtselfGreekfont}{#2}{OT1}{\mst@greekfont}{#5}{\mst@greek@ush@loc}%
\typeout{** Capital Greek letters (\mst@greek@lsh@loc/\mst@greek@ush@loc)
- will use OT1 font \mst@greekfont}%
+ will use OT1 font \mst@greekfont\ifmst@subdued ^^J** (in non subdued versions)\fi}%
\fi
\fi
\fi
@@ -5094,6 +5217,14 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
%
% |1.3c|: a starred variant is added which does not modify the text fonts,
% only the math set-tup.
+%
+% |1.3d|: replaced in |\MTversion@| things like |\edef\mst@encoding{...}| and
+% |\renewcommand{\encodingdefault}{\mst@@encoding}| by
+% |\edef\encodingdefault{...}| etc\dots All those |\mst@@...| things were
+% useless. I also redefine |\seriesdefault| rather than |\mddefault|.
+%
+% |1.3d|: mechanism of restoration of Greek in subdued normal and bold
+% versions has been to all cases, and not only for the |LGRgreek| option.
% \begin{macrocode}
\newcommand*\MTversion {\@ifstar\MTversion@s\MTversion@ }
\newcommand*\MTversion@s [1]{\mathversion{#1}\MTversion@@ {#1}}
@@ -5105,29 +5236,16 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\else
\let\mst@tmp\mst@tmpa
\fi
- \usefont{\csname mst@encoding@\mst@tmp\endcsname}%
- {\csname mst@family@\mst@tmp\endcsname}%
- {\csname mst@series@\mst@tmp\endcsname}%
- {\csname mst@shape@\mst@tmp\endcsname}%
- \edef\mst@@encoding{\csname mst@encoding@\mst@tmp\endcsname}%
- \renewcommand{\encodingdefault}{\mst@@encoding}%
-%% some modifications for v1.15b
- \edef\mst@@famdefault{\csname mst@family@\mst@tmp\endcsname}%
- \renewcommand{\familydefault}{\mst@@famdefault}%
- \edef\mst@@series{\csname mst@series@\mst@tmp\endcsname}%
- \renewcommand{\mddefault}{\mst@@series}%
- \edef\mst@@shape{\csname mst@shape@\mst@tmp\endcsname}%
- \renewcommand{\shapedefault}{\mst@@shape}%
- \edef\mst@@boldvariant{\csname mst@boldvariant@\mst@tmp\endcsname}%
- \renewcommand{\bfdefault}{\mst@@boldvariant}%
- \edef\mst@@itdefault{\csname mst@itdefault@\mst@tmp\endcsname}%
- \renewcommand{\itdefault}{\mst@@itdefault}%
- \edef\mst@@rmdefault{\csname mst@rmdefault@\mst@tmp\endcsname}%
- \renewcommand{\rmdefault}{\mst@@rmdefault}%
- \edef\mst@@sfdefault{\csname mst@sfdefault@\mst@tmp\endcsname}%
- \renewcommand{\sfdefault}{\mst@@sfdefault}%
- \edef\mst@@ttdefault{\csname mst@ttdefault@\mst@tmp\endcsname}%
- \renewcommand{\ttdefault}{\mst@@ttdefault}%
+ \edef\encodingdefault {\csname mst@encoding@\mst@tmp\endcsname}%
+ \edef\familydefault {\csname mst@family@\mst@tmp\endcsname}%
+ \edef\seriesdefault {\csname mst@series@\mst@tmp\endcsname}%
+ \edef\shapedefault {\csname mst@shape@\mst@tmp\endcsname}%
+ \edef\bfdefault {\csname mst@boldvariant@\mst@tmp\endcsname}%
+ \edef\itdefault {\csname mst@itdefault@\mst@tmp\endcsname}%
+ \edef\rmdefault {\csname mst@rmdefault@\mst@tmp\endcsname}%
+ \edef\sfdefault {\csname mst@sfdefault@\mst@tmp\endcsname}%
+ \edef\ttdefault {\csname mst@ttdefault@\mst@tmp\endcsname}%
+ \usefont{\encodingdefault}{\familydefault}{\seriesdefault}{\shapedefault}%
\MTversion@@ {#2}%
}
\newcommand*\MTversion@@ [1]{%
@@ -5156,6 +5274,8 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
%% v1.15f: subdueing math alphabets in a simpler way than in 1.15e
%% v1.2b: subdueing the activation of characters in math mode
%% v1.2d: special treatment of the asterisk
+%% v1.3d: extended LGRgreek mechanism of activation/restoration of Greek to all
+%% cases
\MTmathoperatorsobeymathxx
\MTeasynonlettersobeymathxx
\ifmst@asterisk\let\mst@doasterisk\mst@@doasterisk\fi
@@ -5163,27 +5283,29 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\def\mst@tmpa{normal}%
\ifx\mst@tmp\mst@tmpa
\mst@restorealphabets
+ \MTstandardgreek
\MTmathoperatorsdonotobeymathxx
\MTnonlettersdonotobeymathxx
\MTeasynonlettersdonotobeymathxx
\MTmathstandardletters
\ifmst@asterisk\let\mst@doasterisk\relax\fi
- \ifmst@LGRgreek\mst@restoregreek\fi
\else
\def\mst@tmpa{bold}%
\ifx\mst@tmp\mst@tmpa
\mst@restorealphabets
+ \MTstandardgreek
\MTmathoperatorsdonotobeymathxx
\MTnonlettersdonotobeymathxx
\MTeasynonlettersdonotobeymathxx
\MTmathstandardletters
\ifmst@asterisk\let\mst@doasterisk\relax\fi
- \ifmst@LGRgreek\mst@restoregreek\fi
\else
\mst@setalphabets
- \ifmst@LGRgreek\mst@setuplgrgreek\fi
+ \MTcustomgreek
\fi
\fi
+ \else
+ \MTcustomgreek % new with 1.3d
\fi
}
\let\MathastextVersion\MTversion
@@ -5201,12 +5323,16 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
% Additional appropriate messages to the terminal and the log.
% \begin{macrocode}
\ifmst@eulergreek
- \typeout{** Greek letters will use the Euler font. Use^^J%
- ** \protect\MathastextEulerScale{<factor>} to scale the font.}%
+ \typeout{** Greek letters will use the Euler font. Use \protect\MathastextEulerScale{<factor>} to scale the
+ font.}%
+ \ifmst@subdued{\typeout{** (subdued mode: normal and bold math
+ version with default Greek letters.)}}\fi
\else
\ifmst@symbolgreek
\typeout{** Greek letters will use the PostScript Symbol font. Use^^J%
** \protect\MathastextSymbolScale{<factor>} to scale the font.}%
+ \ifmst@subdued{\typeout{** (subdued mode: normal and bold math
+ version with default Greek letters.)}}\fi
\fi\fi
% \end{macrocode}
% At (long...) last we now change the font for the letters of the
@@ -5679,8 +5805,6 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
% \end{macrocode}
% There is no backslash in the Symbol font hence |mtoperatorfont| here.
% \begin{macrocode}
- \expandafter\DeclareMathDelimiter\@backslashchar
- {\mathord}{mtoperatorfont}{"5C}{largesymbols}{"0F}
\DeclareMathDelimiter{\backslash}
{\mathord}{mtoperatorfont}{"5C}{largesymbols}{"0F}
\DeclareMathDelimiter{\mst@varfam@backslash}
@@ -5972,108 +6096,108 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
% |1.11| I correct some bugs on how eulergreek and
% symbolgreek interacted.
%
-% |1.12b| I introduced another very stupid bug (regarding
-% uppercase Greek) in |1.1|. This is corrected here. All this
-% business of checking for \cs{digamma} was truly stupid as
-% some package might well have defined the font for Greek
-% without having defined \cs{digamma}, I don't know what
-% crossed my dumb mind when I committed this insane code and
-% started redefining uppercase Greek, and it is even worse
-% than that as I was redefining not only relatively benign
-% things such as \cs{Alpha} but also \cs{Phi} etc\dots
+% |1.12b| more bug fixes.
+%
+% |1.13|
%
-% |1.13| * Option LGRgreek.
+% * Option LGRgreek.
%
% * Also, a behavior has been changed: it regards the selfGreek case,
% the default shape is now the one for letters, not for operator-names
% and digits. This complies to the ISO standard.
%
-% * version |1.12b| did not define the \cs{omicron} in the case when no
-% Greek-related option was passed to the package. This was a bug.
+% * bugfix: version |1.12b| did not define the \cs{omicron} in the
+% case when no Greek-related option was passed to the package.
+%
+% |1.13d| has new macros |\MTstandardgreek| and |\MTcustomgreek|.
+% And in the subdued case |\MTstandardgreek| is done when switching to
+% the normal or bold math versions (previously something like this
+% was only done in case of |LGRgreek| option. )
% \begin{macrocode}
\let\mst@mathord\mathalpha
\mst@goaheadtrue
\ifmst@selfGreek
\def\mst@font@tbu{mtselfGreekfont}
- \else
-\ifmst@eulergreek
- \def\mst@font@tbu{mteulervm}
- \else
-\ifmst@symbolgreek
- \def\mst@font@tbu{mtpsymbol}
- \let\mst@mathord\mathord
- \else
-\ifmst@LGRgreek
- \mst@goaheadfalse
- \else
+\else
+ \ifmst@eulergreek
+ \def\mst@font@tbu{mteulervm}
+ \else
+ \ifmst@symbolgreek
+ \def\mst@font@tbu{mtpsymbol}
+ \let\mst@mathord\mathord
+ \else
+ \ifmst@LGRgreek
+ \mst@goaheadfalse
+ \else
% \end{macrocode}
% The \cs{omicron} requires special treatment. By default we use the o from the
% (original) normal alphabet, if eulergreek or symbolgreek we adapt. There is
% also a special adjustment if the package |fourier| was loaded in its
% |upright| variant: we then take \cs{omicron} from the (original) rm alphabet.
% \begin{macrocode}
- \mst@goaheadfalse
- \ifx\omicron\undefined
- \newcommand*{\omicron}{\mst@alph@omicron{o}}
- \fi
-\fi\fi\fi\fi
+ \mst@goaheadfalse
+ \def\mst@omicron {\mst@alph@omicron{o}}
+ \fi
+ \fi
+ \fi
+\fi
\ifmst@goahead
-\DeclareMathSymbol{\Alpha}{\mst@mathord}{\mst@font@tbu}{"41}
-\DeclareMathSymbol{\Beta}{\mst@mathord}{\mst@font@tbu}{"42}
-\DeclareMathSymbol{\Epsilon}{\mst@mathord}{\mst@font@tbu}{"45}
-\DeclareMathSymbol{\Zeta}{\mst@mathord}{\mst@font@tbu}{"5A}
-\DeclareMathSymbol{\Eta}{\mst@mathord}{\mst@font@tbu}{"48}
-\DeclareMathSymbol{\Iota}{\mst@mathord}{\mst@font@tbu}{"49}
-\DeclareMathSymbol{\Kappa}{\mst@mathord}{\mst@font@tbu}{"4B}
-\DeclareMathSymbol{\Mu}{\mst@mathord}{\mst@font@tbu}{"4D}
-\DeclareMathSymbol{\Nu}{\mst@mathord}{\mst@font@tbu}{"4E}
-\DeclareMathSymbol{\Omicron}{\mst@mathord}{\mst@font@tbu}{"4F}
-\DeclareMathSymbol{\Rho}{\mst@mathord}{\mst@font@tbu}{"50}
-\DeclareMathSymbol{\Tau}{\mst@mathord}{\mst@font@tbu}{"54}
-\DeclareMathSymbol{\Chi}{\mst@mathord}{\mst@font@tbu}{"58}
+ \DeclareMathSymbol{\mst@Alpha}{\mst@mathord}{\mst@font@tbu}{"41}
+ \DeclareMathSymbol{\mst@Beta}{\mst@mathord}{\mst@font@tbu}{"42}
+ \DeclareMathSymbol{\mst@Epsilon}{\mst@mathord}{\mst@font@tbu}{"45}
+ \DeclareMathSymbol{\mst@Zeta}{\mst@mathord}{\mst@font@tbu}{"5A}
+ \DeclareMathSymbol{\mst@Eta}{\mst@mathord}{\mst@font@tbu}{"48}
+ \DeclareMathSymbol{\mst@Iota}{\mst@mathord}{\mst@font@tbu}{"49}
+ \DeclareMathSymbol{\mst@Kappa}{\mst@mathord}{\mst@font@tbu}{"4B}
+ \DeclareMathSymbol{\mst@Mu}{\mst@mathord}{\mst@font@tbu}{"4D}
+ \DeclareMathSymbol{\mst@Nu}{\mst@mathord}{\mst@font@tbu}{"4E}
+ \DeclareMathSymbol{\mst@Omicron}{\mst@mathord}{\mst@font@tbu}{"4F}
+ \DeclareMathSymbol{\mst@Rho}{\mst@mathord}{\mst@font@tbu}{"50}
+ \DeclareMathSymbol{\mst@Tau}{\mst@mathord}{\mst@font@tbu}{"54}
+ \DeclareMathSymbol{\mst@Chi}{\mst@mathord}{\mst@font@tbu}{"58}
% \end{macrocode}
% When we in fact use Symbol, we have to correct \cs{Rho} and
% \cs{Chi}. And \cs{Digamma} is non-existent in fact (no F
% in Symbol, F codes a \cs{Phi}).
% \begin{macrocode}
-\ifx\mst@mathord\mathord
+ \ifx\mst@mathord\mathord
% \end{macrocode}
% symbolgreek but neither eulergreek nor selfGreek
% \begin{macrocode}
%% attention le P de Symbol est un \Pi pas un \Rho
-\DeclareMathSymbol{\Rho}{\mathord}{mtpsymbol}{"52}
+ \DeclareMathSymbol{\mst@Rho}{\mathord}{mtpsymbol}{"52}
%% attention le X de Symbol est un \Xi pas un \Chi
-\DeclareMathSymbol{\Chi}{\mathord}{mtpsymbol}{"43}
+ \DeclareMathSymbol{\mst@Chi}{\mathord}{mtpsymbol}{"43}
%% attention le F de Symbol est un \Phi. Il n'y a pas de \Digamma
-\DeclareMathSymbol{\Gamma}{\mathord}{mtpsymbol}{"47}
-\DeclareMathSymbol{\Delta}{\mathord}{mtpsymbol}{"44}
-\DeclareMathSymbol{\Theta}{\mathord}{mtpsymbol}{"51}
-\DeclareMathSymbol{\Lambda}{\mathord}{mtpsymbol}{"4C}
-\DeclareMathSymbol{\Xi}{\mathord}{mtpsymbol}{"58}
-\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}
-\else
+ \DeclareMathSymbol{\mst@Gamma}{\mathord}{mtpsymbol}{"47}
+ \DeclareMathSymbol{\mst@Delta}{\mathord}{mtpsymbol}{"44}
+ \DeclareMathSymbol{\mst@Theta}{\mathord}{mtpsymbol}{"51}
+ \DeclareMathSymbol{\mst@Lambda}{\mathord}{mtpsymbol}{"4C}
+ \DeclareMathSymbol{\mst@Xi}{\mathord}{mtpsymbol}{"58}
+ \DeclareMathSymbol{\mst@Pi}{\mathord}{mtpsymbol}{"50}
+ \DeclareMathSymbol{\mst@Sigma}{\mathord}{mtpsymbol}{"53}
+ \DeclareMathSymbol{\mst@Upsilon}{\mathord}{mtpsymbol}{"A1}
+ \DeclareMathSymbol{\mst@Phi}{\mathord}{mtpsymbol}{"46}
+ \DeclareMathSymbol{\mst@Psi}{\mathord}{mtpsymbol}{"59}
+ \DeclareMathSymbol{\mst@Omega}{\mathord}{mtpsymbol}{"57}
+ \else % de \mst@mathord=\mathord
% \end{macrocode}
% not symbolgreek but eulergreek or selfGreek or both
% \begin{macrocode}
-\DeclareMathSymbol{\Digamma}{\mathalpha}{\mst@font@tbu}{"46}
-\DeclareMathSymbol\Gamma {\mathalpha}{\mst@font@tbu}{"00}
-\DeclareMathSymbol\Delta {\mathalpha}{\mst@font@tbu}{"01}
-\DeclareMathSymbol\Theta {\mathalpha}{\mst@font@tbu}{"02}
-\DeclareMathSymbol\Lambda {\mathalpha}{\mst@font@tbu}{"03}
-\DeclareMathSymbol\Xi {\mathalpha}{\mst@font@tbu}{"04}
-\DeclareMathSymbol\Pi {\mathalpha}{\mst@font@tbu}{"05}
-\DeclareMathSymbol\Sigma {\mathalpha}{\mst@font@tbu}{"06}
-\DeclareMathSymbol\Upsilon {\mathalpha}{\mst@font@tbu}{"07}
-\DeclareMathSymbol\Phi {\mathalpha}{\mst@font@tbu}{"08}
-\DeclareMathSymbol\Psi {\mathalpha}{\mst@font@tbu}{"09}
-\DeclareMathSymbol\Omega {\mathalpha}{\mst@font@tbu}{"0A}
-\fi
-\fi
+ \DeclareMathSymbol\mst@Digamma {\mathalpha}{\mst@font@tbu}{"46}
+ \DeclareMathSymbol\mst@Gamma {\mathalpha}{\mst@font@tbu}{"00}
+ \DeclareMathSymbol\mst@Delta {\mathalpha}{\mst@font@tbu}{"01}
+ \DeclareMathSymbol\mst@Theta {\mathalpha}{\mst@font@tbu}{"02}
+ \DeclareMathSymbol\mst@Lambda {\mathalpha}{\mst@font@tbu}{"03}
+ \DeclareMathSymbol\mst@Xi {\mathalpha}{\mst@font@tbu}{"04}
+ \DeclareMathSymbol\mst@Pi {\mathalpha}{\mst@font@tbu}{"05}
+ \DeclareMathSymbol\mst@Sigma {\mathalpha}{\mst@font@tbu}{"06}
+ \DeclareMathSymbol\mst@Upsilon {\mathalpha}{\mst@font@tbu}{"07}
+ \DeclareMathSymbol\mst@Phi {\mathalpha}{\mst@font@tbu}{"08}
+ \DeclareMathSymbol\mst@Psi {\mathalpha}{\mst@font@tbu}{"09}
+ \DeclareMathSymbol\mst@Omega {\mathalpha}{\mst@font@tbu}{"0A}
+ \fi % de \mst@mathord=\mathord
+\fi % fin de goahead
% \end{macrocode}
% There are differences regarding Euler and Symbol with respect to the
% available var-letters. We include one or two things like the |wp| and the
@@ -6084,242 +6208,80 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
% |mathalpha|
% \begin{macrocode}
\ifmst@goahead
-\ifmst@eulergreek
-\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}
-\let\omicron\undefined
-\DeclareMathSymbol{\omicron}{\mathalpha}{mteulervm}{"6F}
-\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} {\mathalpha}{mteulervm}{"27}
-\DeclareMathSymbol{\partial}{\mathalpha}{mteulervm}{"40}
-\DeclareMathSymbol{\wp}{\mathalpha}{mteulervm}{"7D}
-\DeclareMathSymbol{\ell}{\mathalpha}{mteulervm}{"60}
-\else
-\ifmst@symbolgreek
-\DeclareMathSymbol{\alpha}{\mathord}{mtpsymbol}{"61}
-\DeclareMathSymbol{\beta}{\mathord}{mtpsymbol}{"62}
-\DeclareMathSymbol{\gamma}{\mathord}{mtpsymbol}{"67}
-\DeclareMathSymbol{\delta}{\mathord}{mtpsymbol}{"64}
-\DeclareMathSymbol{\epsilon}{\mathord}{mtpsymbol}{"65}
-\DeclareMathSymbol{\zeta}{\mathord}{mtpsymbol}{"7A}
-\DeclareMathSymbol{\eta}{\mathord}{mtpsymbol}{"68}
-\DeclareMathSymbol{\theta}{\mathord}{mtpsymbol}{"71}
-\DeclareMathSymbol{\iota}{\mathord}{mtpsymbol}{"69}
-\DeclareMathSymbol{\kappa}{\mathord}{mtpsymbol}{"6B}
-\DeclareMathSymbol{\lambda}{\mathord}{mtpsymbol}{"6C}
-\DeclareMathSymbol{\mu}{\mathord}{mtpsymbol}{"6D}
-\DeclareMathSymbol{\nu}{\mathord}{mtpsymbol}{"6E}
-\DeclareMathSymbol{\xi}{\mathord}{mtpsymbol}{"78}
-\let\omicron\undefined
-\DeclareMathSymbol{\omicron}{\mathord}{mtpsymbol}{"6F}
-\DeclareMathSymbol{\pi}{\mathord}{mtpsymbol}{"70}
-\DeclareMathSymbol{\rho}{\mathord}{mtpsymbol}{"72}
-\DeclareMathSymbol{\sigma}{\mathord}{mtpsymbol}{"73}
-\DeclareMathSymbol{\tau}{\mathord}{mtpsymbol}{"74}
-\DeclareMathSymbol{\upsilon}{\mathord}{mtpsymbol}{"75}
-\DeclareMathSymbol{\phi}{\mathord}{mtpsymbol}{"66}
-\DeclareMathSymbol{\chi}{\mathord}{mtpsymbol}{"63}
-\DeclareMathSymbol{\psi}{\mathord}{mtpsymbol}{"79}
-\DeclareMathSymbol{\omega}{\mathord}{mtpsymbol}{"77}
-\let\varepsilon=\epsilon
-\DeclareMathSymbol{\vartheta}{\mathord}{mtpsymbol}{"4A}
-\DeclareMathSymbol{\varpi}{\mathord}{mtpsymbol}{"76}
-\let\varrho=\rho
-\DeclareMathSymbol{\varsigma}{\mathord}{mtpsymbol}{"56}
-\DeclareMathSymbol{\varphi}{\mathord}{mtpsymbol}{"6A}
-\DeclareMathSymbol{\partial}{\mathord}{mtpsymbol}{"B6}
-\DeclareMathSymbol{\wp}{\mathord}{mtpsymbol}{"C3}
-\fi\fi\fi
-%%
-\ifmst@LGRgreek % internal names for subdued implementation (1.15c-1.15e)
-\let\mst@origAlpha\Alpha
-\let\mst@origBeta\Beta
-\let\mst@origGamma\Gamma
-\let\mst@origDelta\Delta
-\let\mst@origEpsilon\Epsilon
-\let\mst@origZeta\Zeta
-\let\mst@origEta\Eta
-\let\mst@origTheta\Theta
-\let\mst@origIota\Iota
-\let\mst@origKappa\Kappa
-\let\mst@origLambda\Lambda
-\let\mst@origMu\Mu
-\let\mst@origNu\Nu
-\let\mst@origXi\Xi
-\let\mst@origOmicron\Omicron
-\let\mst@origPi\Pi
-\let\mst@origRho\Rho
-\let\mst@origSigma\Sigma
-\let\mst@origTau\Tau
-\let\mst@origUpsilon\Upsilon
-\let\mst@origPhi\Phi
-\let\mst@origChi\Chi
-\let\mst@origPsi\Psi
-\let\mst@origOmega\Omega
-%
-\let\mst@origalpha\alpha
-\let\mst@origbeta\beta
-\let\mst@origgamma\gamma
-\let\mst@origdelta\delta
-\let\mst@origepsilon\epsilon
-\let\mst@origzeta\zeta
-\let\mst@origeta\eta
-\let\mst@origtheta\theta
-\let\mst@origiota\iota
-\let\mst@origkappa\kappa
-\let\mst@origlambda\lambda
-\let\mst@origmu\mu
-\let\mst@orignu\nu
-\let\mst@origxi\xi
-\let\mst@origomicron\omicron
-\let\mst@origpi\pi
-\let\mst@origrho\rho
-\let\mst@origvarsigma\varsigma
-\let\mst@origsigma\sigma
-\let\mst@origtau\tau
-\let\mst@origupsilon\upsilon
-\let\mst@origphi\phi
-\let\mst@origchi\chi
-\let\mst@origpsi\psi
-\let\mst@origomega\omega
-\let\mst@origDigamma\Digamma
-\let\mst@origdigamma\digamma
-%%
-\def\mst@restoregreek{%
-\let\Alpha\mst@origAlpha
-\let\Beta\mst@origBeta
-\let\Gamma\mst@origGamma
-\let\Delta\mst@origDelta
-\let\Epsilon\mst@origEpsilon
-\let\Zeta\mst@origZeta
-\let\Eta\mst@origEta
-\let\Theta\mst@origTheta
-\let\Iota\mst@origIota
-\let\Kappa\mst@origKappa
-\let\Lambda\mst@origLambda
-\let\Mu\mst@origMu
-\let\Nu\mst@origNu
-\let\Xi\mst@origXi
-\let\Omicron\mst@origOmicron
-\let\Pi\mst@origPi
-\let\Rho\mst@origRho
-\let\Sigma\mst@origSigma
-\let\Tau\mst@origTau
-\let\Upsilon\mst@origUpsilon
-\let\Phi\mst@origPhi
-\let\Chi\mst@origChi
-\let\Psi\mst@origPsi
-\let\Omega\mst@origOmega
-%
-\let\alpha\mst@origalpha
-\let\beta\mst@origbeta
-\let\gamma\mst@origgamma
-\let\delta\mst@origdelta
-\let\epsilon\mst@origepsilon
-\let\zeta\mst@origzeta
-\let\eta\mst@origeta
-\let\theta\mst@origtheta
-\let\iota\mst@origiota
-\let\kappa\mst@origkappa
-\let\lambda\mst@origlambda
-\let\mu\mst@origmu
-\let\nu\mst@orignu
-\let\xi\mst@origxi
-\let\omicron\mst@origomicron
-\let\pi\mst@origpi
-\let\rho\mst@origrho
-\let\varsigma\mst@origvarsigma
-\let\sigma\mst@origsigma
-\let\tau\mst@origtau
-\let\upsilon\mst@origupsilon
-\let\phi\mst@origphi
-\let\chi\mst@origchi
-\let\psi\mst@origpsi
-\let\omega\mst@origomega
-\let\Digamma\mst@origDigamma
-\let\digamma\mst@origdigamma
-}
-%%
-\def\mst@setuplgrgreek{%
-\let\Alpha\mst@Alpha
-\let\Beta\mst@Beta
-\let\Gamma\mst@Gamma
-\let\Delta\mst@Delta
-\let\Epsilon\mst@Epsilon
-\let\Zeta\mst@Zeta
-\let\Eta\mst@Eta
-\let\Theta\mst@Theta
-\let\Iota\mst@Iota
-\let\Kappa\mst@Kappa
-\let\Lambda\mst@Lambda
-\let\Mu\mst@Mu
-\let\Nu\mst@Nu
-\let\Xi\mst@Xi
-\let\Omicron\mst@Omicron
-\let\Pi\mst@Pi
-\let\Rho\mst@Rho
-\let\Sigma\mst@Sigma
-\let\Tau\mst@Tau
-\let\Upsilon\mst@Upsilon
-\let\Phi\mst@Phi
-\let\Chi\mst@Chi
-\let\Psi\mst@Psi
-\let\Omega\mst@Omega
-%
-\let\alpha\mst@alpha
-\let\beta\mst@beta
-\let\gamma\mst@gamma
-\let\delta\mst@delta
-\let\epsilon\mst@epsilon
-\let\zeta\mst@zeta
-\let\eta\mst@eta
-\let\theta\mst@theta
-\let\iota\mst@iota
-\let\kappa\mst@kappa
-\let\lambda\mst@lambda
-\let\mu\mst@mu
-\let\nu\mst@nu
-\let\xi\mst@xi
-\let\omicron\mst@omicron
-\let\pi\mst@pi
-\let\rho\mst@rho
-\let\varsigma\mst@varsigma
-\let\sigma\mst@sigma
-\let\tau\mst@tau
-\let\upsilon\mst@upsilon
-\let\phi\mst@phi
-\let\chi\mst@chi
-\let\psi\mst@psi
-\let\omega\mst@omega
-\let\Digamma\mst@Digamma
-\let\digamma\mst@digamma
-}
-%%
+ \ifmst@eulergreek
+ \DeclareMathSymbol{\mst@alpha} {\mathalpha}{mteulervm}{"0B}
+ \DeclareMathSymbol{\mst@beta} {\mathalpha}{mteulervm}{"0C}
+ \DeclareMathSymbol{\mst@gamma} {\mathalpha}{mteulervm}{"0D}
+ \DeclareMathSymbol{\mst@delta} {\mathalpha}{mteulervm}{"0E}
+ \DeclareMathSymbol{\mst@epsilon}{\mathalpha}{mteulervm}{"0F}
+ \DeclareMathSymbol{\mst@zeta} {\mathalpha}{mteulervm}{"10}
+ \DeclareMathSymbol{\mst@eta} {\mathalpha}{mteulervm}{"11}
+ \DeclareMathSymbol{\mst@theta} {\mathalpha}{mteulervm}{"12}
+ \DeclareMathSymbol{\mst@iota} {\mathalpha}{mteulervm}{"13}
+ \DeclareMathSymbol{\mst@kappa} {\mathalpha}{mteulervm}{"14}
+ \DeclareMathSymbol{\mst@lambda} {\mathalpha}{mteulervm}{"15}
+ \DeclareMathSymbol{\mst@mu} {\mathalpha}{mteulervm}{"16}
+ \DeclareMathSymbol{\mst@nu} {\mathalpha}{mteulervm}{"17}
+ \DeclareMathSymbol{\mst@xi} {\mathalpha}{mteulervm}{"18}
+ \DeclareMathSymbol{\mst@omicron}{\mathalpha}{mteulervm}{"6F}
+ \DeclareMathSymbol{\mst@pi} {\mathalpha}{mteulervm}{"19}
+ \DeclareMathSymbol{\mst@rho} {\mathalpha}{mteulervm}{"1A}
+ \DeclareMathSymbol{\mst@sigma} {\mathalpha}{mteulervm}{"1B}
+ \DeclareMathSymbol{\mst@tau} {\mathalpha}{mteulervm}{"1C}
+ \DeclareMathSymbol{\mst@upsilon}{\mathalpha}{mteulervm}{"1D}
+ \DeclareMathSymbol{\mst@phi} {\mathalpha}{mteulervm}{"1E}
+ \DeclareMathSymbol{\mst@chi} {\mathalpha}{mteulervm}{"1F}
+ \DeclareMathSymbol{\mst@psi} {\mathalpha}{mteulervm}{"20}
+ \DeclareMathSymbol{\mst@omega} {\mathalpha}{mteulervm}{"21}
+ \let\mst@varrho=\mst@rho
+ \let\mst@varsigma=\mst@sigma
+ \DeclareMathSymbol{\mst@varepsilon}{\mathalpha}{mteulervm}{"22}
+ \DeclareMathSymbol{\mst@vartheta}{\mathalpha}{mteulervm}{"23}
+ \DeclareMathSymbol{\mst@varpi} {\mathalpha}{mteulervm}{"24}
+ \DeclareMathSymbol{\mst@varphi} {\mathalpha}{mteulervm}{"27}
+ \DeclareMathSymbol{\mst@partial}{\mathalpha}{mteulervm}{"40}
+ \DeclareMathSymbol{\mst@wp}{\mathalpha}{mteulervm}{"7D}
+ \DeclareMathSymbol{\mst@ell}{\mathalpha}{mteulervm}{"60}
+ \else
+ \ifmst@symbolgreek
+ \DeclareMathSymbol{\mst@alpha}{\mathord}{mtpsymbol}{"61}
+ \DeclareMathSymbol{\mst@beta}{\mathord}{mtpsymbol}{"62}
+ \DeclareMathSymbol{\mst@gamma}{\mathord}{mtpsymbol}{"67}
+ \DeclareMathSymbol{\mst@delta}{\mathord}{mtpsymbol}{"64}
+ \DeclareMathSymbol{\mst@epsilon}{\mathord}{mtpsymbol}{"65}
+ \DeclareMathSymbol{\mst@zeta}{\mathord}{mtpsymbol}{"7A}
+ \DeclareMathSymbol{\mst@eta}{\mathord}{mtpsymbol}{"68}
+ \DeclareMathSymbol{\mst@theta}{\mathord}{mtpsymbol}{"71}
+ \DeclareMathSymbol{\mst@iota}{\mathord}{mtpsymbol}{"69}
+ \DeclareMathSymbol{\mst@kappa}{\mathord}{mtpsymbol}{"6B}
+ \DeclareMathSymbol{\mst@lambda}{\mathord}{mtpsymbol}{"6C}
+ \DeclareMathSymbol{\mst@mu}{\mathord}{mtpsymbol}{"6D}
+ \DeclareMathSymbol{\mst@nu}{\mathord}{mtpsymbol}{"6E}
+ \DeclareMathSymbol{\mst@xi}{\mathord}{mtpsymbol}{"78}
+ \DeclareMathSymbol{\mst@omicron}{\mathord}{mtpsymbol}{"6F}
+ \DeclareMathSymbol{\mst@pi}{\mathord}{mtpsymbol}{"70}
+ \DeclareMathSymbol{\mst@rho}{\mathord}{mtpsymbol}{"72}
+ \DeclareMathSymbol{\mst@sigma}{\mathord}{mtpsymbol}{"73}
+ \DeclareMathSymbol{\mst@tau}{\mathord}{mtpsymbol}{"74}
+ \DeclareMathSymbol{\mst@upsilon}{\mathord}{mtpsymbol}{"75}
+ \DeclareMathSymbol{\mst@phi}{\mathord}{mtpsymbol}{"66}
+ \DeclareMathSymbol{\mst@chi}{\mathord}{mtpsymbol}{"63}
+ \DeclareMathSymbol{\mst@psi}{\mathord}{mtpsymbol}{"79}
+ \DeclareMathSymbol{\mst@omega}{\mathord}{mtpsymbol}{"77}
+ \let\mst@varepsilon=\mst@epsilon
+ \DeclareMathSymbol{\mst@vartheta}{\mathord}{mtpsymbol}{"4A}
+ \DeclareMathSymbol{\mst@varpi}{\mathord}{mtpsymbol}{"76}
+ \let\mst@varrho=\mst@rho
+ \DeclareMathSymbol{\mst@varsigma}{\mathord}{mtpsymbol}{"56}
+ \DeclareMathSymbol{\mst@varphi}{\mathord}{mtpsymbol}{"6A}
+ \DeclareMathSymbol{\mst@partial}{\mathord}{mtpsymbol}{"B6}
+ \DeclareMathSymbol{\mst@wp}{\mathord}{mtpsymbol}{"C3}
+ \fi
+ \fi
+\fi
+\ifmst@LGRgreek
+% cf http://milde.users.sourceforge.net/LGR/lgrxenc.def.html
+% et greek.ldf du package babel
\DeclareMathSymbol{\mst@Alpha}{\mathalpha}{mtlgrfontupper}{65}
\DeclareMathSymbol{\mst@Beta}{\mathalpha}{mtlgrfontupper}{66}
\DeclareMathSymbol{\mst@Gamma}{\mathalpha}{mtlgrfontupper}{71}
@@ -6372,12 +6334,216 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\DeclareMathSymbol{\mst@omega}{\mathalpha}{mtlgrfontlower}{119}
\DeclareMathSymbol{\mst@digamma}{\mathalpha}{mtlgrfontlower}{147}
\DeclareMathSymbol{\mst@Digamma}{\mathalpha}{mtlgrfontlower}{195}
-% cf http://milde.users.sourceforge.net/LGR/lgrxenc.def.html
-% et greek.ldf du package babel
-\ifmst@subdued\else\mst@setuplgrgreek\fi
\fi
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\MTstandardgreek}
+% \begin{macro}{\MTcustomgreek}
+% \begin{macro}{\MTrecordstandardgreek}
+% 1.3d defines the commands |\MTstandardgreek| and |\MTcustomgreek|
+% for package and user. I leave |\MTrecordstandardgreek| undocumented
+% as I don't want to encourage people to load math packages after
+% \mst.
+% \begin{macrocode}
+\newcommand*{\MTstandardgreek}{}
+\newcommand*{\MTcustomgreek}{}
+\newcommand*{\MTrecordstandardgreek}{}
+\ifmst@customgreek
+ \renewcommand*{\MTrecordstandardgreek}{%
+ \let\mst@origAlpha\Alpha
+ \let\mst@origBeta\Beta
+ \let\mst@origGamma\Gamma
+ \let\mst@origDelta\Delta
+ \let\mst@origEpsilon\Epsilon
+ \let\mst@origZeta\Zeta
+ \let\mst@origEta\Eta
+ \let\mst@origTheta\Theta
+ \let\mst@origIota\Iota
+ \let\mst@origKappa\Kappa
+ \let\mst@origLambda\Lambda
+ \let\mst@origMu\Mu
+ \let\mst@origNu\Nu
+ \let\mst@origXi\Xi
+ \let\mst@origOmicron\Omicron
+ \let\mst@origPi\Pi
+ \let\mst@origRho\Rho
+ \let\mst@origSigma\Sigma
+ \let\mst@origTau\Tau
+ \let\mst@origUpsilon\Upsilon
+ \let\mst@origPhi\Phi
+ \let\mst@origChi\Chi
+ \let\mst@origPsi\Psi
+ \let\mst@origOmega\Omega
+%
+ \let\mst@origalpha\alpha
+ \let\mst@origbeta\beta
+ \let\mst@origgamma\gamma
+ \let\mst@origdelta\delta
+ \let\mst@origepsilon\epsilon
+ \let\mst@origvarepsilon\varepsilon
+ \let\mst@origzeta\zeta
+ \let\mst@origeta\eta
+ \let\mst@origtheta\theta
+ \let\mst@origvartheta\vartheta
+ \let\mst@origiota\iota
+ \let\mst@origkappa\kappa
+ \let\mst@origlambda\lambda
+ \let\mst@origmu\mu
+ \let\mst@orignu\nu
+ \let\mst@origxi\xi
+ \let\mst@origomicron\omicron
+ \let\mst@origpi\pi
+ \let\mst@origvarpi\varpi
+ \let\mst@origrho\rho
+ \let\mst@origvarrho\varrho
+ \let\mst@origsigma\sigma
+ \let\mst@origvarsigma\varsigma
+ \let\mst@origtau\tau
+ \let\mst@origupsilon\upsilon
+ \let\mst@origphi\phi
+ \let\mst@origvarphi\varphi
+ \let\mst@origchi\chi
+ \let\mst@origpsi\psi
+ \let\mst@origomega\omega
+ \let\mst@origDigamma\Digamma
+ \let\mst@origdigamma\digamma
+%
+ \let\mst@origpartial\partial
+ \let\mst@origwp\wp
+ \let\mst@origell\ell }
+\MTrecordstandardgreek
+\renewcommand*{\MTstandardgreek}{%
+ \let\Alpha\mst@origAlpha
+ \let\Beta\mst@origBeta
+ \let\Gamma\mst@origGamma
+ \let\Delta\mst@origDelta
+ \let\Epsilon\mst@origEpsilon
+ \let\Zeta\mst@origZeta
+ \let\Eta\mst@origEta
+ \let\Theta\mst@origTheta
+ \let\Iota\mst@origIota
+ \let\Kappa\mst@origKappa
+ \let\Lambda\mst@origLambda
+ \let\Mu\mst@origMu
+ \let\Nu\mst@origNu
+ \let\Xi\mst@origXi
+ \let\Omicron\mst@origOmicron
+ \let\Pi\mst@origPi
+ \let\Rho\mst@origRho
+ \let\Sigma\mst@origSigma
+ \let\Tau\mst@origTau
+ \let\Upsilon\mst@origUpsilon
+ \let\Phi\mst@origPhi
+ \let\Chi\mst@origChi
+ \let\Psi\mst@origPsi
+ \let\Omega\mst@origOmega
+%
+ \let\alpha\mst@origalpha
+ \let\beta\mst@origbeta
+ \let\gamma\mst@origgamma
+ \let\delta\mst@origdelta
+ \let\epsilon\mst@origepsilon
+ \let\varepsilon\mst@origvarepsilon
+ \let\zeta\mst@origzeta
+ \let\eta\mst@origeta
+ \let\theta\mst@origtheta
+ \let\vartheta\mst@origvartheta
+ \let\iota\mst@origiota
+ \let\kappa\mst@origkappa
+ \let\lambda\mst@origlambda
+ \let\mu\mst@origmu
+ \let\nu\mst@orignu
+ \let\xi\mst@origxi
+ \let\omicron\mst@origomicron
+ \let\pi\mst@origpi
+ \let\varpi\mst@origvarpi
+ \let\rho\mst@origrho
+ \let\varrho\mst@origvarrho
+ \let\sigma\mst@origsigma
+ \let\varsigma\mst@origvarsigma
+ \let\tau\mst@origtau
+ \let\upsilon\mst@origupsilon
+ \let\phi\mst@origphi
+ \let\varphi\mst@origvarphi
+ \let\chi\mst@origchi
+ \let\psi\mst@origpsi
+ \let\omega\mst@origomega
+ \let\Digamma\mst@origDigamma
+ \let\digamma\mst@origdigamma
+%
+ \let\partial\mst@origpartial
+ \let\wp\mst@origwp
+ \let\ell\mst@origell
+}
+\renewcommand*{\MTcustomgreek}{%
+ \let\Alpha\mst@Alpha
+ \let\Beta\mst@Beta
+ \let\Gamma\mst@Gamma
+ \let\Delta\mst@Delta
+ \let\Epsilon\mst@Epsilon
+ \let\Zeta\mst@Zeta
+ \let\Eta\mst@Eta
+ \let\Theta\mst@Theta
+ \let\Iota\mst@Iota
+ \let\Kappa\mst@Kappa
+ \let\Lambda\mst@Lambda
+ \let\Mu\mst@Mu
+ \let\Nu\mst@Nu
+ \let\Xi\mst@Xi
+ \let\Omicron\mst@Omicron
+ \let\Pi\mst@Pi
+ \let\Rho\mst@Rho
+ \let\Sigma\mst@Sigma
+ \let\Tau\mst@Tau
+ \let\Upsilon\mst@Upsilon
+ \let\Phi\mst@Phi
+ \let\Chi\mst@Chi
+ \let\Psi\mst@Psi
+ \let\Omega\mst@Omega
+%
+ \let\alpha\mst@alpha
+ \let\beta\mst@beta
+ \let\gamma\mst@gamma
+ \let\delta\mst@delta
+ \let\epsilon\mst@epsilon
+ \let\varepsilon\mst@varepsilon
+ \let\zeta\mst@zeta
+ \let\eta\mst@eta
+ \let\theta\mst@theta
+ \let\vartheta\mst@vartheta
+ \let\iota\mst@iota
+ \let\kappa\mst@kappa
+ \let\lambda\mst@lambda
+ \let\mu\mst@mu
+ \let\nu\mst@nu
+ \let\xi\mst@xi
+ \let\omicron\mst@omicron
+ \let\pi\mst@pi
+ \let\varpi\mst@varpi
+ \let\rho\mst@rho
+ \let\varrho\mst@varrho
+ \let\sigma\mst@sigma
+ \let\varsigma\mst@varsigma
+ \let\tau\mst@tau
+ \let\upsilon\mst@upsilon
+ \let\phi\mst@phi
+ \let\varphi\mst@varphi
+ \let\chi\mst@chi
+ \let\psi\mst@psi
+ \let\omega\mst@omega
+ \let\Digamma\mst@Digamma
+ \let\digamma\mst@digamma
+%
+ \let\partial\mst@partial
+ \let\wp\mst@wp
+ \let\ell\mst@ell
+}
+\fi
+\let\Mathastextstandardgreek\MTstandardgreek
+\let\Mathastextcustomgreek\MTcustomgreek
+\ifmst@subdued\else\MTcustomgreek\fi
+% \end{macrocode}
+% \end{macro}\end{macro}\end{macro}
% \begin{macro}{\inodot}
% \begin{macro}{\jnodot}
% In |1.0|, I had them of type |mathord|, here I choose |mathalpha|. If I
@@ -6530,7 +6696,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
Grave accent \` Left brace \{ Vertical bar \|
Right brace \} Tilde \~}
-\CheckSum{5116}
+\CheckSum{5184}
\makeatletter\check@checksum\makeatother
\Finale
%%
diff --git a/Master/texmf-dist/source/latex/mathastext/mathastext.ins b/Master/texmf-dist/source/latex/mathastext/mathastext.ins
index 1666c117e16..1c77a5b2148 100644
--- a/Master/texmf-dist/source/latex/mathastext/mathastext.ins
+++ b/Master/texmf-dist/source/latex/mathastext/mathastext.ins
@@ -1,8 +1,8 @@
-\def\MSTpkgdate {2013/12/14}
-\def\MSTpkgversion {1.3c}
+\def\MSTpkgdate {2014/05/23}
+\def\MSTpkgversion {1.3d}
%%----------------------------------------------------------------
-%% The mathastext package (version 1.3c of December 14, 2013)
-%% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol
+%% The mathastext package (version 1.3d of May 23, 2014)
+%% Copyright (C) 2011-2014 Jean-Francois Burnol
%% Examples of use of mathastext:
%% http://jf.burnol.free.fr/mathastext.html
%% http://jf.burnol.free.fr/showcase.html
diff --git a/Master/texmf-dist/tex/latex/mathastext/mathastext.sty b/Master/texmf-dist/tex/latex/mathastext/mathastext.sty
index 59f70128ab2..02b134fe25a 100644
--- a/Master/texmf-dist/tex/latex/mathastext/mathastext.sty
+++ b/Master/texmf-dist/tex/latex/mathastext/mathastext.sty
@@ -21,16 +21,16 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%%----------------------------------------------------------------
-%% The mathastext package (version 1.3c of December 14, 2013)
+%% The mathastext package (version 1.3d of May 23, 2014)
%% Use the text font in math mode (jfB)
-%% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol
+%% Copyright (C) 2011-2014 Jean-Francois Burnol
%% Examples of use of mathastext:
%% http://jf.burnol.free.fr/mathastext.html
%% http://jf.burnol.free.fr/showcase.html
%%----------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage {mathastext}
- [2013/12/14 v1.3c Use the text font in math mode (jfB)]
+ [2014/05/23 v1.3d Use the text font in math mode (jfB)]
\newif\ifmst@XeTeX
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname XeTeXinterchartoks\endcsname\relax
@@ -123,7 +123,9 @@
\newif\ifmst@symboldigits
\DeclareOption{symboldigits}{\mst@needsymboltrue\mst@symboldigitstrue}
\newif\ifmst@symbolgreek
- \DeclareOption{symbolgreek}{\mst@needsymboltrue\mst@symbolgreektrue}
+\newif\ifmst@customgreek %% new with 1.3d
+ \DeclareOption{symbolgreek}{\mst@needsymboltrue\mst@symbolgreektrue
+ \mst@customgreektrue }
\newif\ifmst@symbolre
\DeclareOption{symbolre}{\mst@needsymboltrue\mst@symbolretrue}
\newif\ifmst@symbolmisc
@@ -135,16 +137,19 @@
\newif\ifmst@eulerdigits
\DeclareOption{eulerdigits}{\mst@needeulertrue\mst@eulerdigitstrue}
\newif\ifmst@eulergreek
- \DeclareOption{eulergreek}{\mst@needeulertrue\mst@eulergreektrue}
+ \DeclareOption{eulergreek}{\mst@needeulertrue\mst@eulergreektrue
+ \mst@customgreektrue }
%%
\newif\ifmst@selfGreek
- \DeclareOption{selfGreek}{\mst@selfGreektrue}
+ \DeclareOption{selfGreek}{\mst@selfGreektrue\mst@customgreektrue}
\newif\ifmst@selfGreeks
- \DeclareOption{selfGreeks}{\mst@selfGreekstrue\mst@selfGreektrue}
+ \DeclareOption{selfGreeks}{\mst@selfGreekstrue\mst@selfGreektrue
+ \mst@customgreektrue }
\newif\ifmst@LGRgreek
- \DeclareOption{LGRgreek}{\mst@LGRgreektrue}
+ \DeclareOption{LGRgreek}{\mst@LGRgreektrue\mst@customgreektrue}
\newif\ifmst@LGRgreeks
- \DeclareOption{LGRgreeks}{\mst@LGRgreekstrue\mst@LGRgreektrue}
+ \DeclareOption{LGRgreeks}{\mst@LGRgreekstrue\mst@LGRgreektrue
+ \mst@customgreektrue}
%%
\def\mst@greek@select{0}
\newif\ifmst@itgreek
@@ -370,9 +375,12 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\mst@do@AZ\expandafter{\the\mst@do@AZ\mst@mathactivate#1#2#3}%
}
\ifmst@basic\else
+\AtBeginDocument {%
\@ifpackageloaded{amsmath}
- {\let\newmcodes@\relax} % brutal, but bye bye and don't come back.
- {}
+ {\@ifpackageloaded{lualatex-math}
+ {\@ifpackagelater{lualatex-math}{2013/08/03}{}{\let\newmcodes@\relax}}
+ {\let\newmcodes@\relax}}
+ {}}
\fi
\ifmst@subdued
\def\mst@reserved#1\getanddefine@fonts\symletters#2#3\@nil{%
@@ -414,28 +422,30 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\typeout{** ...done.}
}
\fi % fin de ce \ifmst@subdued
-\DeclareSymbolFont{mtoperatorfont}
- {\mst@enc}{\mst@fam}{\mst@ser}{\mst@opsh}
+\DeclareSymbolFont{mtoperatorfont}{\mst@enc}{\mst@fam}{\mst@ser}{\mst@opsh}
\newcommand*{\MTmathoperatorsobeymathxx}
{\def\operator@font{\mathgroup\ifnum\fam=\m@ne\symmtoperatorfont\else\fam\fi}}
\newcommand*{\MTmathoperatorsdonotobeymathxx}
{\def\operator@font{\mathgroup\symmtoperatorfont}}
\MTmathoperatorsobeymathxx
-\DeclareSymbolFont{mtletterfont}
- {\mst@enc}{\mst@fam}{\mst@ser}{\mst@ltsh}
+\DeclareSymbolFont{mtletterfont}{\mst@enc}{\mst@fam}{\mst@ser}{\mst@ltsh}
\let\mst@alph@omicron\mathnormal
\@ifpackageloaded{fourier}{\ifsloped\else\let\mst@alph@omicron\mathrm\fi}{}
\DeclareSymbolFontAlphabet{\Mathnormal}{mtletterfont}
\DeclareSymbolFontAlphabet{\Mathrm}{mtoperatorfont}
\ifmst@nonormalbold\else
\DeclareMathAlphabet{\mathnormalbold}{\mst@enc}{\mst@fam}{\mst@bold}{\mst@ltsh}
-\fi\ifmst@defaultbf\else
+\fi
+\ifmst@defaultbf\else
\DeclareMathAlphabet{\Mathbf}{\mst@enc}{\mst@fam}{\mst@bold}{\mst@opsh}
-\fi\ifmst@defaultit\else
+\fi
+\ifmst@defaultit\else
\DeclareMathAlphabet{\Mathit}{\mst@enc}{\mst@fam}{\mst@ser}{\itdefault}
-\fi\ifmst@defaultsf\else
+\fi
+\ifmst@defaultsf\else
\DeclareMathAlphabet{\Mathsf}{\mst@enc}{\sfdefault}{\mst@ser}{\mst@opsh}
-\fi\ifmst@defaulttt\else
+\fi
+\ifmst@defaulttt\else
\DeclareMathAlphabet{\Mathtt}{\mst@enc}{\ttdefault}{\mst@ser}{\mst@opsh}
\fi
\let\mst@original@normal\mathnormal
@@ -480,14 +490,11 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\mst@update@greeksh
\ifmst@LGRgreek
\DeclareFontEncoding{LGR}{}{}
- \DeclareSymbolFont{mtlgrfontlower}{LGR}
- {\mst@fam}{\mst@ser}{\mst@greek@lsh}
- \DeclareSymbolFont{mtlgrfontupper}{LGR}
- {\mst@fam}{\mst@ser}{\mst@greek@ush}
+ \DeclareSymbolFont{mtlgrfontlower}{LGR}{\mst@fam}{\mst@ser}{\mst@greek@lsh}
+ \DeclareSymbolFont{mtlgrfontupper}{LGR}{\mst@fam}{\mst@ser}{\mst@greek@ush}
\else
\ifmst@selfGreek
- \DeclareSymbolFont{mtselfGreekfont}{OT1}
- {\mst@fam}{\mst@ser}{\mst@greek@ush}
+ \DeclareSymbolFont{mtselfGreekfont}{OT1}{\mst@fam}{\mst@ser}{\mst@greek@ush}
\fi\fi
\ifmst@needeuler\typeout{** will use Euler font; command \string\MTEulerScale}
\DeclareSymbolFont{mteulervm}{U}{zeur}{m}{n}
@@ -846,23 +853,23 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\SetSymbolFont{mtlgrfontlower}{#2}{LGR}{#4}{#5}{\mst@greek@lsh@loc}%
\SetSymbolFont{mtlgrfontupper}{#2}{LGR}{#4}{#5}{\mst@greek@ush@loc}%
\typeout{** Greek letters (\mst@greek@lsh@loc/\mst@greek@ush@loc) will use
- LGR font #4}%
+ LGR font #4\ifmst@subdued ^^J** (in non subdued versions)\fi}%
\else
\ifmst@selfGreeks
\SetSymbolFont{mtselfGreekfont}{#2}{OT1}{#4}{#5}{\mst@greek@ush@loc}%
\typeout{** Capital Greek letters (\mst@greek@lsh@loc/\mst@greek@ush@loc)
- will use OT1 font #4}%
+ will use OT1 font #4\ifmst@subdued ^^J** (in non subdued versions)\fi}%
\else
\ifmst@LGRgreek
\SetSymbolFont{mtlgrfontlower}{#2}{LGR}{\mst@greekfont}{#5}{\mst@greek@lsh@loc}%
\SetSymbolFont{mtlgrfontupper}{#2}{LGR}{\mst@greekfont}{#5}{\mst@greek@ush@loc}%
\typeout{** Greek letters (\mst@greek@lsh@loc/\mst@greek@ush@loc) will use
- LGR font \mst@greekfont}%
+ LGR font \mst@greekfont\ifmst@subdued ^^J** (in non subdued versions)\fi}%
\else
\ifmst@selfGreek
\SetSymbolFont{mtselfGreekfont}{#2}{OT1}{\mst@greekfont}{#5}{\mst@greek@ush@loc}%
\typeout{** Capital Greek letters (\mst@greek@lsh@loc/\mst@greek@ush@loc)
- will use OT1 font \mst@greekfont}%
+ will use OT1 font \mst@greekfont\ifmst@subdued ^^J** (in non subdued versions)\fi}%
\fi
\fi
\fi
@@ -881,29 +888,16 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\else
\let\mst@tmp\mst@tmpa
\fi
- \usefont{\csname mst@encoding@\mst@tmp\endcsname}%
- {\csname mst@family@\mst@tmp\endcsname}%
- {\csname mst@series@\mst@tmp\endcsname}%
- {\csname mst@shape@\mst@tmp\endcsname}%
- \edef\mst@@encoding{\csname mst@encoding@\mst@tmp\endcsname}%
- \renewcommand{\encodingdefault}{\mst@@encoding}%
-%% some modifications for v1.15b
- \edef\mst@@famdefault{\csname mst@family@\mst@tmp\endcsname}%
- \renewcommand{\familydefault}{\mst@@famdefault}%
- \edef\mst@@series{\csname mst@series@\mst@tmp\endcsname}%
- \renewcommand{\mddefault}{\mst@@series}%
- \edef\mst@@shape{\csname mst@shape@\mst@tmp\endcsname}%
- \renewcommand{\shapedefault}{\mst@@shape}%
- \edef\mst@@boldvariant{\csname mst@boldvariant@\mst@tmp\endcsname}%
- \renewcommand{\bfdefault}{\mst@@boldvariant}%
- \edef\mst@@itdefault{\csname mst@itdefault@\mst@tmp\endcsname}%
- \renewcommand{\itdefault}{\mst@@itdefault}%
- \edef\mst@@rmdefault{\csname mst@rmdefault@\mst@tmp\endcsname}%
- \renewcommand{\rmdefault}{\mst@@rmdefault}%
- \edef\mst@@sfdefault{\csname mst@sfdefault@\mst@tmp\endcsname}%
- \renewcommand{\sfdefault}{\mst@@sfdefault}%
- \edef\mst@@ttdefault{\csname mst@ttdefault@\mst@tmp\endcsname}%
- \renewcommand{\ttdefault}{\mst@@ttdefault}%
+ \edef\encodingdefault {\csname mst@encoding@\mst@tmp\endcsname}%
+ \edef\familydefault {\csname mst@family@\mst@tmp\endcsname}%
+ \edef\seriesdefault {\csname mst@series@\mst@tmp\endcsname}%
+ \edef\shapedefault {\csname mst@shape@\mst@tmp\endcsname}%
+ \edef\bfdefault {\csname mst@boldvariant@\mst@tmp\endcsname}%
+ \edef\itdefault {\csname mst@itdefault@\mst@tmp\endcsname}%
+ \edef\rmdefault {\csname mst@rmdefault@\mst@tmp\endcsname}%
+ \edef\sfdefault {\csname mst@sfdefault@\mst@tmp\endcsname}%
+ \edef\ttdefault {\csname mst@ttdefault@\mst@tmp\endcsname}%
+ \usefont{\encodingdefault}{\familydefault}{\seriesdefault}{\shapedefault}%
\MTversion@@ {#2}%
}
\newcommand*\MTversion@@ [1]{%
@@ -932,6 +926,8 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
%% v1.15f: subdueing math alphabets in a simpler way than in 1.15e
%% v1.2b: subdueing the activation of characters in math mode
%% v1.2d: special treatment of the asterisk
+%% v1.3d: extended LGRgreek mechanism of activation/restoration of Greek to all
+%% cases
\MTmathoperatorsobeymathxx
\MTeasynonlettersobeymathxx
\ifmst@asterisk\let\mst@doasterisk\mst@@doasterisk\fi
@@ -939,27 +935,29 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\def\mst@tmpa{normal}%
\ifx\mst@tmp\mst@tmpa
\mst@restorealphabets
+ \MTstandardgreek
\MTmathoperatorsdonotobeymathxx
\MTnonlettersdonotobeymathxx
\MTeasynonlettersdonotobeymathxx
\MTmathstandardletters
\ifmst@asterisk\let\mst@doasterisk\relax\fi
- \ifmst@LGRgreek\mst@restoregreek\fi
\else
\def\mst@tmpa{bold}%
\ifx\mst@tmp\mst@tmpa
\mst@restorealphabets
+ \MTstandardgreek
\MTmathoperatorsdonotobeymathxx
\MTnonlettersdonotobeymathxx
\MTeasynonlettersdonotobeymathxx
\MTmathstandardletters
\ifmst@asterisk\let\mst@doasterisk\relax\fi
- \ifmst@LGRgreek\mst@restoregreek\fi
\else
\mst@setalphabets
- \ifmst@LGRgreek\mst@setuplgrgreek\fi
+ \MTcustomgreek
\fi
\fi
+ \else
+ \MTcustomgreek % new with 1.3d
\fi
}
\let\MathastextVersion\MTversion
@@ -968,12 +966,16 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\let\mathastextversion\MTversion
\Mathastext
\ifmst@eulergreek
- \typeout{** Greek letters will use the Euler font. Use^^J%
- ** \protect\MathastextEulerScale{<factor>} to scale the font.}%
+ \typeout{** Greek letters will use the Euler font. Use \protect\MathastextEulerScale{<factor>} to scale the
+ font.}%
+ \ifmst@subdued{\typeout{** (subdued mode: normal and bold math
+ version with default Greek letters.)}}\fi
\else
\ifmst@symbolgreek
\typeout{** Greek letters will use the PostScript Symbol font. Use^^J%
** \protect\MathastextSymbolScale{<factor>} to scale the font.}%
+ \ifmst@subdued{\typeout{** (subdued mode: normal and bold math
+ version with default Greek letters.)}}\fi
\fi\fi
\def\mst@DeclareMathLetter #1{%
\DeclareMathSymbol {#1}{\mathalpha}{mtletterfont}{`#1}%
@@ -1266,8 +1268,6 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\else
\DeclareMathDelimiter{<}{\mathopen}{\mst@font@tbu}{"3C}{largesymbols}{"0A}
\DeclareMathDelimiter{>}{\mathclose}{\mst@font@tbu}{"3E}{largesymbols}{"0B}
- \expandafter\DeclareMathDelimiter\@backslashchar
- {\mathord}{mtoperatorfont}{"5C}{largesymbols}{"0F}
\DeclareMathDelimiter{\backslash}
{\mathord}{mtoperatorfont}{"5C}{largesymbols}{"0F}
\DeclareMathDelimiter{\mst@varfam@backslash}
@@ -1460,302 +1460,142 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\mst@goaheadtrue
\ifmst@selfGreek
\def\mst@font@tbu{mtselfGreekfont}
- \else
-\ifmst@eulergreek
- \def\mst@font@tbu{mteulervm}
- \else
-\ifmst@symbolgreek
- \def\mst@font@tbu{mtpsymbol}
- \let\mst@mathord\mathord
- \else
-\ifmst@LGRgreek
- \mst@goaheadfalse
- \else
- \mst@goaheadfalse
- \ifx\omicron\undefined
- \newcommand*{\omicron}{\mst@alph@omicron{o}}
- \fi
-\fi\fi\fi\fi
+\else
+ \ifmst@eulergreek
+ \def\mst@font@tbu{mteulervm}
+ \else
+ \ifmst@symbolgreek
+ \def\mst@font@tbu{mtpsymbol}
+ \let\mst@mathord\mathord
+ \else
+ \ifmst@LGRgreek
+ \mst@goaheadfalse
+ \else
+ \mst@goaheadfalse
+ \def\mst@omicron {\mst@alph@omicron{o}}
+ \fi
+ \fi
+ \fi
+\fi
\ifmst@goahead
-\DeclareMathSymbol{\Alpha}{\mst@mathord}{\mst@font@tbu}{"41}
-\DeclareMathSymbol{\Beta}{\mst@mathord}{\mst@font@tbu}{"42}
-\DeclareMathSymbol{\Epsilon}{\mst@mathord}{\mst@font@tbu}{"45}
-\DeclareMathSymbol{\Zeta}{\mst@mathord}{\mst@font@tbu}{"5A}
-\DeclareMathSymbol{\Eta}{\mst@mathord}{\mst@font@tbu}{"48}
-\DeclareMathSymbol{\Iota}{\mst@mathord}{\mst@font@tbu}{"49}
-\DeclareMathSymbol{\Kappa}{\mst@mathord}{\mst@font@tbu}{"4B}
-\DeclareMathSymbol{\Mu}{\mst@mathord}{\mst@font@tbu}{"4D}
-\DeclareMathSymbol{\Nu}{\mst@mathord}{\mst@font@tbu}{"4E}
-\DeclareMathSymbol{\Omicron}{\mst@mathord}{\mst@font@tbu}{"4F}
-\DeclareMathSymbol{\Rho}{\mst@mathord}{\mst@font@tbu}{"50}
-\DeclareMathSymbol{\Tau}{\mst@mathord}{\mst@font@tbu}{"54}
-\DeclareMathSymbol{\Chi}{\mst@mathord}{\mst@font@tbu}{"58}
-\ifx\mst@mathord\mathord
+ \DeclareMathSymbol{\mst@Alpha}{\mst@mathord}{\mst@font@tbu}{"41}
+ \DeclareMathSymbol{\mst@Beta}{\mst@mathord}{\mst@font@tbu}{"42}
+ \DeclareMathSymbol{\mst@Epsilon}{\mst@mathord}{\mst@font@tbu}{"45}
+ \DeclareMathSymbol{\mst@Zeta}{\mst@mathord}{\mst@font@tbu}{"5A}
+ \DeclareMathSymbol{\mst@Eta}{\mst@mathord}{\mst@font@tbu}{"48}
+ \DeclareMathSymbol{\mst@Iota}{\mst@mathord}{\mst@font@tbu}{"49}
+ \DeclareMathSymbol{\mst@Kappa}{\mst@mathord}{\mst@font@tbu}{"4B}
+ \DeclareMathSymbol{\mst@Mu}{\mst@mathord}{\mst@font@tbu}{"4D}
+ \DeclareMathSymbol{\mst@Nu}{\mst@mathord}{\mst@font@tbu}{"4E}
+ \DeclareMathSymbol{\mst@Omicron}{\mst@mathord}{\mst@font@tbu}{"4F}
+ \DeclareMathSymbol{\mst@Rho}{\mst@mathord}{\mst@font@tbu}{"50}
+ \DeclareMathSymbol{\mst@Tau}{\mst@mathord}{\mst@font@tbu}{"54}
+ \DeclareMathSymbol{\mst@Chi}{\mst@mathord}{\mst@font@tbu}{"58}
+ \ifx\mst@mathord\mathord
%% attention le P de Symbol est un \Pi pas un \Rho
-\DeclareMathSymbol{\Rho}{\mathord}{mtpsymbol}{"52}
+ \DeclareMathSymbol{\mst@Rho}{\mathord}{mtpsymbol}{"52}
%% attention le X de Symbol est un \Xi pas un \Chi
-\DeclareMathSymbol{\Chi}{\mathord}{mtpsymbol}{"43}
+ \DeclareMathSymbol{\mst@Chi}{\mathord}{mtpsymbol}{"43}
%% attention le F de Symbol est un \Phi. Il n'y a pas de \Digamma
-\DeclareMathSymbol{\Gamma}{\mathord}{mtpsymbol}{"47}
-\DeclareMathSymbol{\Delta}{\mathord}{mtpsymbol}{"44}
-\DeclareMathSymbol{\Theta}{\mathord}{mtpsymbol}{"51}
-\DeclareMathSymbol{\Lambda}{\mathord}{mtpsymbol}{"4C}
-\DeclareMathSymbol{\Xi}{\mathord}{mtpsymbol}{"58}
-\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}
-\else
-\DeclareMathSymbol{\Digamma}{\mathalpha}{\mst@font@tbu}{"46}
-\DeclareMathSymbol\Gamma {\mathalpha}{\mst@font@tbu}{"00}
-\DeclareMathSymbol\Delta {\mathalpha}{\mst@font@tbu}{"01}
-\DeclareMathSymbol\Theta {\mathalpha}{\mst@font@tbu}{"02}
-\DeclareMathSymbol\Lambda {\mathalpha}{\mst@font@tbu}{"03}
-\DeclareMathSymbol\Xi {\mathalpha}{\mst@font@tbu}{"04}
-\DeclareMathSymbol\Pi {\mathalpha}{\mst@font@tbu}{"05}
-\DeclareMathSymbol\Sigma {\mathalpha}{\mst@font@tbu}{"06}
-\DeclareMathSymbol\Upsilon {\mathalpha}{\mst@font@tbu}{"07}
-\DeclareMathSymbol\Phi {\mathalpha}{\mst@font@tbu}{"08}
-\DeclareMathSymbol\Psi {\mathalpha}{\mst@font@tbu}{"09}
-\DeclareMathSymbol\Omega {\mathalpha}{\mst@font@tbu}{"0A}
-\fi
-\fi
+ \DeclareMathSymbol{\mst@Gamma}{\mathord}{mtpsymbol}{"47}
+ \DeclareMathSymbol{\mst@Delta}{\mathord}{mtpsymbol}{"44}
+ \DeclareMathSymbol{\mst@Theta}{\mathord}{mtpsymbol}{"51}
+ \DeclareMathSymbol{\mst@Lambda}{\mathord}{mtpsymbol}{"4C}
+ \DeclareMathSymbol{\mst@Xi}{\mathord}{mtpsymbol}{"58}
+ \DeclareMathSymbol{\mst@Pi}{\mathord}{mtpsymbol}{"50}
+ \DeclareMathSymbol{\mst@Sigma}{\mathord}{mtpsymbol}{"53}
+ \DeclareMathSymbol{\mst@Upsilon}{\mathord}{mtpsymbol}{"A1}
+ \DeclareMathSymbol{\mst@Phi}{\mathord}{mtpsymbol}{"46}
+ \DeclareMathSymbol{\mst@Psi}{\mathord}{mtpsymbol}{"59}
+ \DeclareMathSymbol{\mst@Omega}{\mathord}{mtpsymbol}{"57}
+ \else % de \mst@mathord=\mathord
+ \DeclareMathSymbol\mst@Digamma {\mathalpha}{\mst@font@tbu}{"46}
+ \DeclareMathSymbol\mst@Gamma {\mathalpha}{\mst@font@tbu}{"00}
+ \DeclareMathSymbol\mst@Delta {\mathalpha}{\mst@font@tbu}{"01}
+ \DeclareMathSymbol\mst@Theta {\mathalpha}{\mst@font@tbu}{"02}
+ \DeclareMathSymbol\mst@Lambda {\mathalpha}{\mst@font@tbu}{"03}
+ \DeclareMathSymbol\mst@Xi {\mathalpha}{\mst@font@tbu}{"04}
+ \DeclareMathSymbol\mst@Pi {\mathalpha}{\mst@font@tbu}{"05}
+ \DeclareMathSymbol\mst@Sigma {\mathalpha}{\mst@font@tbu}{"06}
+ \DeclareMathSymbol\mst@Upsilon {\mathalpha}{\mst@font@tbu}{"07}
+ \DeclareMathSymbol\mst@Phi {\mathalpha}{\mst@font@tbu}{"08}
+ \DeclareMathSymbol\mst@Psi {\mathalpha}{\mst@font@tbu}{"09}
+ \DeclareMathSymbol\mst@Omega {\mathalpha}{\mst@font@tbu}{"0A}
+ \fi % de \mst@mathord=\mathord
+\fi % fin de goahead
\ifmst@goahead
-\ifmst@eulergreek
-\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}
-\let\omicron\undefined
-\DeclareMathSymbol{\omicron}{\mathalpha}{mteulervm}{"6F}
-\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} {\mathalpha}{mteulervm}{"27}
-\DeclareMathSymbol{\partial}{\mathalpha}{mteulervm}{"40}
-\DeclareMathSymbol{\wp}{\mathalpha}{mteulervm}{"7D}
-\DeclareMathSymbol{\ell}{\mathalpha}{mteulervm}{"60}
-\else
-\ifmst@symbolgreek
-\DeclareMathSymbol{\alpha}{\mathord}{mtpsymbol}{"61}
-\DeclareMathSymbol{\beta}{\mathord}{mtpsymbol}{"62}
-\DeclareMathSymbol{\gamma}{\mathord}{mtpsymbol}{"67}
-\DeclareMathSymbol{\delta}{\mathord}{mtpsymbol}{"64}
-\DeclareMathSymbol{\epsilon}{\mathord}{mtpsymbol}{"65}
-\DeclareMathSymbol{\zeta}{\mathord}{mtpsymbol}{"7A}
-\DeclareMathSymbol{\eta}{\mathord}{mtpsymbol}{"68}
-\DeclareMathSymbol{\theta}{\mathord}{mtpsymbol}{"71}
-\DeclareMathSymbol{\iota}{\mathord}{mtpsymbol}{"69}
-\DeclareMathSymbol{\kappa}{\mathord}{mtpsymbol}{"6B}
-\DeclareMathSymbol{\lambda}{\mathord}{mtpsymbol}{"6C}
-\DeclareMathSymbol{\mu}{\mathord}{mtpsymbol}{"6D}
-\DeclareMathSymbol{\nu}{\mathord}{mtpsymbol}{"6E}
-\DeclareMathSymbol{\xi}{\mathord}{mtpsymbol}{"78}
-\let\omicron\undefined
-\DeclareMathSymbol{\omicron}{\mathord}{mtpsymbol}{"6F}
-\DeclareMathSymbol{\pi}{\mathord}{mtpsymbol}{"70}
-\DeclareMathSymbol{\rho}{\mathord}{mtpsymbol}{"72}
-\DeclareMathSymbol{\sigma}{\mathord}{mtpsymbol}{"73}
-\DeclareMathSymbol{\tau}{\mathord}{mtpsymbol}{"74}
-\DeclareMathSymbol{\upsilon}{\mathord}{mtpsymbol}{"75}
-\DeclareMathSymbol{\phi}{\mathord}{mtpsymbol}{"66}
-\DeclareMathSymbol{\chi}{\mathord}{mtpsymbol}{"63}
-\DeclareMathSymbol{\psi}{\mathord}{mtpsymbol}{"79}
-\DeclareMathSymbol{\omega}{\mathord}{mtpsymbol}{"77}
-\let\varepsilon=\epsilon
-\DeclareMathSymbol{\vartheta}{\mathord}{mtpsymbol}{"4A}
-\DeclareMathSymbol{\varpi}{\mathord}{mtpsymbol}{"76}
-\let\varrho=\rho
-\DeclareMathSymbol{\varsigma}{\mathord}{mtpsymbol}{"56}
-\DeclareMathSymbol{\varphi}{\mathord}{mtpsymbol}{"6A}
-\DeclareMathSymbol{\partial}{\mathord}{mtpsymbol}{"B6}
-\DeclareMathSymbol{\wp}{\mathord}{mtpsymbol}{"C3}
-\fi\fi\fi
-%%
-\ifmst@LGRgreek % internal names for subdued implementation (1.15c-1.15e)
-\let\mst@origAlpha\Alpha
-\let\mst@origBeta\Beta
-\let\mst@origGamma\Gamma
-\let\mst@origDelta\Delta
-\let\mst@origEpsilon\Epsilon
-\let\mst@origZeta\Zeta
-\let\mst@origEta\Eta
-\let\mst@origTheta\Theta
-\let\mst@origIota\Iota
-\let\mst@origKappa\Kappa
-\let\mst@origLambda\Lambda
-\let\mst@origMu\Mu
-\let\mst@origNu\Nu
-\let\mst@origXi\Xi
-\let\mst@origOmicron\Omicron
-\let\mst@origPi\Pi
-\let\mst@origRho\Rho
-\let\mst@origSigma\Sigma
-\let\mst@origTau\Tau
-\let\mst@origUpsilon\Upsilon
-\let\mst@origPhi\Phi
-\let\mst@origChi\Chi
-\let\mst@origPsi\Psi
-\let\mst@origOmega\Omega
-\let\mst@origalpha\alpha
-\let\mst@origbeta\beta
-\let\mst@origgamma\gamma
-\let\mst@origdelta\delta
-\let\mst@origepsilon\epsilon
-\let\mst@origzeta\zeta
-\let\mst@origeta\eta
-\let\mst@origtheta\theta
-\let\mst@origiota\iota
-\let\mst@origkappa\kappa
-\let\mst@origlambda\lambda
-\let\mst@origmu\mu
-\let\mst@orignu\nu
-\let\mst@origxi\xi
-\let\mst@origomicron\omicron
-\let\mst@origpi\pi
-\let\mst@origrho\rho
-\let\mst@origvarsigma\varsigma
-\let\mst@origsigma\sigma
-\let\mst@origtau\tau
-\let\mst@origupsilon\upsilon
-\let\mst@origphi\phi
-\let\mst@origchi\chi
-\let\mst@origpsi\psi
-\let\mst@origomega\omega
-\let\mst@origDigamma\Digamma
-\let\mst@origdigamma\digamma
-%%
-\def\mst@restoregreek{%
-\let\Alpha\mst@origAlpha
-\let\Beta\mst@origBeta
-\let\Gamma\mst@origGamma
-\let\Delta\mst@origDelta
-\let\Epsilon\mst@origEpsilon
-\let\Zeta\mst@origZeta
-\let\Eta\mst@origEta
-\let\Theta\mst@origTheta
-\let\Iota\mst@origIota
-\let\Kappa\mst@origKappa
-\let\Lambda\mst@origLambda
-\let\Mu\mst@origMu
-\let\Nu\mst@origNu
-\let\Xi\mst@origXi
-\let\Omicron\mst@origOmicron
-\let\Pi\mst@origPi
-\let\Rho\mst@origRho
-\let\Sigma\mst@origSigma
-\let\Tau\mst@origTau
-\let\Upsilon\mst@origUpsilon
-\let\Phi\mst@origPhi
-\let\Chi\mst@origChi
-\let\Psi\mst@origPsi
-\let\Omega\mst@origOmega
-\let\alpha\mst@origalpha
-\let\beta\mst@origbeta
-\let\gamma\mst@origgamma
-\let\delta\mst@origdelta
-\let\epsilon\mst@origepsilon
-\let\zeta\mst@origzeta
-\let\eta\mst@origeta
-\let\theta\mst@origtheta
-\let\iota\mst@origiota
-\let\kappa\mst@origkappa
-\let\lambda\mst@origlambda
-\let\mu\mst@origmu
-\let\nu\mst@orignu
-\let\xi\mst@origxi
-\let\omicron\mst@origomicron
-\let\pi\mst@origpi
-\let\rho\mst@origrho
-\let\varsigma\mst@origvarsigma
-\let\sigma\mst@origsigma
-\let\tau\mst@origtau
-\let\upsilon\mst@origupsilon
-\let\phi\mst@origphi
-\let\chi\mst@origchi
-\let\psi\mst@origpsi
-\let\omega\mst@origomega
-\let\Digamma\mst@origDigamma
-\let\digamma\mst@origdigamma
-}
-%%
-\def\mst@setuplgrgreek{%
-\let\Alpha\mst@Alpha
-\let\Beta\mst@Beta
-\let\Gamma\mst@Gamma
-\let\Delta\mst@Delta
-\let\Epsilon\mst@Epsilon
-\let\Zeta\mst@Zeta
-\let\Eta\mst@Eta
-\let\Theta\mst@Theta
-\let\Iota\mst@Iota
-\let\Kappa\mst@Kappa
-\let\Lambda\mst@Lambda
-\let\Mu\mst@Mu
-\let\Nu\mst@Nu
-\let\Xi\mst@Xi
-\let\Omicron\mst@Omicron
-\let\Pi\mst@Pi
-\let\Rho\mst@Rho
-\let\Sigma\mst@Sigma
-\let\Tau\mst@Tau
-\let\Upsilon\mst@Upsilon
-\let\Phi\mst@Phi
-\let\Chi\mst@Chi
-\let\Psi\mst@Psi
-\let\Omega\mst@Omega
-\let\alpha\mst@alpha
-\let\beta\mst@beta
-\let\gamma\mst@gamma
-\let\delta\mst@delta
-\let\epsilon\mst@epsilon
-\let\zeta\mst@zeta
-\let\eta\mst@eta
-\let\theta\mst@theta
-\let\iota\mst@iota
-\let\kappa\mst@kappa
-\let\lambda\mst@lambda
-\let\mu\mst@mu
-\let\nu\mst@nu
-\let\xi\mst@xi
-\let\omicron\mst@omicron
-\let\pi\mst@pi
-\let\rho\mst@rho
-\let\varsigma\mst@varsigma
-\let\sigma\mst@sigma
-\let\tau\mst@tau
-\let\upsilon\mst@upsilon
-\let\phi\mst@phi
-\let\chi\mst@chi
-\let\psi\mst@psi
-\let\omega\mst@omega
-\let\Digamma\mst@Digamma
-\let\digamma\mst@digamma
-}
-%%
+ \ifmst@eulergreek
+ \DeclareMathSymbol{\mst@alpha} {\mathalpha}{mteulervm}{"0B}
+ \DeclareMathSymbol{\mst@beta} {\mathalpha}{mteulervm}{"0C}
+ \DeclareMathSymbol{\mst@gamma} {\mathalpha}{mteulervm}{"0D}
+ \DeclareMathSymbol{\mst@delta} {\mathalpha}{mteulervm}{"0E}
+ \DeclareMathSymbol{\mst@epsilon}{\mathalpha}{mteulervm}{"0F}
+ \DeclareMathSymbol{\mst@zeta} {\mathalpha}{mteulervm}{"10}
+ \DeclareMathSymbol{\mst@eta} {\mathalpha}{mteulervm}{"11}
+ \DeclareMathSymbol{\mst@theta} {\mathalpha}{mteulervm}{"12}
+ \DeclareMathSymbol{\mst@iota} {\mathalpha}{mteulervm}{"13}
+ \DeclareMathSymbol{\mst@kappa} {\mathalpha}{mteulervm}{"14}
+ \DeclareMathSymbol{\mst@lambda} {\mathalpha}{mteulervm}{"15}
+ \DeclareMathSymbol{\mst@mu} {\mathalpha}{mteulervm}{"16}
+ \DeclareMathSymbol{\mst@nu} {\mathalpha}{mteulervm}{"17}
+ \DeclareMathSymbol{\mst@xi} {\mathalpha}{mteulervm}{"18}
+ \DeclareMathSymbol{\mst@omicron}{\mathalpha}{mteulervm}{"6F}
+ \DeclareMathSymbol{\mst@pi} {\mathalpha}{mteulervm}{"19}
+ \DeclareMathSymbol{\mst@rho} {\mathalpha}{mteulervm}{"1A}
+ \DeclareMathSymbol{\mst@sigma} {\mathalpha}{mteulervm}{"1B}
+ \DeclareMathSymbol{\mst@tau} {\mathalpha}{mteulervm}{"1C}
+ \DeclareMathSymbol{\mst@upsilon}{\mathalpha}{mteulervm}{"1D}
+ \DeclareMathSymbol{\mst@phi} {\mathalpha}{mteulervm}{"1E}
+ \DeclareMathSymbol{\mst@chi} {\mathalpha}{mteulervm}{"1F}
+ \DeclareMathSymbol{\mst@psi} {\mathalpha}{mteulervm}{"20}
+ \DeclareMathSymbol{\mst@omega} {\mathalpha}{mteulervm}{"21}
+ \let\mst@varrho=\mst@rho
+ \let\mst@varsigma=\mst@sigma
+ \DeclareMathSymbol{\mst@varepsilon}{\mathalpha}{mteulervm}{"22}
+ \DeclareMathSymbol{\mst@vartheta}{\mathalpha}{mteulervm}{"23}
+ \DeclareMathSymbol{\mst@varpi} {\mathalpha}{mteulervm}{"24}
+ \DeclareMathSymbol{\mst@varphi} {\mathalpha}{mteulervm}{"27}
+ \DeclareMathSymbol{\mst@partial}{\mathalpha}{mteulervm}{"40}
+ \DeclareMathSymbol{\mst@wp}{\mathalpha}{mteulervm}{"7D}
+ \DeclareMathSymbol{\mst@ell}{\mathalpha}{mteulervm}{"60}
+ \else
+ \ifmst@symbolgreek
+ \DeclareMathSymbol{\mst@alpha}{\mathord}{mtpsymbol}{"61}
+ \DeclareMathSymbol{\mst@beta}{\mathord}{mtpsymbol}{"62}
+ \DeclareMathSymbol{\mst@gamma}{\mathord}{mtpsymbol}{"67}
+ \DeclareMathSymbol{\mst@delta}{\mathord}{mtpsymbol}{"64}
+ \DeclareMathSymbol{\mst@epsilon}{\mathord}{mtpsymbol}{"65}
+ \DeclareMathSymbol{\mst@zeta}{\mathord}{mtpsymbol}{"7A}
+ \DeclareMathSymbol{\mst@eta}{\mathord}{mtpsymbol}{"68}
+ \DeclareMathSymbol{\mst@theta}{\mathord}{mtpsymbol}{"71}
+ \DeclareMathSymbol{\mst@iota}{\mathord}{mtpsymbol}{"69}
+ \DeclareMathSymbol{\mst@kappa}{\mathord}{mtpsymbol}{"6B}
+ \DeclareMathSymbol{\mst@lambda}{\mathord}{mtpsymbol}{"6C}
+ \DeclareMathSymbol{\mst@mu}{\mathord}{mtpsymbol}{"6D}
+ \DeclareMathSymbol{\mst@nu}{\mathord}{mtpsymbol}{"6E}
+ \DeclareMathSymbol{\mst@xi}{\mathord}{mtpsymbol}{"78}
+ \DeclareMathSymbol{\mst@omicron}{\mathord}{mtpsymbol}{"6F}
+ \DeclareMathSymbol{\mst@pi}{\mathord}{mtpsymbol}{"70}
+ \DeclareMathSymbol{\mst@rho}{\mathord}{mtpsymbol}{"72}
+ \DeclareMathSymbol{\mst@sigma}{\mathord}{mtpsymbol}{"73}
+ \DeclareMathSymbol{\mst@tau}{\mathord}{mtpsymbol}{"74}
+ \DeclareMathSymbol{\mst@upsilon}{\mathord}{mtpsymbol}{"75}
+ \DeclareMathSymbol{\mst@phi}{\mathord}{mtpsymbol}{"66}
+ \DeclareMathSymbol{\mst@chi}{\mathord}{mtpsymbol}{"63}
+ \DeclareMathSymbol{\mst@psi}{\mathord}{mtpsymbol}{"79}
+ \DeclareMathSymbol{\mst@omega}{\mathord}{mtpsymbol}{"77}
+ \let\mst@varepsilon=\mst@epsilon
+ \DeclareMathSymbol{\mst@vartheta}{\mathord}{mtpsymbol}{"4A}
+ \DeclareMathSymbol{\mst@varpi}{\mathord}{mtpsymbol}{"76}
+ \let\mst@varrho=\mst@rho
+ \DeclareMathSymbol{\mst@varsigma}{\mathord}{mtpsymbol}{"56}
+ \DeclareMathSymbol{\mst@varphi}{\mathord}{mtpsymbol}{"6A}
+ \DeclareMathSymbol{\mst@partial}{\mathord}{mtpsymbol}{"B6}
+ \DeclareMathSymbol{\mst@wp}{\mathord}{mtpsymbol}{"C3}
+ \fi
+ \fi
+\fi
+\ifmst@LGRgreek
\DeclareMathSymbol{\mst@Alpha}{\mathalpha}{mtlgrfontupper}{65}
\DeclareMathSymbol{\mst@Beta}{\mathalpha}{mtlgrfontupper}{66}
\DeclareMathSymbol{\mst@Gamma}{\mathalpha}{mtlgrfontupper}{71}
@@ -1807,8 +1647,198 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
\DeclareMathSymbol{\mst@omega}{\mathalpha}{mtlgrfontlower}{119}
\DeclareMathSymbol{\mst@digamma}{\mathalpha}{mtlgrfontlower}{147}
\DeclareMathSymbol{\mst@Digamma}{\mathalpha}{mtlgrfontlower}{195}
-\ifmst@subdued\else\mst@setuplgrgreek\fi
\fi
+\newcommand*{\MTstandardgreek}{}
+\newcommand*{\MTcustomgreek}{}
+\newcommand*{\MTrecordstandardgreek}{}
+\ifmst@customgreek
+ \renewcommand*{\MTrecordstandardgreek}{%
+ \let\mst@origAlpha\Alpha
+ \let\mst@origBeta\Beta
+ \let\mst@origGamma\Gamma
+ \let\mst@origDelta\Delta
+ \let\mst@origEpsilon\Epsilon
+ \let\mst@origZeta\Zeta
+ \let\mst@origEta\Eta
+ \let\mst@origTheta\Theta
+ \let\mst@origIota\Iota
+ \let\mst@origKappa\Kappa
+ \let\mst@origLambda\Lambda
+ \let\mst@origMu\Mu
+ \let\mst@origNu\Nu
+ \let\mst@origXi\Xi
+ \let\mst@origOmicron\Omicron
+ \let\mst@origPi\Pi
+ \let\mst@origRho\Rho
+ \let\mst@origSigma\Sigma
+ \let\mst@origTau\Tau
+ \let\mst@origUpsilon\Upsilon
+ \let\mst@origPhi\Phi
+ \let\mst@origChi\Chi
+ \let\mst@origPsi\Psi
+ \let\mst@origOmega\Omega
+ \let\mst@origalpha\alpha
+ \let\mst@origbeta\beta
+ \let\mst@origgamma\gamma
+ \let\mst@origdelta\delta
+ \let\mst@origepsilon\epsilon
+ \let\mst@origvarepsilon\varepsilon
+ \let\mst@origzeta\zeta
+ \let\mst@origeta\eta
+ \let\mst@origtheta\theta
+ \let\mst@origvartheta\vartheta
+ \let\mst@origiota\iota
+ \let\mst@origkappa\kappa
+ \let\mst@origlambda\lambda
+ \let\mst@origmu\mu
+ \let\mst@orignu\nu
+ \let\mst@origxi\xi
+ \let\mst@origomicron\omicron
+ \let\mst@origpi\pi
+ \let\mst@origvarpi\varpi
+ \let\mst@origrho\rho
+ \let\mst@origvarrho\varrho
+ \let\mst@origsigma\sigma
+ \let\mst@origvarsigma\varsigma
+ \let\mst@origtau\tau
+ \let\mst@origupsilon\upsilon
+ \let\mst@origphi\phi
+ \let\mst@origvarphi\varphi
+ \let\mst@origchi\chi
+ \let\mst@origpsi\psi
+ \let\mst@origomega\omega
+ \let\mst@origDigamma\Digamma
+ \let\mst@origdigamma\digamma
+ \let\mst@origpartial\partial
+ \let\mst@origwp\wp
+ \let\mst@origell\ell }
+\MTrecordstandardgreek
+\renewcommand*{\MTstandardgreek}{%
+ \let\Alpha\mst@origAlpha
+ \let\Beta\mst@origBeta
+ \let\Gamma\mst@origGamma
+ \let\Delta\mst@origDelta
+ \let\Epsilon\mst@origEpsilon
+ \let\Zeta\mst@origZeta
+ \let\Eta\mst@origEta
+ \let\Theta\mst@origTheta
+ \let\Iota\mst@origIota
+ \let\Kappa\mst@origKappa
+ \let\Lambda\mst@origLambda
+ \let\Mu\mst@origMu
+ \let\Nu\mst@origNu
+ \let\Xi\mst@origXi
+ \let\Omicron\mst@origOmicron
+ \let\Pi\mst@origPi
+ \let\Rho\mst@origRho
+ \let\Sigma\mst@origSigma
+ \let\Tau\mst@origTau
+ \let\Upsilon\mst@origUpsilon
+ \let\Phi\mst@origPhi
+ \let\Chi\mst@origChi
+ \let\Psi\mst@origPsi
+ \let\Omega\mst@origOmega
+ \let\alpha\mst@origalpha
+ \let\beta\mst@origbeta
+ \let\gamma\mst@origgamma
+ \let\delta\mst@origdelta
+ \let\epsilon\mst@origepsilon
+ \let\varepsilon\mst@origvarepsilon
+ \let\zeta\mst@origzeta
+ \let\eta\mst@origeta
+ \let\theta\mst@origtheta
+ \let\vartheta\mst@origvartheta
+ \let\iota\mst@origiota
+ \let\kappa\mst@origkappa
+ \let\lambda\mst@origlambda
+ \let\mu\mst@origmu
+ \let\nu\mst@orignu
+ \let\xi\mst@origxi
+ \let\omicron\mst@origomicron
+ \let\pi\mst@origpi
+ \let\varpi\mst@origvarpi
+ \let\rho\mst@origrho
+ \let\varrho\mst@origvarrho
+ \let\sigma\mst@origsigma
+ \let\varsigma\mst@origvarsigma
+ \let\tau\mst@origtau
+ \let\upsilon\mst@origupsilon
+ \let\phi\mst@origphi
+ \let\varphi\mst@origvarphi
+ \let\chi\mst@origchi
+ \let\psi\mst@origpsi
+ \let\omega\mst@origomega
+ \let\Digamma\mst@origDigamma
+ \let\digamma\mst@origdigamma
+ \let\partial\mst@origpartial
+ \let\wp\mst@origwp
+ \let\ell\mst@origell
+}
+\renewcommand*{\MTcustomgreek}{%
+ \let\Alpha\mst@Alpha
+ \let\Beta\mst@Beta
+ \let\Gamma\mst@Gamma
+ \let\Delta\mst@Delta
+ \let\Epsilon\mst@Epsilon
+ \let\Zeta\mst@Zeta
+ \let\Eta\mst@Eta
+ \let\Theta\mst@Theta
+ \let\Iota\mst@Iota
+ \let\Kappa\mst@Kappa
+ \let\Lambda\mst@Lambda
+ \let\Mu\mst@Mu
+ \let\Nu\mst@Nu
+ \let\Xi\mst@Xi
+ \let\Omicron\mst@Omicron
+ \let\Pi\mst@Pi
+ \let\Rho\mst@Rho
+ \let\Sigma\mst@Sigma
+ \let\Tau\mst@Tau
+ \let\Upsilon\mst@Upsilon
+ \let\Phi\mst@Phi
+ \let\Chi\mst@Chi
+ \let\Psi\mst@Psi
+ \let\Omega\mst@Omega
+ \let\alpha\mst@alpha
+ \let\beta\mst@beta
+ \let\gamma\mst@gamma
+ \let\delta\mst@delta
+ \let\epsilon\mst@epsilon
+ \let\varepsilon\mst@varepsilon
+ \let\zeta\mst@zeta
+ \let\eta\mst@eta
+ \let\theta\mst@theta
+ \let\vartheta\mst@vartheta
+ \let\iota\mst@iota
+ \let\kappa\mst@kappa
+ \let\lambda\mst@lambda
+ \let\mu\mst@mu
+ \let\nu\mst@nu
+ \let\xi\mst@xi
+ \let\omicron\mst@omicron
+ \let\pi\mst@pi
+ \let\varpi\mst@varpi
+ \let\rho\mst@rho
+ \let\varrho\mst@varrho
+ \let\sigma\mst@sigma
+ \let\varsigma\mst@varsigma
+ \let\tau\mst@tau
+ \let\upsilon\mst@upsilon
+ \let\phi\mst@phi
+ \let\varphi\mst@varphi
+ \let\chi\mst@chi
+ \let\psi\mst@psi
+ \let\omega\mst@omega
+ \let\Digamma\mst@Digamma
+ \let\digamma\mst@digamma
+ \let\partial\mst@partial
+ \let\wp\mst@wp
+ \let\ell\mst@ell
+}
+\fi
+\let\Mathastextstandardgreek\MTstandardgreek
+\let\Mathastextcustomgreek\MTcustomgreek
+\ifmst@subdued\else\MTcustomgreek\fi
\edef\mst@tmp@enc{\encodingdefault}
\mst@goaheadtrue
\ifx\mst@tmp@enc\mst@eui % xetex and unicode font