mathspec (22dec16)

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

1 files changed, 42 insertions, 42 deletions

diff --git a/Master/texmf-dist/tex/xelatex/mathspec/mathspec.sty b/Master/texmf-dist/tex/xelatex/mathspec/mathspec.sty
index 6670cbf3249..e63a27d5efc 100644
--- a/Master/texmf-dist/tex/xelatex/mathspec/mathspec.sty
+++ b/Master/texmf-dist/tex/xelatex/mathspec/mathspec.sty
@@ -1,14 +1,12 @@
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{mathspec}
-  [2009/09/30 v0.2 LaTeX Package (Mathematics font selection for XeLaTeX)]
+  [2016/12/22 v0.2b LaTeX Package (Mathematics font selection for XeLaTeX)]
 
-%% Require etoolbox for convenience and amstext for well sized text in maths
-%% mode. ifxetex is obvious.
+%% Requirements:
 \RequirePackage{etoolbox}
 \RequirePackage{amstext}
-\RequirePackage{ifxetex}
 
-%% Require a recent XeTeX version.
+\RequirePackage{ifxetex}
 \RequireXeTeX
 \ifcsundef{XeTeXglyphbounds}
   {\PackageError{mathspec}
@@ -51,7 +49,7 @@
   \ifnumcomp{#3}{<}{#1}{\boolfalse{temp}}{\relax}%
   \ifbool{temp}}
 
-%% Options.
+%% Options:
 \DeclareOption{normalskips}
   {\PackageWarning{mathspec}
      {Package option `normalskips' is deprecated}}
@@ -70,14 +68,23 @@
 
 \providecommand\currentmathstyle{\relax}
 
-%% Check whether a package is loaded.
-%%   \eu@package@loaded{<package>}
-\newcommand\eu@package@loaded[1]{
-  \@ifpackageloaded{#1}
-    {\eu@booltrue{eu@#1@loaded}}
-    {\eu@boolfalse{eu@#1@loaded}}}
-%% Test for amsmath. Do I need to do this here or at all?
-\eu@package@loaded{amsmath}
+%% @-namespace fontspec variable:
+\ExplSyntaxOn
+\def\eu@enc{\g_fontspec_encoding_tl}
+\ExplSyntaxOff
+%% This is needed to transition to the TU encoding instead of EU1 (WSPR)
+
+%% Deprecated commands in fontspec:
+\ExplSyntaxOn
+\tl_set:Nn \zf@enc { \g_fontspec_encoding_tl }
+\cs_set:Npn \zf@fontspec #1 #2
+ {
+  \fontspec_select:nn {#1} {#2}
+  \tl_set:Nn \zf@family { \l_fontspec_family_tl }
+  \tl_set:Nn \zf@basefont { \l_fontspec_font }
+ }
+\ExplSyntaxOff
+%% These are still defined in fontspec at time of writing but maybe be removed in the future. (WSPR)
 
 %% Define the undefined Greek letters. Include all variant forms (same as normal
 %% forms if variant forms are unavailable). Latin F for digamma is better than
@@ -97,15 +104,12 @@
 \DeclareMathSymbol{\Chi}{\mathalpha}{operators}{"58}
 \DeclareMathSymbol{\omicron}{\mathord}{letters}{"6F}
 \let\varbeta\beta
-\ifdef{\varkappa}
-  {\relax}
+\ifdef{\varkappa}{\relax}
   {\let\varkappa\kappa}
-\ifdef{\varTheta}
-  {\let\eu@cm@varTheta\varTheta}
+\ifdef{\varTheta}{\let\eu@cm@varTheta\varTheta}
   {\relax}
 \let\varTheta\Theta
-\ifdef{\digamma}
-  {\let\Digamma\digamma}
+\ifdef{\digamma}{\let\Digamma\digamma}
   {\DeclareMathSymbol{\Digamma}{\mathalpha}{operators}{"46}
    \DeclareMathSymbol{\digamma}{\mathord}{letters}{"46}}
 
@@ -257,7 +261,7 @@
     \eu@boolfalse{Digits}
   \fi
   \eu@ifsomebooltrue{Digits}
-    {\DeclareSymbolFont{Digits:m:n}{EU1}{\eu@Digitsmathsfont}{m}{n}}
+    {\DeclareSymbolFont{Digits:m:n}{\eu@enc}{\eu@Digitsmathsfont}{m}{n}}
   \eu@ifbooltrue{Digits}
     {\fontfamily\eu@Digitsmathsfont\selectfont
      \DeclareMathSymbol{0}{\mathord}{\eu@DigitsArabic@symfont}{`0}
@@ -298,8 +302,8 @@
     \eu@boolfalse{LatinLowercase}
   \fi
   \eu@ifsomebooltrue{LatinUppercase,LatinLowercase}
-    {\DeclareSymbolFont{Latin:m:n}{EU1}{\eu@Latinmathsfont}{m}{n}
-     \DeclareSymbolFont{Latin:m:it}{EU1}{\eu@Latinmathsfont}{m}{it}}
+    {\DeclareSymbolFont{Latin:m:n}{\eu@enc}{\eu@Latinmathsfont}{m}{n}
+     \DeclareSymbolFont{Latin:m:it}{\eu@enc}{\eu@Latinmathsfont}{m}{it}}
   \eu@ifbooltrue{LatinUppercase}
     {\fontfamily\eu@Latinmathsfont\selectfont
      \DeclareMathSymbol{A}{\mathalpha}{\eu@LatinUppercase@symfont}{`A}
@@ -384,8 +388,8 @@
     \eu@boolfalse{GreekLowercase}
   \fi
   \eu@ifsomebooltrue{GreekUppercase,GreekLowercase}
-    {\DeclareSymbolFont{Greek:m:n}{EU1}{\eu@Greekmathsfont}{m}{n}
-     \DeclareSymbolFont{Greek:m:it}{EU1}{\eu@Greekmathsfont}{m}{it}}
+    {\DeclareSymbolFont{Greek:m:n}{\eu@enc}{\eu@Greekmathsfont}{m}{n}
+     \DeclareSymbolFont{Greek:m:it}{\eu@enc}{\eu@Greekmathsfont}{m}{it}}
   \eu@ifbooltrue{GreekUppercase}
     {\fontfamily\eu@Greekmathsfont\selectfont
      \XeTeXDeclareMathSymbol{Α}{\mathalpha}{\eu@GreekUppercase@symfont}{`Α}[\Alpha]
@@ -932,34 +936,34 @@
 \ernewcommand\setmathrm[2][]{
   \zf@fontspec{#1}{#2}
   \let\eu@mathrm\zf@family
-  \DeclareMathAlphabet{\mathrm}{EU1}{\eu@mathrm}{m}{n}
-  \SetMathAlphabet{\mathrm}{bold}{EU1}{\eu@mathrm}{bx}{n}
-  \DeclareMathAlphabet{\mathit}{EU1}{\eu@mathrm}{m}{it}
-  \DeclareMathAlphabet{\mathbf}{EU1}{\eu@mathrm}{bx}{n}
-  \SetMathAlphabet{\mathit}{bold}{EU1}{\eu@mathrm}{bx}{it}
-  \DeclareSymbolFont{Operators:m:n}{EU1}{\eu@mathrm}{m}{n}
+  \DeclareMathAlphabet{\mathrm}{\eu@enc}{\eu@mathrm}{m}{n}
+  \SetMathAlphabet{\mathrm}{bold}{\eu@enc}{\eu@mathrm}{bx}{n}
+  \DeclareMathAlphabet{\mathit}{\eu@enc}{\eu@mathrm}{m}{it}
+  \DeclareMathAlphabet{\mathbf}{\eu@enc}{\eu@mathrm}{bx}{n}
+  \SetMathAlphabet{\mathit}{bold}{\eu@enc}{\eu@mathrm}{bx}{it}
+  \DeclareSymbolFont{Operators:m:n}{\eu@enc}{\eu@mathrm}{m}{n}
   \def\operator@font{\expandafter\mathgroup\csname symOperators:m:n\endcsname}}
 \ernewcommand\setmathcal[2][]{
   \zf@fontspec{#1}{#2}
   \let\eu@mathcal\zf@family
-  \DeclareMathAlphabet{\mathcal}{EU1}{\eu@mathcal}{m}{n}}
+  \DeclareMathAlphabet{\mathcal}{\eu@enc}{\eu@mathcal}{m}{n}}
 \ernewcommand\setmathsf[2][]{
   \zf@fontspec{#1}{#2}
   \let\eu@mathsf\zf@family
-  \DeclareMathAlphabet{\mathsf}{EU1}{\eu@mathsf}{m}{n}
-  \SetMathAlphabet{\mathsf}{bold}{EU1}{\eu@mathsf}{bx}{n}}
+  \DeclareMathAlphabet{\mathsf}{\eu@enc}{\eu@mathsf}{m}{n}
+  \SetMathAlphabet{\mathsf}{bold}{\eu@enc}{\eu@mathsf}{bx}{n}}
 \ernewcommand\setmathtt[2][]{
   \zf@fontspec{#1}{#2}
   \let\eu@mathtt\zf@family
-  \DeclareMathAlphabet{\mathtt}{EU1}{\eu@mathtt}{m}{n}}
+  \DeclareMathAlphabet{\mathtt}{\eu@enc}{\eu@mathtt}{m}{n}}
 \ernewcommand\setmathfrak[2][]{
   \zf@fontspec{#1}{#2}
   \let\eu@mathfrak\zf@family
-  \DeclareMathAlphabet{\mathfrak}{EU1}{\eu@mathfrak}{m}{n}}
+  \DeclareMathAlphabet{\mathfrak}{\eu@enc}{\eu@mathfrak}{m}{n}}
 \ernewcommand\setmathbb[2][]{
   \zf@fontspec{#1}{#2}
   \let\eu@mathbb\zf@family
-  \DeclareMathAlphabet{\mathbb}{EU1}{\eu@mathbb}{m}{n}}
+  \DeclareMathAlphabet{\mathbb}{\eu@enc}{\eu@mathbb}{m}{n}}
 
 %% If amsmath is loaded, it must be loaded before mathspec. Checking for its
 %% existence \AtBeginDocument is too late because the damage is already done
@@ -988,14 +992,10 @@
 %% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in:
-%% 
 %%   http://www.latex-project.org/lppl.txt
-%% 
 %% and version 1.3c or later is part of all recent distributions of LaTeX.
 %% 
 %% This work has the LPPL maintenance status ‘maintained’.
-%% 
 %% The Current Maintainer of this work is Andrew Gilbert Moschou.
-%% 
-%% This work consists of the files mathspec.sty and mathsepc4.tex.
+%% This work consists of the files mathspec.sty and mathspec.tex.