diff options
author | Karl Berry <karl@freefriends.org> | 2013-09-12 23:15:48 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-09-12 23:15:48 +0000 |
commit | 1e5cfa8d8b476492b05fa4fa3c01b565dde35783 (patch) | |
tree | c4c61ed153df303b0d825cfc62b437c552acc1a7 /Master/texmf-dist/tex/latex/newtx | |
parent | f01985a9e0f93587cfadf40ad4ea7de7b8230239 (diff) |
newtx (12sep13)
git-svn-id: svn://tug.org/texlive/trunk@31636 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/newtx')
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 185 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxtext.sty | 6 |
2 files changed, 128 insertions, 63 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index db0b4186c3b..56e87661afb 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.13} -\def\filedate{2013/08/07} +\def\fileversion{1.14} +\def\filedate{2013/09/04} \ProvidesPackage{newtxmath} [\filedate\space v\fileversion] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -24,6 +24,7 @@ \input{binhex} \RequirePackage{xkeyval} +\let\ntxmath@scaled\@empty \define@key{ntxmath}{scaled}[1.0]{\def\ntxmath@scaled{s*[#1]}} \DeclareOption*{% \begingroup @@ -34,11 +35,12 @@ \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 -\newif\iftx@gm +\newif\iftx@gm \newif\iftx@bigdelims \tx@symbolsCtrue \newif\iftx@altnu \newif\iftx@largelibfigs \newif\iftx@minion \newif\iftx@libaltvw +\DeclareOption{bigdelims}{\tx@bigdelimstrue} \DeclareOption{varbb}{\tx@varbbtrue} \DeclareOption{vvarbb}{\tx@vvarbbtrue} \DeclareOption{libaltvw}{\tx@libaltvwtrue} @@ -58,6 +60,8 @@ amssymbols,uprightGreek} \ProcessOptions* +%bigdelims cancels cmbraces +\iftx@bigdelims\tx@bracesfalse\fi % No varg option with option libertine or option minion or garamond \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 @@ -169,15 +173,23 @@ amssymbols,uprightGreek} %%%%%%%%%%%%%%%%%% % Math Extension % %%%%%%%%%%%%%%%%%% - -\iftx@braces% - \DeclareSymbolFont{largesymbols}{OMX}{ntxexv}{m}{n} - \SetSymbolFont{largesymbols}{bold}{OMX}{ntxexv}{b}{n} - \DeclareFontSubstitution{OMX}{ntxexv}{m}{n} -\else% - \DeclareSymbolFont{largesymbols}{OMX}{ntxex}{m}{n} - \SetSymbolFont{largesymbols}{bold}{OMX}{ntxex}{b}{n} - \DeclareFontSubstitution{OMX}{ntxex}{m}{n} +% no OMX used +\DeclareFontEncoding{LMX}{}{} +\DeclareFontSubstitution{LMX}{ntxexx}{m}{n} +\DeclareFontFamily{LMX}{ntxexx}{} +\DeclareFontShape{LMX}{ntxexx}{m}{n}{<-> \ntxmath@scaled ntxexx}{} +\DeclareFontShape{LMX}{ntxexx}{b}{n}{<-> \ntxmath@scaled ntxbexx}{} +\DeclareFontShape{LMX}{ntxexx}{bx}{n}{<->ssub ntxexx/b/n}{} +\DeclareSymbolFont{largesymbols}{LMX}{ntxexx}{m}{n} +\SetSymbolFont{largesymbols}{bold}{LMX}{ntxexx}{b}{n} + +\iftx@bigdelims + %default definitions of \big etc need some changes + %\renewcommand{\big}{\bBigg@\@ne} + \AtBeginDocument{\renewcommand{\Big}{\bBigg@{1.3}} + \renewcommand{\bigg}{\bBigg@{1.73}} + \renewcommand{\Bigg}{\bBigg@{2.16}} + } \fi% %%%%%%%%%%%%%%%%%%%% % Math Extension A % @@ -263,14 +275,45 @@ amssymbols,uprightGreek} %Change the following two so we can adjust metrics in math mode %\DeclareMathDelimiter{(}{\mathopen}{operators}{40}{largesymbols}{0} %\DeclareMathDelimiter{)}{\mathclose}{operators}{41}{largesymbols}{1} -\iftx@minion\else - \iftx@libertine% - \DeclareMathDelimiter{(}{\mathopen}{lettersA}{123}{largesymbols}{0} - \DeclareMathDelimiter{)}{\mathclose}{lettersA}{124}{largesymbols}{1} - \else %Times - \DeclareMathDelimiter{(}{\mathopen}{lettersA}{125}{largesymbols}{0} - \DeclareMathDelimiter{)}{\mathclose}{lettersA}{126}{largesymbols}{1} +\iftx@bigdelims + \DeclareMathDelimiter{(}{\mathopen}{lettersA}{155}{largesymbols}{130} + \DeclareMathDelimiter{)}{\mathclose}{lettersA}{156}{largesymbols}{131} + \DeclareMathDelimiter{[}{\mathopen}{lettersA}{157}{largesymbols}{132} + \DeclareMathDelimiter{]}{\mathclose}{lettersA}{158}{largesymbols}{133} + \DeclareMathDelimiter{\lfloor}{\mathopen}{lettersA}{159}{largesymbols}{134} + \DeclareMathDelimiter{\rfloor}{\mathclose}{lettersA}{160}{largesymbols}{135} + \DeclareMathDelimiter{\lceil}{\mathopen}{lettersA}{161}{largesymbols}{136} + \DeclareMathDelimiter{\rceil}{\mathclose}{lettersA}{162}{largesymbols}{137} + \DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{163}{largesymbols}{138} + \DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{164}{largesymbols}{139} + \DeclareMathDelimiter{\langle}{\mathopen}{lettersA}{165}{largesymbols}{140} + \DeclareMathDelimiter{<}{\mathopen}{lettersA}{165}{largesymbols}{140} + \DeclareMathDelimiter{\rangle}{\mathclose}{lettersA}{166}{largesymbols}{141} + \DeclareMathDelimiter{>}{\mathclose}{lettersA}{166}{largesymbols}{141} + \DeclareMathSymbol{\mid}{\mathrel}{lettersA}{96} + \DeclareMathDelimiter{|}{\mathord}{lettersA}{96}{largesymbols}{128} + \DeclareMathDelimiter{\arrowvert}{\mathord}{lettersA}{167}{largesymbols}{60} + \DeclareMathDelimiter{\vert}{\mathord}{lettersA}{96}{largesymbols}{128} + %\DeclareMathSymbol{\parallel}{\mathrel}{lettersA}{129} + \DeclareMathDelimiter{\Arrowvert}{\mathord}{lettersA}{168}{largesymbols}{61} + \DeclareMathDelimiter{\Vert}{\mathord}{lettersA}{128}{largesymbols}{129} + \let\|=\Vert + \DeclareMathDelimiter{\updownarrow}{\mathrel}{lettersA}{167}{largesymbols}{63} + \DeclareMathDelimiter{\Updownarrow}{\mathrel}{lettersA}{167}{largesymbols}{119} +\else + \iftx@braces + \DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{142} + \DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{143} \fi + \iftx@minion\else + \iftx@libertine% + \DeclareMathDelimiter{(}{\mathopen}{lettersA}{123}{largesymbols}{0} + \DeclareMathDelimiter{)}{\mathclose}{lettersA}{124}{largesymbols}{1} + \else %Times + \DeclareMathDelimiter{(}{\mathopen}{lettersA}{125}{largesymbols}{0} + \DeclareMathDelimiter{)}{\mathclose}{lettersA}{126}{largesymbols}{1} + \fi + \fi \fi %\DeclareMathSymbol{+}{\mathbin}{operators}{43} %\DeclareMathDelimiter{/}{\mathord}{operators}{47}{largesymbols}{14} @@ -279,6 +322,7 @@ amssymbols,uprightGreek} %\DeclareMathSymbol{;}{\mathpunct}{operators}{59} \DeclareMathSymbol{=}{\mathrel}{lettersA}{61} %\DeclareMathSymbol{?}{\mathclose}{operators}{63} +%change the following two for better sizing %\DeclareMathDelimiter{[}{\mathopen}{operators}{91}{largesymbols}{2} %\DeclareMathDelimiter{]}{\mathclose}{operators}{93}{largesymbols}{3} %\DeclareMathAccent{\hat}{\mathalpha}{operators}{94} @@ -467,11 +511,30 @@ amssymbols,uprightGreek} %\DeclareMathSymbol{\diamondsuit}{\mathord}{symbols}{125} %\DeclareMathSymbol{\heartsuit}{\mathord}{symbols}{126} %\DeclareMathSymbol{\spadesuit}{\mathord}{symbols}{127} -\iftx@braces% - \re@DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{8} - \re@DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{9} -\fi - +%\iftx@bigdelims +% \re@DeclareMathDelimiter{(}{\mathopen}{lettersA}{62}{largesymbols}{8} +% \re@DeclareMathDelimiter{)}{\mathclose}{lettersA}{63}{largesymbols}{9} +% \re@DeclareMathDelimiter{[}{\mathopen}{lettersA}{62}{largesymbols}{8} +% \re@DeclareMathDelimiter{]}{\mathclose}{lettersA}{63}{largesymbols}{9} +% \re@DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{8} +% \re@DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{9} +% \re@DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{8} +% \re@DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{9} +% \re@DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{8} +% \re@DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{9} +% \re@DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{8} +% \re@DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{9} +% \re@DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{8} +% \re@DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{9} +% \re@DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{8} +% \re@DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{9} +% +%\else +% \iftx@braces% +% \re@DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{8} +% \re@DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{9} +% \fi +%\fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Math Symbol A Definitions % AMSa %%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1178,65 +1241,67 @@ amssymbols,uprightGreek} \re@DeclareMathSymbol{\br@cext}{\mathord}{largesymbolsTXA}{32} % \iftx@cmint -% added 2012-04-16 - \re@DeclareMathSymbol{\ointop}{\mathop}{largesymbolsTXA}{84} - \re@DeclareMathSymbol{\intop}{\mathop}{largesymbolsTXA}{86} - \ifx\AmSfont\@undefined - \def\oint{\ointop\nolimits} - \def\int{\intop\nolimits} - \fi + \re@DeclareMathSymbol{\ointop}{\mathop}{largesymbols}{150} + \re@DeclareMathSymbol{\intop}{\mathop}{largesymbols}{152} +% \ifx\AmSfont\@undefined +% \def\oint{\ointop\nolimits} +% \def\int{\intop\nolimits} +% \fi \else % use tx integrals - \ifx\AmSfont\@undefined\else - % The following are needed if amsmath has been loaded - \let\iint\relax - \let\iiint\relax - \let\iiiint\relax - \let\idotsint\relax - \fi +% \ifx\AmSfont\@undefined\else +% % The following are needed if amsmath has been loaded +% \let\iint\relax +% \let\iiint\relax +% \let\iiiint\relax +% \let\idotsint\relax +% \fi +%\renewcommand{\iint}{\DOTSI\protect\MultiIntegral{2}} +%\renewcommand{\iiint}{\DOTSI\protect\MultiIntegral{3}} +%\renewcommand{\iiiint}{\DOTSI\protect\MultiIntegral{4}} \re@DeclareMathSymbol{\oiintop}{\mathop}{largesymbolsTXA}{8} - \def\oiint{\oiintop\nolimits} + \def\oiint{\oiintop\ilimits@} \re@DeclareMathSymbol{\ointctrclockwiseop}{\mathop}{largesymbolsTXA}{10} - \def\ointctrclockwise{\ointctrclockwiseop\nolimits} + \def\ointctrclockwise{\ointctrclockwiseop\ilimits@} \re@DeclareMathSymbol{\ointclockwiseop}{\mathop}{largesymbolsTXA}{12} - \def\ointclockwise{\ointclockwiseop\nolimits} + \def\ointclockwise{\ointclockwiseop\ilimits@} \re@DeclareMathSymbol{\sqintop}{\mathop}{largesymbolsTXA}{14} - \def\sqint{\sqintop\nolimits} + \def\sqint{\sqintop\ilimits@} \re@DeclareMathSymbol{\iintop}{\mathop}{largesymbolsTXA}{33} - \def\iint{\iintop\nolimits} + \def\iint{\iintop\ilimits@} \re@DeclareMathSymbol{\iiintop}{\mathop}{largesymbolsTXA}{35} - \def\iiint{\iiintop\nolimits} + \def\iiint{\iiintop\ilimits@} \re@DeclareMathSymbol{\iiiintop}{\mathop}{largesymbolsTXA}{37} - \def\iiiint{\iiiintop\nolimits} + \def\iiiint{\iiiintop\ilimits@} \re@DeclareMathSymbol{\idotsintop}{\mathop}{largesymbolsTXA}{39} - \def\idotsint{\idotsintop\nolimits} + \def\idotsint{\idotsintop\ilimits@} \re@DeclareMathSymbol{\oiiintop}{\mathop}{largesymbolsTXA}{41} - \def\oiiint{\oiiintop\nolimits} + \def\oiiint{\oiiintop\ilimits@} \re@DeclareMathSymbol{\varointctrclockwiseop}{\mathop}{largesymbolsTXA}{43} - \def\varointctrclockwise{\varointctrclockwiseop\nolimits} + \def\varointctrclockwise{\varointctrclockwiseop\ilimits@} \re@DeclareMathSymbol{\varointclockwiseop}{\mathop}{largesymbolsTXA}{45} - \def\varointclockwise{\varointclockwiseop\nolimits} + \def\varointclockwise{\varointclockwiseop\ilimits@} \re@DeclareMathSymbol{\fintop}{\mathop}{largesymbolsTXA}{62} - \def\fint{\fintop\nolimits} + \def\fint{\fintop\ilimits@} \re@DeclareMathSymbol{\oiintctrclockwiseop}{\mathop}{largesymbolsTXA}{64} - \def\oiintctrclockwise{\oiintctrclockwiseop\nolimits} + \def\oiintctrclockwise{\oiintctrclockwiseop\ilimits@} \re@DeclareMathSymbol{\varoiintclockwiseop}{\mathop}{largesymbolsTXA}{66} - \def\varoiintclockwise{\varoiintclockwiseop\nolimits} + \def\varoiintclockwise{\varoiintclockwiseop\ilimits@} \re@DeclareMathSymbol{\oiiintctrclockwiseop}{\mathop}{largesymbolsTXA}{68} - \def\oiiintctrclockwise{\oiiintctrclockwiseop\nolimits} + \def\oiiintctrclockwise{\oiiintctrclockwiseop\ilimits@} \re@DeclareMathSymbol{\varoiiintclockwiseop}{\mathop}{largesymbolsTXA}{70} - \def\varoiiintclockwise{\varoiiintclockwiseop\nolimits} + \def\varoiiintclockwise{\varoiiintclockwiseop\ilimits@} \re@DeclareMathSymbol{\oiintclockwiseop}{\mathop}{largesymbolsTXA}{72} - \def\oiintclockwise{\oiintclockwiseop\nolimits} + \def\oiintclockwise{\oiintclockwiseop\ilimits@} \re@DeclareMathSymbol{\varoiintctrclockwiseop}{\mathop}{largesymbolsTXA}{74} - \def\varoiintctrclockwise{\varoiintctrclockwiseop\nolimits} + \def\varoiintctrclockwise{\varoiintctrclockwiseop\ilimits@} \re@DeclareMathSymbol{\oiiintclockwiseop}{\mathop}{largesymbolsTXA}{76} - \def\oiiintclockwise{\oiiintclockwiseop\nolimits} + \def\oiiintclockwise{\oiiintclockwiseop\ilimits@} \re@DeclareMathSymbol{\varoiiintctrclockwiseop}{\mathop}{largesymbolsTXA}{78} - \def\varoiiintctrclockwise{\varoiiintctrclockwiseop\nolimits} + \def\varoiiintctrclockwise{\varoiiintctrclockwiseop\ilimits@} \re@DeclareMathSymbol{\sqiintop}{\mathop}{largesymbolsTXA}{80} - \def\sqiint{\sqiintop\nolimits} + \def\sqiint{\sqiintop\ilimits@} \re@DeclareMathSymbol{\sqiiintop}{\mathop}{largesymbolsTXA}{82} - \def\sqiiint{\sqiiintop\nolimits} + \def\sqiiint{\sqiiintop\ilimits@} \fi diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index 0e25b8491c8..e26e49895c2 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty @@ -13,8 +13,8 @@ % Added scaled keyword and osf option; % Modified the definition of \k to bypass problem with grouping; -\def\fileversion{1.12} -\def\filedate{2013/07/20} +\def\fileversion{1.13} +\def\filedate{2013/09/07} \ProvidesPackage{newtxtext}[\filedate\space v\fileversion] \message{`newtxtext' v\fileversion, \filedate\space Text macros based on txfonts (msharpe)} @@ -48,7 +48,7 @@ % Text Serif (Times) % %%%%%%%%%%%%%%%%%%%%%% -\renewcommand{\rmdefault}{ntxr\ntx@style} +\renewcommand*{\rmdefault}{ntxr\ntx@style} \def\useosf{\renewcommand*{\rmdefault}{ntxrj}} \@onlypreamble\useosf |