diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/newtx')
| -rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 168 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxtext.sty | 2 |
2 files changed, 131 insertions, 39 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index 392f071851a..c21a84482a9 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{0.94} -\def\filedate{2012/05/23} +\def\fileversion{0.95} +\def\filedate{2012/05/26} \ProvidesPackage{newtxmath} [\filedate\space v\fileversion] \@ifundefined{ntxmathLoaded}{}{\endinput} @@ -21,6 +21,7 @@ \csname newtxmathLoaded\endcsname \let\newtxmathLoaded\endinput +\input{binhex} \RequirePackage{xkeyval} \define@key{ntxmath}{scaled}[1.0]{\def\ntxmath@scaled{s*[#1]}} \DeclareOption*{% @@ -30,8 +31,11 @@ \x} \DeclareOption{varg}{\def\X@s@v@rg{}} \newif\iftx@ams \newif\iftx@slantedG \newif\iftx@cmint \newif\iftx@braces -\newif\iftx@libertine \newif\iftx@varbb +\newif\iftx@libertine \newif\iftx@varbb \newif\iftx@vvarbb \newif\iftx@symbolsC +\tx@symbolsCtrue \DeclareOption{varbb}{\tx@varbbtrue} +\DeclareOption{vvarbb}{\tx@vvarbbtrue} +\DeclareOption{nosymbolsc}{\tx@symbolsCfalse} \DeclareOption{libertine}{\tx@libertinetrue} \DeclareOption{cmintegrals}{\tx@cminttrue} \DeclareOption{cmbraces}{\tx@bracestrue} @@ -107,7 +111,6 @@ amssymbols,uprightGreek} \iftx@ams% \DeclareSymbolFont{AMSa}{U}{ntxsya}{m}{n} \SetSymbolFont{AMSa}{bold}{U}{ntxsya}{b}{n} - %\DeclareSymbolFont{boldAMSa}{U}{ntxsya}{b}{n}% can be used directly by \bm \DeclareFontSubstitution{U}{ntxsya}{m}{n} @@ -126,11 +129,11 @@ amssymbols,uprightGreek} % Math Symbols C % %%%%%%%%%%%%%%%%%% -\DeclareSymbolFont{symbolsC}{U}{ntxsyc}{m}{n} -\SetSymbolFont{symbolsC}{bold}{U}{ntxsyc}{b}{n} -%\DeclareSymbolFont{boldsymbolsC}{U}{ntxsyc}{b}{n}% can be used directly by \bm -\DeclareFontSubstitution{U}{ntxsyc}{m}{n} - +\iftx@symbolsC + \DeclareSymbolFont{symbolsC}{U}{ntxsyc}{m}{n} + \SetSymbolFont{symbolsC}{bold}{U}{ntxsyc}{b}{n} + \DeclareFontSubstitution{U}{ntxsyc}{m}{n} +\fi %%%%%%%%%%%%%%%%%% % Math Extension % %%%%%%%%%%%%%%%%%% @@ -150,7 +153,6 @@ amssymbols,uprightGreek} \DeclareSymbolFont{largesymbolsA}{U}{ntxexa}{m}{n} \SetSymbolFont{largesymbolsA}{bold}{U}{ntxexa}{b}{n} -%\DeclareSymbolFont{boldlargesymbolsA}{U}{ntxexa}{b}{n}% can be used directly by \bm \DeclareFontSubstitution{U}{ntxexa}{m}{n} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -649,7 +651,7 @@ amssymbols,uprightGreek} %%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Math Symbol C Definitions % symbolsC %%%%%%%%%%%%%%%%%%%%%%%%%%%%% - +\iftx@symbolsC \re@DeclareMathSymbol{\mappedfromchar}{\mathrel}{symbolsC}{0} \def\mappedfrom{\leftarrow\mappedfromchar} \def\longmappedfrom{\longleftarrow\mappedfromchar} @@ -708,14 +710,14 @@ amssymbols,uprightGreek} \re@DeclareMathSymbol{\nBumpeq}{\mathrel}{symbolsC}{41} \re@DeclareMathSymbol{\nbacksim}{\mathrel}{symbolsC}{42} \re@DeclareMathSymbol{\nbacksimeq}{\mathrel}{symbolsC}{43} -\re@DeclareMathSymbol{\neq}{\mathrel}{symbolsC}{44} - \let\ne=\neq +%\re@DeclareMathSymbol{\neq}{\mathrel}{symbolsC}{44} +% \let\ne=\neq \re@DeclareMathSymbol{\nasymp}{\mathrel}{symbolsC}{45} \re@DeclareMathSymbol{\nequiv}{\mathrel}{symbolsC}{46} \re@DeclareMathSymbol{\nsim}{\mathrel}{symbolsC}{47} \re@DeclareMathSymbol{\napprox}{\mathrel}{symbolsC}{48} -\re@DeclareMathSymbol{\nsubset}{\mathrel}{symbolsC}{49} -\re@DeclareMathSymbol{\nsupset}{\mathrel}{symbolsC}{50} +%\re@DeclareMathSymbol{\nsubset}{\mathrel}{symbolsC}{49} +%\re@DeclareMathSymbol{\nsupset}{\mathrel}{symbolsC}{50} \re@DeclareMathSymbol{\nll}{\mathrel}{symbolsC}{51} \re@DeclareMathSymbol{\ngg}{\mathrel}{symbolsC}{52} \re@DeclareMathSymbol{\nthickapprox}{\mathrel}{symbolsC}{53} @@ -725,17 +727,17 @@ amssymbols,uprightGreek} \re@DeclareMathSymbol{\npreceqq}{\mathrel}{symbolsC}{57} \re@DeclareMathSymbol{\nsucceqq}{\mathrel}{symbolsC}{58} \re@DeclareMathSymbol{\nsimeq}{\mathrel}{symbolsC}{59} -\re@DeclareMathSymbol{\notin}{\mathrel}{symbolsC}{60} -\re@DeclareMathSymbol{\notni}{\mathrel}{symbolsC}{61} - \let\notowns=\notni +%\re@DeclareMathSymbol{\notin}{\mathrel}{symbolsC}{60} +%\re@DeclareMathSymbol{\notni}{\mathrel}{symbolsC}{61} +% \let\notowns=\notni \re@DeclareMathSymbol{\nSubset}{\mathrel}{symbolsC}{62} \re@DeclareMathSymbol{\nSupset}{\mathrel}{symbolsC}{63} \re@DeclareMathSymbol{\nsqsubseteq}{\mathrel}{symbolsC}{64} \re@DeclareMathSymbol{\nsqsupseteq}{\mathrel}{symbolsC}{65} \re@DeclareMathSymbol{\coloneqq}{\mathrel}{symbolsC}{66} \re@DeclareMathSymbol{\eqqcolon}{\mathrel}{symbolsC}{67} -\re@DeclareMathSymbol{\coloneq}{\mathrel}{symbolsC}{68} -\re@DeclareMathSymbol{\eqcolon}{\mathrel}{symbolsC}{69} +%\re@DeclareMathSymbol{\coloneq}{\mathrel}{symbolsC}{68} +%\re@DeclareMathSymbol{\eqcolon}{\mathrel}{symbolsC}{69} \re@DeclareMathSymbol{\Coloneqq}{\mathrel}{symbolsC}{70} \re@DeclareMathSymbol{\Eqqcolon}{\mathrel}{symbolsC}{71} \re@DeclareMathSymbol{\Coloneq}{\mathrel}{symbolsC}{72} @@ -825,6 +827,18 @@ amssymbols,uprightGreek} \re@DeclareMathSymbol{\multimapdotbothvert}{\mathrel}{symbolsC}{150} \re@DeclareMathSymbol{\multimapdotbothBvert}{\mathrel}{symbolsC}{151} \re@DeclareMathSymbol{\multimapdotbothAvert}{\mathrel}{symbolsC}{152} +\fi +% Changes to put some symbolsC glyphs into lettersA +\re@DeclareMathSymbol{\nsubset}{\mathrel}{lettersA}{54} +\re@DeclareMathSymbol{\nsupset}{\mathrel}{lettersA}{55} +\re@DeclareMathSymbol{\notin}{\mathrel}{lettersA}{56} +\re@DeclareMathSymbol{\notni}{\mathrel}{lettersA}{57} + \let\notowns=\notni +\re@DeclareMathSymbol{\coloneq}{\mathrel}{lettersA}{58} +\re@DeclareMathSymbol{\eqcolon}{\mathrel}{lettersA}{59} +\re@DeclareMathSymbol{\neq}{\mathrel}{lettersA}{60} + \let\ne=\neq + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Math Italic (ntxmi) Definition % letters @@ -977,6 +991,7 @@ amssymbols,uprightGreek} \let\upvarrho\varrhoup \let\upvarsigma\varsigmaup \let\upvarphi\varphiup +% the mathgroup of lettersA is stored in macro \symlettersA \re@DeclareMathSymbol{\varg}{\mathord}{lettersA}{49} \re@DeclareMathSymbol{\vary}{\mathord}{lettersA}{50} @@ -984,6 +999,13 @@ amssymbols,uprightGreek} \re@DeclareMathSymbol{\varw}{\mathord}{lettersA}{52} \DeclareMathSymbol{\uppartial}{\mathord}{lettersA}{64}%added 20120416 +\def\ntx@UC{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} +\def\ntx@lc{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} +\def\ntx@num{0,1,2,3,4,5,6,7,8,9} + + +%\@for\ntx@x:=\ntx@UC\do{\edef\ntx@tmp{\edef\csname +%\DeclareMathSymbol{\m@thbbch@rA}{\mathord}{lettersA}{129} \DeclareMathSymbol{\m@thbbch@rA}{\mathord}{lettersA}{129} \DeclareMathSymbol{\m@thbbch@rB}{\mathord}{lettersA}{130} \DeclareMathSymbol{\m@thbbch@rC}{\mathord}{lettersA}{131} @@ -1012,28 +1034,63 @@ amssymbols,uprightGreek} \DeclareMathSymbol{\m@thbbch@rZ}{\mathord}{lettersA}{154} \DeclareMathSymbol{\m@thbbch@rk}{\mathord}{lettersA}{171} - -\long\def\DoLongFutureLet #1#2#3#4{% - \def\@FutureLetDecide{#1#2\@FutureLetToken - \def\@FutureLetNext{#3}\else - \def\@FutureLetNext{#4}\fi\@FutureLetNext} - \futurelet\@FutureLetToken\@FutureLetDecide} -\def\DoFutureLet #1#2#3#4{\DoLongFutureLet{#1}{#2}{#3}{#4}} -\def\@EachCharacter{\DoFutureLet{\ifx}{\@EndEachCharacter}% - {\@EachCharacterDone}{\@PickUpTheCharacter}} +% Original \varmathbb macro, slightly polished +\def\DoFutureLet{% + \def\@FutureLetDecide{% + \ifx\@nil\@FutureLetToken + \def\@FutureLetNext{\@EachCharacterDone} + \else + \def\@FutureLetNext{\@PickUpTheCharacter} + \fi + \@FutureLetNext + }% +\futurelet\@FutureLetToken\@FutureLetDecide}% end DoFutureLet + +%\def\m@keCharacter#1{% +% \@tempcnta=`#1\relax \advance\@tempcnta "40\relax +% \edef\ntx@char{\ntx@lettersA\nhex{2}{\the\@tempcnta}} +% \expandafter\mathchar\ntx@char} +%\def\@PickUpTheCharacter#1{\m@keCharacter{#1}\DoFutureLet} +%\def\@EachCharacterDone \@nil{}% cleanup---get rid of \@nil +%\newif\ifntx@notnil +%\def\@EachCharacter{% +% \DoFutureLet{\@EachCharacterDone}{\@PickUpTheCharacter}} +% \def\m@keCharacter#1{\csname\F@ntPrefix#1\endcsname} -\def\@PickUpTheCharacter#1{\m@keCharacter{#1}\@EachCharacter} -\def\@EachCharacterDone \@EndEachCharacter{} - +\def\@PickUpTheCharacter#1{\m@keCharacter{#1}\DoFutureLet} +\def\@EachCharacterDone \@nil{} +% +%\DeclareRobustCommand*{\varmathbb}[1]{\gdef\F@ntPrefix{m@thbbch@r}% +% \@EachCharacter #1\@nil} \DeclareRobustCommand*{\varmathbb}[1]{\gdef\F@ntPrefix{m@thbbch@r}% - \@EachCharacter #1\@EndEachCharacter} - -\iftx@varbb - \let\mathbb\varmathbb + \DoFutureLet #1\@nil} + +% Additional macros to access process a single character only, work with \bm +\def\ntx@char{} +\DeclareRobustCommand*{\vmathbb}[1]{% for original variant bb + \@tempcnta=`#1\relax \advance\@tempcnta "40\relax + \edef\ntx@char{"\hexnumber@\symlettersA\nhex{2}{\the\@tempcnta}} + \expandafter\mathchar\ntx@char +} +\DeclareRobustCommand*{\vvmathbb}[1]{% for new (STIX) variant + \@tempcnta=`#1\relax \advance\@tempcnta "80\relax + \edef\ntx@char{"\hexnumber@\symlettersA\nhex{2}{\the\@tempcnta}} + \expandafter\mathchar\ntx@char +} +%\DeclareRobustCommand*{\vvmathbbb}[1]{% for new (STIX) variant +% \@tempcnta=`#1\relax \advance\@tempcnta "80\relax +% \edef\ntx@char{"\hexnumber@\symboldlettersA\nhex{2}{\the\@tempcnta}} +% \expandafter\mathchar\ntx@char +%} +\iftx@vvarbb + \let\mathbb\vvarmathbb \else - \iftx@ams\else\let\mathbb\varmathbb\fi + \iftx@varbb + \let\mathbb\varmathbb + \else + \iftx@ams\else\let\mathbb\varmathbb\fi + \fi \fi - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Math Extension (ntxex) Definition % largesymbols %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1210,4 +1267,39 @@ amssymbols,uprightGreek} \DeclareMathSizes{20.74}{20.74}{16.1} {11.4} \DeclareMathSizes{24.88}{24.88}{18.2}{13.7} +\def\txf@ntname#1{\expandafter\let\expandafter\@ntx@\csname sym#1\endcsname + \ifx\@ntx@\relax % + \else + \expandafter\def\csname @@@X\number\@ntx@ \endcsname{#1} + \fi} +\newcommand{\ShowMathFonts}{% +\txf@ntname{operators} +\txf@ntname{boldoperators} +\txf@ntname{symbols} +\txf@ntname{boldsymbols} +\txf@ntname{largesymbols} +\txf@ntname{boldlargesymbols} +\txf@ntname{AMSa} +\txf@ntname{boldAMSa} +\txf@ntname{AMSb} +\txf@ntname{boldAMSb} +\txf@ntname{letters} +\txf@ntname{boldletters} +\txf@ntname{lettersA} +\txf@ntname{boldlettersA} +\txf@ntname{symbolsC} +\txf@ntname{boldsymbolsC} +\txf@ntname{largesymbolsA} +\txf@ntname{boldlargesymbolsA} + \typeout{*** Mathgroups ***} + \count@\z@ + \loop\ifnum\count@<16 + \def\@@ntx@{} + \expandafter\let\expandafter\@ntx@\csname @@@X\the\count@\endcsname + \ifx\@ntx@\relax\else\def\@@ntx@{\space[\@ntx@]}\fi + \typeout{(\the\count@: \the\textfont\count@ = \fontname\textfont\count@\@@ntx@)} + \advance\count@\@ne + \repeat + \typeout{***}} + \endinput diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index 73157f55121..057ba653f1d 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty @@ -12,7 +12,7 @@ % Added scaled keyword and osf option; % Modified the definition of \k to bypass problem with grouping; -\def\fileversion{0.94} +\def\fileversion{0.95} \def\filedate{2012/05/23} \ProvidesPackage{newtxtext}[\filedate\space v\fileversion] |