mathastext (2nov15)

git-svn-id: svn://tug.org/texlive/trunk@38764 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 102 insertions, 58 deletions

diff --git a/Master/texmf-dist/source/latex/mathastext/mathastext.dtx b/Master/texmf-dist/source/latex/mathastext/mathastext.dtx
index 35ab0a58f34..c434fcb9b48 100644
--- a/Master/texmf-dist/source/latex/mathastext/mathastext.dtx
+++ b/Master/texmf-dist/source/latex/mathastext/mathastext.dtx
@@ -2,14 +2,14 @@
 % N.B.: this dtx file does NOT use \DocInput (only docstrip), the
 % LaTeX source of the documentation is NOT prefixed with % signs.
 %<*dtx>
-{\def\dtxtimestamp {Time-stamp: <15-10-2015 21:35:11 CEST>}% 
+{\def\dtxtimestamp {Time-stamp: <31-10-2015 21:43:15 CET>}% 
  \def\getdtxtimestamp #1 <#2 #3 #4>{#2 at #3 #4}%
  \xdef\dtxtimestamp {\expandafter\getdtxtimestamp\dtxtimestamp }}%
-\def\docdate{2015/10/15}
+\def\docdate{2015/10/31}
 %</dtx>
 %<*drv|ins>
-\def\MSTpkgdate    {2015/10/15} 
-\def\MSTpkgversion {1.3g}
+\def\MSTpkgdate    {2015/10/31} 
+\def\MSTpkgversion {1.3h}
 %</drv|ins>
 %<*dtx>
 \iffalse % meta-comment
@@ -31,7 +31,7 @@ The Author of this Work is Jean-Francois Burnol
 
 Copyright (C) 2011-2015 Jean-Francois Burnol (`jfbu at free dot fr`)
 
-      Source: mathastext.dtx 1.3g 2015/10/15
+      Source: mathastext.dtx 1.3h 2015/10/31
 
 %</readme>
 %<*dtx>
@@ -47,7 +47,7 @@ not include the documented source code then, in contrast to 1a)+1b) method
 %%----------------------------------------------------------------
 %% Package: mathastext
 %% Info:    Use the text font in math mode (jfB)
-%% Version: 1.3g 2015/10/15
+%% Version: 1.3h 2015/10/31
 %% License: LPPL 1.3c (http://www.latex-project.org/lppl/lppl-1-3c.txt)
 %% Copyright (C) 2011-2015 Jean-Francois Burnol <jfbu at free dot fr>
 %% Examples of use of mathastext:
@@ -236,6 +236,15 @@ This produces the documentation without the source code.
 CHANGE LOG
 ==========
 
+1.3h \[2015/10/31\]
+----
+
+* bugfixes: since `1.3d 2014/05/23` the option `symbolgreek` caused
+  `\ell` to become undefined, and, similarly but far worse, options
+  `selfGreek`, `selfGreeks` caused all lowercase Greek letters
+  `\alpha`, `\beta`, etc.. to become undefined.
+  
+
 1.3g \[2015/10/15\]
 ----
 
@@ -1353,6 +1362,14 @@ LGRgreek]{mathastext}
 % \hyperref[ssec:beamer]{better compatibility} with |beamer|.
 
 \begin{description}[leftmargin=0.5em]
+\item [Changes for release |1.3h|  of |2015/10/31|]
+\begin{itemize}[noitemsep]
+\item bugfixes: since |1.3d 2014/05/23| the option §symbolgreek§ caused |\ell|
+  to become undefined, and, similarly but far worse, options §selfGreek§,
+  §selfGreeks§ caused all lowercase Greek letters |\alpha|, |\beta|, etc.. to
+  become undefined.
+\end{itemize}
+
 \item [Changes for release |1.3g|  of |2015/10/15|]
 \begin{itemize}[noitemsep]
 \item following |2015/10/01| LaTeX release, removal of the |"luatex"|
