From 8872b9aecdfd830b9bd347049b1827280214d9ec Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 6 Nov 2016 22:18:21 +0000 Subject: mathastext (6nov16) git-svn-id: svn://tug.org/texlive/trunk@42447 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/mathastext/mathastext.sty | 25 ++++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/mathastext/mathastext.sty b/Master/texmf-dist/tex/latex/mathastext/mathastext.sty index a82f5bc75ca..e956e48efd7 100644 --- a/Master/texmf-dist/tex/latex/mathastext/mathastext.sty +++ b/Master/texmf-dist/tex/latex/mathastext/mathastext.sty @@ -23,7 +23,7 @@ %%---------------------------------------------------------------- %% Package: mathastext %% Info: Use the text font in math mode (JFB) -%% Version: 1.3p 2016/05/13 +%% Version: 1.3r 2016/11/06 %% License: LPPL 1.3c (http://www.latex-project.org/lppl/lppl-1-3c.txt) %% Copyright (C) 2011-2016 Jean-Francois Burnol %% Examples of use of mathastext: @@ -32,7 +32,7 @@ %%---------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} \ProvidesPackage {mathastext} - [2016/05/13 v1.3p Use the text font in math mode (JFB)] + [2016/11/06 v1.3r Use the text font in math mode (JFB)] \let\mst@Umathcharnumdef\Umathcharnumdef \let\mst@Umathcodenum \Umathcodenum \let\mst@Umathcode \Umathcode @@ -200,8 +200,15 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \DeclareOption{fouriervec}{\mst@fouriervectrue} \newif\ifmst@subdued \DeclareOption{subdued}{\mst@subduedtrue} -\DeclareOption*{\PackageWarningNoLine{mathastext} - {Unknown option `\CurrentOption\string'}} +\def\mst@unicodeminus {2013} +\def\mst@checkoption #1unicodeminus#2\mst@#3\mst@@ + {\ifx\\#3\\\PackageWarningNoLine{mathastext} + {Unknown option `\CurrentOption\string'}\else + \ifx\\#2\\\def\mst@unicodeminus {2212}\else + \expandafter\def\expandafter\mst@unicodeminus\expandafter{\@secondoftwo#2}% + \fi\fi} +\DeclareOption*% + {\expandafter\mst@checkoption\CurrentOption\mst@ unicodeminus\mst@\mst@@} \ProcessOptions\relax \newmuskip\mst@exists@muskip %% v 1.15e \newmuskip\mst@forall@muskip @@ -1110,7 +1117,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \DeclareMathSymbol \csname mst@#1\endcsname{\mathalpha}{mtletterfont}{`#1}% \expandafter\mst@addtodo@az\expandafter #1\csname mst@#1\endcsname }% -\@for\mst@tmp:=a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z\do +\@tfor\mst@tmp:=abcdefghijklmnopqrstuvwxyz\do {\expandafter\mst@DeclareMathLetter\mst@tmp}% \ifmst@frenchmath \def\mst@font@tbu{mtoperatorfont}% \else \def\mst@font@tbu{mtletterfont}% @@ -1121,7 +1128,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \DeclareMathSymbol \csname mst@#1\endcsname{\mathalpha}{\mst@font@tbu}{`#1}% \expandafter\mst@addtodo@AZ\expandafter #1\csname mst@#1\endcsname }% -\@for\mst@tmp:=A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z\do +\@tfor\mst@tmp:=ABCDEFGHIJKLMNOPQRSTUVWXYZ\do {\expandafter\mst@DeclareMathLetter\mst@tmp}% \let\mst@DeclareMathLetter\relax %% @@ -1231,7 +1238,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \else \ifmst@XeOrLua \mst@Umathcharnumdef\mst@minus@sign=\mst@Umathcodenum`\-\relax -%% I used this prior to the new \luatexUmathcodenum, as available with TL2013: +%% I used this prior to the new \luatexUmathcodenum, as available since TL2013: %% \mathchardef\mst@minus@sign=8704\relax % "2200 \else \mathchardef\mst@minus@sign=\mathcode`\-\relax @@ -1249,8 +1256,8 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \def\mst@dothe@endashstuff{\edef\mst@tmp@enc{\encodingdefault} \if1\mst@OneifUniEnc \AtBeginDocument{% Unicode engines and font - \mst@Umathcode`\-=2 \symmtoperatorfont "2013\relax - \mst@Umathchardef\mst@varfam@minus=7 \symmtoperatorfont "2013\relax + \mst@Umathcode`\-=2 \symmtoperatorfont "\mst@unicodeminus\relax + \mst@Umathchardef\mst@varfam@minus=7 \symmtoperatorfont "\mst@unicodeminus\relax } \else \ifx\mst@tmp@enc\mst@ti % T1 -- cgit v1.2.3