diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/newtx/newtxmath.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index 6ce308f8c9b..d68a351d058 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty @@ -10,8 +10,8 @@ % of glyph collisions. % These modifications are by Michael Sharpe, msharpe at ucsd dot edu -\def\fileversion{1.141} -\def\filedate{2013/09/30} +\def\fileversion{1.15} +\def\filedate{2013/10/12} \ProvidesPackage{newtxmath} [\filedate\space v\fileversion] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -21,9 +21,18 @@ \csname newtxmathLoaded\endcsname \let\newtxmathLoaded\endinput \RequirePackage{amsmath} % improves extendable delimiter handling +\RequirePackage{ifxetex,ifluatex,xkeyval} + +\newif\ifxl@otf \xl@otffalse +\ifxetex + \xl@otftrue +\else\ifluatex + \xl@otftrue + \fi +\fi +\newcommand{\cmr@default}{cmr} \input{binhex} -\RequirePackage{xkeyval} \let\ntxmath@scaled\@empty \define@key{ntxmath}{scaled}[1.0]{\def\ntxmath@scaled{s*[#1]}} \DeclareOption*{% @@ -69,29 +78,30 @@ amssymbols,uprightGreek} % altnu and largelibfigs valid only with libertine \iftx@libertine\else\tx@altnufalse\tx@largelibfigsfalse\fi % Use existing text fonts for operators, mathrm, etc -\DeclareSymbolFont{operators}{\encodingdefault}{\rmdefault}{m}{n} -\iftx@libertine - \SetSymbolFont{operators}{bold}{\encodingdefault}{\rmdefault}{sb}{n} -\else - \SetSymbolFont{operators}{bold}{\encodingdefault}{\rmdefault}{b}{n} +\ifxl@otf + \iftx@libertine + \ifx\rmdefault\cmr@default + \renewcommand{\rmdefault}{minlibertine}% since can't load libertine twice + \fi + \fi \fi +\edef\bold@wt{\ifx\iflibertine@otf\undefined b\else sb\fi} +\DeclareSymbolFont{operators}{\encodingdefault}{\rmdefault}{m}{n} +\SetSymbolFont{operators}{bold}{\encodingdefault}{\rmdefault}{\bold@wt}{n} + \def\operator@font{\mathgroup\symoperators} +\DeclareSymbolFontAlphabet{\mathrm}{operators} + \DeclareMathAlphabet{\mathsf}{\encodingdefault}{\sfdefault}{m}{n} \DeclareMathAlphabet{\mathit}{\encodingdefault}{\rmdefault}{m}{it} \DeclareMathAlphabet{\mathtt}{\encodingdefault}{\ttdefault}{m}{n} \DeclareSymbolFontAlphabet{\mathrm}{operators} -\iftx@libertine - \DeclareMathAlphabet{\mathbf}{\encodingdefault}{\rmdefault}{sb}{n} - \SetMathAlphabet{\mathit}{bold}{\encodingdefault}{\rmdefault}{sb}{it} -\else - \DeclareMathAlphabet{\mathbf}{\encodingdefault}{\rmdefault}{b}{n} - \SetMathAlphabet{\mathit}{bold}{\encodingdefault}{\rmdefault}{b}{it} -\fi +\DeclareMathAlphabet{\mathbf}{\encodingdefault}{\rmdefault}{\bold@wt}{n} +\SetMathAlphabet{\mathit}{bold}{\encodingdefault}{\rmdefault}{\bold@wt}{it} \SetMathAlphabet{\mathsf}{bold}{\encodingdefault}{\sfdefault}{b}{n} \SetMathAlphabet{\mathtt}{bold}{\encodingdefault}{\ttdefault}{b}{n} - %%%%%%%%%%%%%%% % Math Italic % %%%%%%%%%%%%%%% |