summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/newtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-03-12 22:32:33 +0000
committerKarl Berry <karl@freefriends.org>2014-03-12 22:32:33 +0000
commitb2f136b4ef89ad57771cb79327eb0745a7c93bd1 (patch)
tree4545cef80d50acc13813fa35766ca2cb8ca8873e /Master/texmf-dist/tex/latex/newtx
parentb27ee7c89da56f1fba9ac6255c30a5ba887c29a3 (diff)
newtx (12mar14)
git-svn-id: svn://tug.org/texlive/trunk@33159 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/newtx')
-rw-r--r--Master/texmf-dist/tex/latex/newtx/newtxmath.sty54
-rw-r--r--Master/texmf-dist/tex/latex/newtx/newtxtext.sty21
2 files changed, 48 insertions, 27 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
index 2713a926e47..62375bd05f8 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.221}
-\def\filedate{2014/02/12}
+\def\fileversion{1.24}
+\def\filedate{2014/03/11}
\ProvidesPackage{newtxmath}
[\filedate\space v\fileversion]
\@ifundefined{newtxmathLoaded}{}{\endinput}
@@ -344,25 +344,36 @@ amssymbols,uprightGreek}
%\DeclareMathAccent{\dot}{\mathalpha}{operators}{95}
%\DeclareMathAccent{\tilde}{\mathalpha}{operators}{126}
%\DeclareMathAccent{\ddot}{\mathalpha}{operators}{127}
+\re@DeclareMathAccent{\grave}{\mathalpha}{lettersA}{254}
+\re@DeclareMathAccent{\acute}{\mathalpha}{lettersA}{255}
+\re@DeclareMathAccent{\check}{\mathalpha}{lettersA}{186}
+\re@DeclareMathAccent{\breve}{\mathalpha}{lettersA}{187}
+\re@DeclareMathAccent{\bar}{\mathalpha}{lettersA}{221}
+\re@DeclareMathAccent{\mathring}{\mathalpha}{lettersA}{222}
+\re@DeclareMathAccent{\hat}{\mathalpha}{lettersA}{223}
+\re@DeclareMathAccent{\dot}{\mathalpha}{lettersA}{224}
+\re@DeclareMathAccent{\tilde}{\mathalpha}{lettersA}{219}
+\re@DeclareMathAccent{\ddot}{\mathalpha}{lettersA}{220}
+
\def\ly@one{LY1}
\def\t@one{T1}
-\ifx\encodingdefault\t@one%
- \re@DeclareMathAccent{\grave}{\mathalpha}{operators}{0}
- \re@DeclareMathAccent{\acute}{\mathalpha}{operators}{1}
- \re@DeclareMathAccent{\check}{\mathalpha}{operators}{7}
- \re@DeclareMathAccent{\breve}{\mathalpha}{operators}{8}
- \re@DeclareMathAccent{\bar}{\mathalpha}{operators}{9}
- \re@DeclareMathAccent{\mathring}{\mathalpha}{operators}{6}
- \re@DeclareMathAccent{\hat}{\mathalpha}{operators}{2}
- \re@DeclareMathAccent{\dot}{\mathalpha}{operators}{10}
- \re@DeclareMathAccent{\tilde}{\mathalpha}{operators}{3}
- \re@DeclareMathAccent{\ddot}{\mathalpha}{operators}{4}
-\else\ifx\encodingdefault\ly@one
- \re@DeclareMathAccent{\bar}{\mathalpha}{operators}{175}
- \re@DeclareMathAccent{\hat}{\mathalpha}{operators}{94}
- \re@DeclareMathAccent{\dot}{\mathalpha}{operators}{5}
+%\ifx\encodingdefault\t@one%
+% \re@DeclareMathAccent{\grave}{\mathalpha}{operators}{0}
+% \re@DeclareMathAccent{\acute}{\mathalpha}{operators}{1}
+% \re@DeclareMathAccent{\check}{\mathalpha}{operators}{7}
+% \re@DeclareMathAccent{\breve}{\mathalpha}{operators}{8}
+% \re@DeclareMathAccent{\bar}{\mathalpha}{operators}{9}
+% \re@DeclareMathAccent{\mathring}{\mathalpha}{operators}{6}
+% \re@DeclareMathAccent{\hat}{\mathalpha}{operators}{2}
+% \re@DeclareMathAccent{\dot}{\mathalpha}{operators}{10}
+% \re@DeclareMathAccent{\tilde}{\mathalpha}{operators}{3}
+% \re@DeclareMathAccent{\ddot}{\mathalpha}{operators}{4}
+%\else\ifx\encodingdefault\ly@one
+% \re@DeclareMathAccent{\bar}{\mathalpha}{operators}{175}
+% \re@DeclareMathAccent{\hat}{\mathalpha}{operators}{94}
+% \re@DeclareMathAccent{\dot}{\mathalpha}{operators}{5}
% \DeclareMathAccent{\tilde}{\mathalpha}{operators}{152}
-\fi\fi
+%\fi\fi
%
\iftx@slantedG
\re@DeclareMathSymbol{\Gamma}{\mathord}{letters}{0}
@@ -608,10 +619,13 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\def\upgroupfillla{$\m@th%
\grouplua\mkern-1mu\cleaders\hbox{$\mkern-.5mu\br@cext\mkern-.5mu$}\hfill\mkern-1mu\groupru$}
-
% Place a ring over an overgroup symbol, like yhmath \widering
\newcommand{\widering}[1]{\overset{\smash{\vbox to .2ex{%
\hbox{$\mathring{}$}}}}{\overgroup{#1}}}
+
+% \widearc, \wideOarc
+\DeclareMathAccent{\widearc}{\mathalpha}{largesymbols}{175}
+\DeclareMathAccent{\wideOarc}{\mathalpha}{largesymbols}{180}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Math Symbol A Definitions % AMSa
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -854,12 +868,14 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\iftx@symbolsC
\re@DeclareMathSymbol{\mappedfromchar}{\mathrel}{symbolsC}{0}
\def\mappedfrom{\leftarrow\mappedfromchar}
+ \let\mapsfrom\mappedfrom
\def\longmappedfrom{\longleftarrow\mappedfromchar}
\re@DeclareMathSymbol{\Mapstochar}{\mathrel}{symbolsC}{1}
\def\Mapsto{\Mapstochar\Rightarrow}
\def\Longmapsto{\Mapstochar\Longrightarrow}
\re@DeclareMathSymbol{\Mappedfromchar}{\mathrel}{symbolsC}{2}
\def\Mappedfrom{\Leftarrow\Mappedfromchar}
+ \let\Mapsfrom\Mappedfrom
\def\Longmappedfrom{\Longleftarrow\Mappedfromchar}
\re@DeclareMathSymbol{\mmapstochar}{\mathrel}{symbolsC}{3}
\def\mmapsto{\mmapstochar\rightarrow}
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
index 830eb3565e2..2499d576e0c 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.221}
-\def\filedate{2014/02/12}
+\def\fileversion{1.24}
+\def\filedate{2014/03/11}
\ProvidesPackage{newtxtext}[\filedate\space v\fileversion]
\message{`newtxtext' v\fileversion, \filedate\space Text macros based on txfonts (msharpe)}
@@ -23,7 +23,11 @@
\let\orig@footnote=\thefootnote
\let\orig@makefnmark=\@makefnmark
-\RequirePackage{xkeyval}
+\RequirePackage{xkeyval,etoolbox}
+\renewcommand*{\rmdefault}{ntxrx}
+\def\useosf{\AtEndPreamble{\renewcommand*{\rmdefault}{ntxrj}}}
+\@onlypreamble\useosf
+
\newif\ifntx@defaultsups
\define@boolkey{ntx}{defaultsups}[true]{%
\csname ntx@defaultsups#1\endcsname}
@@ -36,8 +40,9 @@
\noexpand\setkeys{ntx}{\CurrentOption}}%
\x}
\def\ntx@style{x}% default is lining figures
-\DeclareOption{osf}{\def\ntx@style{j}}
-\DeclareOption{oldstyle}{\def\ntx@style{j}}
+\DeclareOption{osf}{\useosf}
+%\DeclareOption{osf}{\def\ntx@style{j}}
+\DeclareOption{oldstyle}{\useosf}
\setkeys{ntx}{helvratio} % set this first, at least to default 0.9
\setkeys{ntx}{scaled} % get at least default
\ProcessOptions*
@@ -45,6 +50,8 @@
\edef\qhv@scale{\strip@pt\@tempdima}
\RequirePackage[T1]{fontenc}
+\RequirePackage{textcomp}
+
\DeclareRobustCommand{\sustyle}{%
\not@math@alphabet\sustyle\relax
\fontfamily{ntxr1}\selectfont}
@@ -69,9 +76,7 @@
% Text Serif (Times) %
%%%%%%%%%%%%%%%%%%%%%%
-\renewcommand*{\rmdefault}{ntxr\ntx@style}
-\def\useosf{\renewcommand*{\rmdefault}{ntxrj}}
-\@onlypreamble\useosf
+%\renewcommand*{\rmdefault}{ntxr\ntx@style}
%\DeclareSymbolFont{operators}{OT1}{txr}{m}{n}
%\SetSymbolFont{operators}{bold}{OT1}{txr}{bx}{n}