From 60b7d733b144034f91cf1fb9e3a9a15dd1d88371 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 14 Dec 2013 22:56:40 +0000 Subject: mathastext (14dec13) git-svn-id: svn://tug.org/texlive/trunk@32415 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/mathastext/mathastext.sty | 49 ++++++++++++---------- 1 file changed, 27 insertions(+), 22 deletions(-) (limited to 'Master/texmf-dist/tex/latex/mathastext') diff --git a/Master/texmf-dist/tex/latex/mathastext/mathastext.sty b/Master/texmf-dist/tex/latex/mathastext/mathastext.sty index 0900723cefe..59f70128ab2 100644 --- a/Master/texmf-dist/tex/latex/mathastext/mathastext.sty +++ b/Master/texmf-dist/tex/latex/mathastext/mathastext.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %%---------------------------------------------------------------- -%% The mathastext package (version 1.3b of December 10, 2013) +%% The mathastext package (version 1.3c of December 14, 2013) %% Use the text font in math mode (jfB) %% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol %% Examples of use of mathastext: @@ -30,7 +30,7 @@ %%---------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} \ProvidesPackage {mathastext} - [2013/12/11 v1.3b Use the text font in math mode (jfB)] + [2013/12/14 v1.3c Use the text font in math mode (jfB)] \newif\ifmst@XeTeX \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname XeTeXinterchartoks\endcsname\relax @@ -770,11 +770,12 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \ifx\mst@tmp\empty\else \global\expandafter\let\csname mv@\mst@version\expandafter\endcsname \csname mv@#1\endcsname - \typeout{** Math version \mst@version\space inherits from `#1\string'.}% + \typeout{** Math version `\mst@version\string' inherits from `#1\string'.}% \fi \expandafter\MTDeclareVersion@@\mst@declareversionargs } \newcommand*\MTDeclareVersion@@[6]{% + \edef\mst@tmp{#1}% \expandafter\edef\csname mst@encoding@\mst@version\endcsname{#3}% \expandafter\edef\csname mst@family@\mst@version\endcsname{#4}% \expandafter\edef\csname mst@series@\mst@version\endcsname{#5}% @@ -793,23 +794,23 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \ifx\mst@tmp\empty \ifmst@italic \SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{\mst@ltsh}% - \typeout{** Latin letters in math version `#2\string' will use the font - #3/#4/#5/\mst@ltsh^^J% - ** Other characters (digits, ...) and \protect\log-like names + \typeout{** Latin letters in math version `#2\string' will use the font + #3/#4/#5/\mst@ltsh^^J% + ** Other characters (digits, ...) and \protect\log-like names will be in #6 shape.}% \expandafter\edef\csname mst@ltshape@\mst@version\endcsname{\mst@ltsh}% \else \SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{#6}% - \typeout{** Latin letters in math version `#2\string' will use the fonts - #3/#4/#5(\mst@bold)/#6}% + \typeout{** Latin letters in math version `#2\string' will use the fonts + #3/#4/#5(\mst@bold)/#6}% \expandafter\edef\csname mst@ltshape@\mst@version\endcsname{#6}% \fi \else \SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{#1}% \typeout{** Latin letters in math version `#2\string' will use the font - #3/#4/#5/#1^^J% - ** Other characters (digits, ...) and \protect\log-like - names will be in #6 shape.}% + #3/#4/#5/#1^^J% + ** Other characters (digits, ...) and \protect\log-like + names will be in #6 shape.}% \expandafter\edef\csname mst@ltshape@\mst@version\endcsname{#1}% \fi \ifmst@nonormalbold\else @@ -870,13 +871,15 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \let\MathastextDeclareVersion\MTDeclareVersion \@onlypreamble\MTDeclareVersion \@onlypreamble\MathastextDeclareVersion -\newcommand*\MTVersion[2][]{% +\newcommand*\MTversion {\@ifstar\MTversion@s\MTversion@ } +\newcommand*\MTversion@s [1]{\mathversion{#1}\MTversion@@ {#1}} +\newcommand*\MTversion@ [2][]{% \mathversion{#2}% \edef\mst@tmpa{#1}% \ifx\mst@tmpa\empty - \def\mst@tmp{#2}% + \edef\mst@tmp{#2}% \else - \def\mst@tmp{#1}% + \let\mst@tmp\mst@tmpa \fi \usefont{\csname mst@encoding@\mst@tmp\endcsname}% {\csname mst@family@\mst@tmp\endcsname}% @@ -901,7 +904,10 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \renewcommand{\sfdefault}{\mst@@sfdefault}% \edef\mst@@ttdefault{\csname mst@ttdefault@\mst@tmp\endcsname}% \renewcommand{\ttdefault}{\mst@@ttdefault}% - \edef\mst@tmp{#2}% + \MTversion@@ {#2}% +} +\newcommand*\MTversion@@ [1]{% + \edef\mst@tmp{#1}% %% v1.15e: muskips \expandafter \mst@exists@muskip\csname mst@exists@skip@\mst@tmp\endcsname\relax @@ -917,10 +923,10 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \edef\mst@tmpa{\csname mst@ltshape@\mst@tmp\endcsname}% \edef\mst@tmpb{\csname mst@shape@\mst@tmp\endcsname}% \MTicinmath - \@for\mst@tmp:=it,sl\do{\ifx\mst@tmp\mst@tmpa\MTnoicinmath\fi}% + \@for\mst@tmpc:=it,sl\do{\ifx\mst@tmpc\mst@tmpa\MTnoicinmath\fi}% \ifmst@frenchmath \MTICinmath - \@for\mst@tmp:=it,sl\do{\ifx\mst@tmp\mst@tmpb\MTnoICinmath\fi}% + \@for\mst@tmpc:=it,sl\do{\ifx\mst@tmpc\mst@tmpb\MTnoICinmath\fi}% \fi %% v1.15c: extending subdued to LGRgreek %% v1.15f: subdueing math alphabets in a simpler way than in 1.15e @@ -930,7 +936,6 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \MTeasynonlettersobeymathxx \ifmst@asterisk\let\mst@doasterisk\mst@@doasterisk\fi \ifmst@subdued - \edef\mst@tmp{#2}% \def\mst@tmpa{normal}% \ifx\mst@tmp\mst@tmpa \mst@restorealphabets @@ -957,10 +962,10 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \fi \fi } -\let\MathastextVersion\MTVersion -\let\Mathastextversion\MTVersion -\let\MTversion\MTVersion -\let\mathastextversion\MTVersion +\let\MathastextVersion\MTversion +\let\Mathastextversion\MTversion +\let\MTVersion\MTversion +\let\mathastextversion\MTversion \Mathastext \ifmst@eulergreek \typeout{** Greek letters will use the Euler font. Use^^J% -- cgit v1.2.3