@@ -3753,7 +3770,7 @@ Numerous examples will be found there:\\
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage {mathastext}
-  [2015/10/15 v1.3g Use the text font in math mode (jfB)]
+  [2015/10/31 v1.3h 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
@@ -3798,9 +3815,9 @@ Numerous examples will be found there:\\
     \let\mst@Umathchardef   \luatexUmathchardef
   \fi
 \fi
-\newif\ifmst@Unicode
-\ifmst@LuaTeX\mst@Unicodetrue\fi
-\ifmst@XeTeX \mst@Unicodetrue\fi
+\newif\ifmst@XeOrLua
+\ifmst@LuaTeX\mst@XeOrLuatrue\fi
+\ifmst@XeTeX \mst@XeOrLuatrue\fi
 %    \end{macrocode}
 % |1.2|: all inner macros of \mst now starts with |\mst@| for a cleaner
 % name-space. 
@@ -5767,7 +5784,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
 %    \begin{macrocode}
 \ifmst@nominus
 \else
-  \ifmst@Unicode
+  \ifmst@XeOrLua
     \mst@Umathcharnumdef\mst@minus@sign=\mst@Umathcodenum`\-\relax
 %% I used this prior to the new \luatexUmathcodenum, as available with TL2013:
 %% \mathchardef\mst@minus@sign=8704\relax % "2200
@@ -5823,7 +5840,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
    \DeclareMathSymbol{-}{\mathbin}{mtoperatorfont}{150}
    \DeclareMathSymbol{\mst@varfam@minus}{\mathalpha}{mtoperatorfont}{150}
 \else % make sure we have neither xetex nor luatex
-   \ifmst@Unicode\mst@aborttrue\else
+   \ifmst@XeOrLua\mst@aborttrue\else
    \DeclareMathSymbol{-}{\mathbin}{mtoperatorfont}
    \DeclareMathSymbol{\mst@varfam@minus}{\mathalpha}{mtoperatorfont}
 {\expandafter\the\expandafter\csname\mst@tmp@enc\string\textendash\endcsname}
@@ -5854,7 +5871,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
    \DeclareMathSymbol{-}{\mathbin}{mtoperatorfont}{151}
    \DeclareMathSymbol{\mst@varfam@minus}{\mathalpha}{mtoperatorfont}{151}
 \else % make sure we have neither xetex nor luatex
-   \ifmst@Unicode\mst@aborttrue\else
+   \ifmst@XeOrLua\mst@aborttrue\else
    \DeclareMathSymbol{-}{\mathbin}{mtoperatorfont}
    \DeclareMathSymbol{\mst@varfam@minus}{\mathalpha}{mtoperatorfont}
 {\expandafter\the\expandafter\csname\mst@tmp@enc\string\textemdash\endcsname}
@@ -5937,7 +5954,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
 \expandafter\mst@addtodo@nonletters\string+\mathbin\mst@varfam@plus
 \fi
 \ifmst@noequal\else
-\ifmst@Unicode
+\ifmst@XeOrLua
     \mst@Umathcharnumdef\mst@equal@sign=\mst@Umathcodenum`\=\relax
 \else
     \mathchardef\mst@equal@sign=\mathcode`\=\relax
@@ -6069,7 +6086,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
 % \begin{macro}{\models}
 % |1.15d|: 13 oct 2012. Before modifying \string| we must preserve \cs{models}. 
 %    \begin{macrocode}
-\ifmst@Unicode
+\ifmst@XeOrLua
   \mst@Umathcharnumdef\mst@vert@bar=\mst@Umathcodenum`\|\relax
 \else
   \mathchardef\mst@vert@bar=\mathcode`\|\relax
@@ -6167,7 +6184,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
 \else
    \typeout{** \string\#\space\string\mathdollar\space
                \string\%\space\string\&\space}
-  \ifmst@Unicode
+  \ifmst@XeOrLua
   \mst@Umathcode`\#="0 \symmtoperatorfont "0023 \relax
   \mst@Umathchardef\mathdollar="0 \symmtoperatorfont "0024 \relax
   \mst@Umathcode`\%="0 \symmtoperatorfont "0025 \relax
@@ -6413,7 +6430,10 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
     \DeclareMathSymbol{\mst@Omega}{\mathord}{mtpsymbol}{"57}
   \else % de \mst@mathord=\mathord
 %    \end{macrocode}
-%  not symbolgreek but eulergreek or selfGreek or both
+% not symbolgreek but eulergreek or selfGreek. Note 2015/10/31 : apparemment à
+% un moment dans le passé je considérais eulergreek et selfGreek comme pouvant
+% être utilisés simultanément car j'avais ici "or both". Mais je laisse tomber
+% tout effort réel de m'en préoccuper.
 %    \begin{macrocode}
     \DeclareMathSymbol\mst@Digamma  {\mathalpha}{\mst@font@tbu}{"46}
     \DeclareMathSymbol\mst@Gamma    {\mathalpha}{\mst@font@tbu}{"00}
@@ -6464,12 +6484,14 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
   \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}
+  \let\mst@varrho=\mst@rho
+  \let\mst@varsigma=\mst@sigma
   \DeclareMathSymbol{\mst@varphi} {\mathalpha}{mteulervm}{"27}
+%
   \DeclareMathSymbol{\mst@partial}{\mathalpha}{mteulervm}{"40}
   \DeclareMathSymbol{\mst@wp}{\mathalpha}{mteulervm}{"7D}
   \DeclareMathSymbol{\mst@ell}{\mathalpha}{mteulervm}{"60}
@@ -6515,26 +6537,29 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
 % et greek.ldf du package babel
 \DeclareMathSymbol{\mst@Alpha}{\mathalpha}{mtlgrfontupper}{65}
 \DeclareMathSymbol{\mst@Beta}{\mathalpha}{mtlgrfontupper}{66}
-\DeclareMathSymbol{\mst@Gamma}{\mathalpha}{mtlgrfontupper}{71}
-\DeclareMathSymbol{\mst@Delta}{\mathalpha}{mtlgrfontupper}{68}
 \DeclareMathSymbol{\mst@Epsilon}{\mathalpha}{mtlgrfontupper}{69}
 \DeclareMathSymbol{\mst@Zeta}{\mathalpha}{mtlgrfontupper}{90}
 \DeclareMathSymbol{\mst@Eta}{\mathalpha}{mtlgrfontupper}{72}
-\DeclareMathSymbol{\mst@Theta}{\mathalpha}{mtlgrfontupper}{74}
 \DeclareMathSymbol{\mst@Iota}{\mathalpha}{mtlgrfontupper}{73}
 \DeclareMathSymbol{\mst@Kappa}{\mathalpha}{mtlgrfontupper}{75}
-\DeclareMathSymbol{\mst@Lambda}{\mathalpha}{mtlgrfontupper}{76}
 \DeclareMathSymbol{\mst@Mu}{\mathalpha}{mtlgrfontupper}{77}
 \DeclareMathSymbol{\mst@Nu}{\mathalpha}{mtlgrfontupper}{78}
-\DeclareMathSymbol{\mst@Xi}{\mathalpha}{mtlgrfontupper}{88}
 \DeclareMathSymbol{\mst@Omicron}{\mathalpha}{mtlgrfontupper}{79}
-\DeclareMathSymbol{\mst@Pi}{\mathalpha}{mtlgrfontupper}{80}
 \DeclareMathSymbol{\mst@Rho}{\mathalpha}{mtlgrfontupper}{82}
-\DeclareMathSymbol{\mst@Sigma}{\mathalpha}{mtlgrfontupper}{83}
 \DeclareMathSymbol{\mst@Tau}{\mathalpha}{mtlgrfontupper}{84}
+\DeclareMathSymbol{\mst@Chi}{\mathalpha}{mtlgrfontupper}{81}
+%
+\DeclareMathSymbol{\mst@Digamma}{\mathalpha}{mtlgrfontlower}{195}    
+%
+\DeclareMathSymbol{\mst@Gamma}{\mathalpha}{mtlgrfontupper}{71}
+\DeclareMathSymbol{\mst@Delta}{\mathalpha}{mtlgrfontupper}{68}
+\DeclareMathSymbol{\mst@Theta}{\mathalpha}{mtlgrfontupper}{74}
+\DeclareMathSymbol{\mst@Lambda}{\mathalpha}{mtlgrfontupper}{76}
+\DeclareMathSymbol{\mst@Xi}{\mathalpha}{mtlgrfontupper}{88}
+\DeclareMathSymbol{\mst@Pi}{\mathalpha}{mtlgrfontupper}{80}
+\DeclareMathSymbol{\mst@Sigma}{\mathalpha}{mtlgrfontupper}{83}
 \DeclareMathSymbol{\mst@Upsilon}{\mathalpha}{mtlgrfontupper}{85}
 \DeclareMathSymbol{\mst@Phi}{\mathalpha}{mtlgrfontupper}{70}
-\DeclareMathSymbol{\mst@Chi}{\mathalpha}{mtlgrfontupper}{81}
 \DeclareMathSymbol{\mst@Psi}{\mathalpha}{mtlgrfontupper}{89}
 \DeclareMathSymbol{\mst@Omega}{\mathalpha}{mtlgrfontupper}{87}
 %
@@ -6555,7 +6580,6 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
 \DeclareMathSymbol{\mst@omicron}{\mathalpha}{mtlgrfontlower}{111}
 \DeclareMathSymbol{\mst@pi}{\mathalpha}{mtlgrfontlower}{112}
 \DeclareMathSymbol{\mst@rho}{\mathalpha}{mtlgrfontlower}{114}
-\DeclareMathSymbol{\mst@varsigma}{\mathalpha}{mtlgrfontlower}{99}  
 \DeclareMathSymbol{\mst@sigma}{\mathalpha}{mtlgrfontlower}{115}       
 \DeclareMathSymbol{\mst@tau}{\mathalpha}{mtlgrfontlower}{116}
 \DeclareMathSymbol{\mst@upsilon}{\mathalpha}{mtlgrfontlower}{117}
@@ -6563,18 +6587,24 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
 \DeclareMathSymbol{\mst@chi}{\mathalpha}{mtlgrfontlower}{113}
 \DeclareMathSymbol{\mst@psi}{\mathalpha}{mtlgrfontlower}{121}
 \DeclareMathSymbol{\mst@omega}{\mathalpha}{mtlgrfontlower}{119}
+%
 \DeclareMathSymbol{\mst@digamma}{\mathalpha}{mtlgrfontlower}{147}   
-\DeclareMathSymbol{\mst@Digamma}{\mathalpha}{mtlgrfontlower}{195}    
+% only varsigma defined (I should check this again)
+\DeclareMathSymbol{\mst@varsigma}{\mathalpha}{mtlgrfontlower}{99}  
 \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.
+%   |1.3d 2014/05/23| 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.
+%
+% |1.3h 2015/10/31|: corrected |\MTcustomgreek| as it caused |\ell| to
+% become undefined under option |symbolgreek| and, much more catastrophic,
+% caused |\alpha|, etc.. to become undefined under option |selfGreek| !
 %    \begin{macrocode}
 \newcommand*{\MTstandardgreek}{}
 \newcommand*{\MTcustomgreek}{}
@@ -6709,39 +6739,45 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
 \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\Chi\mst@Chi
+% 1.3h: \mst@Digamma not defined if symbolgreek option
+    \ifmst@symbolgreek\else\let\Digamma\mst@Digamma\fi
+%
+    \let\Gamma\mst@Gamma
+    \let\Delta\mst@Delta
+    \let\Theta\mst@Theta
+    \let\Lambda\mst@Lambda
+    \let\Xi\mst@Xi
+    \let\Pi\mst@Pi
+    \let\Sigma\mst@Sigma
     \let\Upsilon\mst@Upsilon
     \let\Phi\mst@Phi
-    \let\Chi\mst@Chi
     \let\Psi\mst@Psi
     \let\Omega\mst@Omega
-%
+%    \end{macrocode}
+% |1.3h 2015/10/31| adds this conditional to correct the bad bug in 
+% |1.3d 2014/05/23| which caused |\alpha| etc... to become undefined 
+% under option |selfGreek|.
+%    \begin{macrocode}
+ \ifmst@selfGreek\else
     \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
@@ -6750,24 +6786,32 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
     \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
+% 1.3h: digamma only defined with option LGRgreek:
+    \ifmst@LGRgreek\let\digamma\mst@digamma\fi
 %
-    \let\partial\mst@partial
-    \let\wp\mst@wp
-    \let\ell\mst@ell
+    \let\varsigma\mst@varsigma
+% conditional added 1.3h 2015/10/31
+    \ifmst@LGRgreek\else
+      \let\varepsilon\mst@varepsilon
+      \let\vartheta\mst@vartheta
+      \let\varpi\mst@varpi
+      \let\varrho\mst@varrho
+      \let\varphi\mst@varphi
+%
+      \let\partial\mst@partial
+      \let\wp\mst@wp
+% 1.3h: no \mst@ell if symbolgreek (bugfix 1.3h 2015/10/31)
+      \ifmst@symbolgreek\else\let\ell\mst@ell\fi
+    \fi
+ \fi
 }
 \fi
 \let\Mathastextstandardgreek\MTstandardgreek
@@ -6806,7 +6850,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
    \DeclareMathSymbol{\inodot}{\mathalpha}{mtletterfont}{16}
    \DeclareMathSymbol{\jnodot}{\mathalpha}{mtletterfont}{17}
 \else
-   \ifmst@Unicode\mst@goaheadfalse\else
+   \ifmst@XeOrLua\mst@goaheadfalse\else
    \DeclareMathSymbol{\inodot}{\mathalpha}{mtletterfont}
 {\expandafter\the\expandafter\csname\mst@tmp@enc\string\i\endcsname}
    \DeclareMathSymbol{\jnodot}{\mathalpha}{mtletterfont}
@@ -6927,7 +6971,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue}
   Grave accent  \`     Left brace    \{     Vertical bar  \|
   Right brace   \}     Tilde         \~}
 
-\CheckSum{5153}
+\CheckSum{5169}
 \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 7bd383e6cf4..37f07245c72 100644
--- a/Master/texmf-dist/source/latex/mathastext/mathastext.ins
+++ b/Master/texmf-dist/source/latex/mathastext/mathastext.ins
@@ -1,9 +1,9 @@
-\def\MSTpkgdate    {2015/10/15}
-\def\MSTpkgversion {1.3g}
+\def\MSTpkgdate    {2015/10/31}
+\def\MSTpkgversion {1.3h}
 %%----------------------------------------------------------------
 %% Package: mathastext
 %% Info:    Use the text font in math mode (jfB)
-%% Version: 1.3g 2015/10/15
+%% Version: 1.3h 2015/10/31
 %% License: LPPL 1.3c (http://www.latex-project.org/lppl/lppl-1-3c.txt)
 %% Copyright (C) 2011-2015 Jean-Francois Burnol <jfbu at free dot fr>
 %% Examples of use of mathastext: