diff options
author | Karl Berry <karl@freefriends.org> | 2012-11-20 01:04:24 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-11-20 01:04:24 +0000 |
commit | b32ce7e0896b7e5b0b4fa40e944cb98a9dc5d878 (patch) | |
tree | 765276bff042585f95f8d0d6cbc6cc6fd0865abb /Master/texmf-dist/tex/latex/newtx/newtxmath.sty | |
parent | 5c33a7e8f795f33fb75fe756b5210abe7347992a (diff) |
newtx (19nov12)
git-svn-id: svn://tug.org/texlive/trunk@28299 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/newtx/newtxmath.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 89 |
1 files changed, 72 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index c34291a2887..6a38ec837c4 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.04} -\def\filedate{2012/09/27} +\def\fileversion{1.05} +\def\filedate{2012/11/10} \ProvidesPackage{newtxmath} [\filedate\space v\fileversion] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -30,10 +30,12 @@ \noexpand\setkeys{ntxmath}{\CurrentOption}}% \x} \DeclareOption{varg}{\def\X@s@v@rg{}} +\newcount\tx@Isdigit \newif\iftx@ams \newif\iftx@slantedG \newif\iftx@cmint \newif\iftx@braces \newif\iftx@libertine \newif\iftx@varbb \newif\iftx@vvarbb \newif\iftx@symbolsC \tx@symbolsCtrue \newif\iftx@altnu +\newif\iftx@largelibfigs \newif\iftx@minion \newif\iftx@libaltvw \DeclareOption{varbb}{\tx@varbbtrue} \DeclareOption{vvarbb}{\tx@vvarbbtrue} @@ -48,18 +50,20 @@ \DeclareOption{uprightGreek}{\tx@slantedGfalse} \DeclareOption{slantedGreek}{\tx@slantedGtrue} \DeclareOption{altnu}{\tx@altnutrue} +\DeclareOption{largelibfigs}{\tx@largelibfigstrue} \ExecuteOptions{% amssymbols,uprightGreek} \ProcessOptions* + % No varg option with option libertine or option minion \iftx@libertine\ifx\X@s@v@rg\undefined\else\let\X@s@v@rg\@undefined\fi\fi \iftx@minion\ifx\X@s@v@rg\undefined\else\let\X@s@v@rg\@undefined\fi\fi -% altnu valid only with libertine -\iftx@libertine\else\tx@altnufalse\fi +% 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}{z}{n} + \SetSymbolFont{operators}{bold}{\encodingdefault}{\rmdefault}{sb}{n} \else \SetSymbolFont{operators}{bold}{\encodingdefault}{\rmdefault}{b}{n} \fi @@ -70,8 +74,8 @@ amssymbols,uprightGreek} \DeclareMathAlphabet{\mathtt}{\encodingdefault}{\ttdefault}{m}{n} \DeclareSymbolFontAlphabet{\mathrm}{operators} \iftx@libertine - \DeclareMathAlphabet{\mathbf}{\encodingdefault}{\rmdefault}{z}{n} - \SetMathAlphabet{\mathit}{bold}{\encodingdefault}{\rmdefault}{z}{it} + \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} @@ -194,6 +198,23 @@ amssymbols,uprightGreek} \DeclareMathSymbol{#1}{#2}{#3}{#4} \advance #4 by1} +\def\tx@isdigit#1{% #1 should be a single character +\tx@Isdigit=\z@ % +\count0=\number`#1\relax% +\ifnum\count0>47\relax% +\ifnum\count0<58\relax% +\tx@Isdigit=\@ne % +\fi% +\fi% +} + +\def\tx@XXX#1#2\@nil{% #1=first character, #2=rest of string +\tx@isdigit{#1}% +\ifnum\tx@Isdigit>\z@ $#1$\else#1\fi% +\if\relax\detokenize{#2}\relax \else +\edef\tx@XXXcmd{\noexpand\tx@XXX #2\noexpand\@nil}\tx@XXXcmd \fi} + +\def\equalht#1{\tx@XXX #1\@nil} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1252,16 +1273,50 @@ amssymbols,uprightGreek} \mkern-1mu\cleaders\hbox{$\mkern-.5mu\br@cext\mkern-.5mu$}\hfill\mkern-1mu\braceru$} \iftx@libertine% - \DeclareMathSymbol{0}{\mathalpha}{letters}{48} - \DeclareMathSymbol{1}{\mathalpha}{letters}{49} - \DeclareMathSymbol{2}{\mathalpha}{letters}{50} - \DeclareMathSymbol{3}{\mathalpha}{letters}{51} - \DeclareMathSymbol{4}{\mathalpha}{letters}{52} - \DeclareMathSymbol{5}{\mathalpha}{letters}{53} - \DeclareMathSymbol{6}{\mathalpha}{letters}{54} - \DeclareMathSymbol{7}{\mathalpha}{letters}{55} - \DeclareMathSymbol{8}{\mathalpha}{letters}{56} - \DeclareMathSymbol{9}{\mathalpha}{letters}{57} + \iftx@largelibfigs% + \DeclareMathSymbol{0}{\mathalpha}{lettersA}{155} + \DeclareMathSymbol{1}{\mathalpha}{lettersA}{156} + \DeclareMathSymbol{2}{\mathalpha}{lettersA}{157} + \DeclareMathSymbol{3}{\mathalpha}{lettersA}{158} + \DeclareMathSymbol{4}{\mathalpha}{lettersA}{159} + \DeclareMathSymbol{5}{\mathalpha}{lettersA}{160} + \DeclareMathSymbol{6}{\mathalpha}{lettersA}{161} + \DeclareMathSymbol{7}{\mathalpha}{lettersA}{162} + \DeclareMathSymbol{8}{\mathalpha}{lettersA}{163} + \DeclareMathSymbol{9}{\mathalpha}{lettersA}{164} + \else + \DeclareMathSymbol{0}{\mathalpha}{letters}{48} + \DeclareMathSymbol{1}{\mathalpha}{letters}{49} + \DeclareMathSymbol{2}{\mathalpha}{letters}{50} + \DeclareMathSymbol{3}{\mathalpha}{letters}{51} + \DeclareMathSymbol{4}{\mathalpha}{letters}{52} + \DeclareMathSymbol{5}{\mathalpha}{letters}{53} + \DeclareMathSymbol{6}{\mathalpha}{letters}{54} + \DeclareMathSymbol{7}{\mathalpha}{letters}{55} + \DeclareMathSymbol{8}{\mathalpha}{letters}{56} + \DeclareMathSymbol{9}{\mathalpha}{letters}{57} + \fi + \DeclareMathSymbol{\Libzero}{\mathord}{lettersA}{155} + \DeclareMathSymbol{\Libone}{\mathalpha}{lettersA}{156} + \DeclareMathSymbol{\Libtwo}{\mathalpha}{lettersA}{157} + \DeclareMathSymbol{\Libthree}{\mathalpha}{lettersA}{158} + \DeclareMathSymbol{\Libfour}{\mathalpha}{lettersA}{159} + \DeclareMathSymbol{\Libfive}{\mathalpha}{lettersA}{160} + \DeclareMathSymbol{\Libsix}{\mathalpha}{lettersA}{161} + \DeclareMathSymbol{\Libseven}{\mathalpha}{lettersA}{162} + \DeclareMathSymbol{\Libeight}{\mathalpha}{lettersA}{163} + \DeclareMathSymbol{\Libnine}{\mathalpha}{lettersA}{164} +% + \DeclareMathSymbol{\libzero}{\mathalpha}{letters}{48} + \DeclareMathSymbol{\libone}{\mathalpha}{letters}{49} + \DeclareMathSymbol{\libtwo}{\mathalpha}{letters}{50} + \DeclareMathSymbol{\libthree}{\mathalpha}{letters}{51} + \DeclareMathSymbol{\libfour}{\mathalpha}{letters}{52} + \DeclareMathSymbol{\libfive}{\mathalpha}{letters}{53} + \DeclareMathSymbol{\libsix}{\mathalpha}{letters}{54} + \DeclareMathSymbol{\libseven}{\mathalpha}{letters}{55} + \DeclareMathSymbol{\libeight}{\mathalpha}{letters}{56} + \DeclareMathSymbol{\libnine}{\mathalpha}{letters}{57} \fi %%% \not redefined: |