newtx (12mar14)

git-svn-id: svn://tug.org/texlive/trunk@33159 c570f23f-e606-0410-a88d-b1316a301751

11 files changed, 53 insertions, 28 deletions

diff --git a/Master/texmf-dist/doc/fonts/newtx/README b/Master/texmf-dist/doc/fonts/newtx/README
index 491f917d2c1..c03d6ed8b38 100644
--- a/Master/texmf-dist/doc/fonts/newtx/README
+++ b/Master/texmf-dist/doc/fonts/newtx/README
@@ -1,10 +1,14 @@
 This package, based on txfonts, provides many fixes and enhancements to the txfonts package, splitting it into two separate packages---newtxtext and newtxmath, which may be run independently of one another. It provides scaling, improved metrics, and other options. In particular, newtxmath offers a libertine option which substitutes Linux Libertine (provided with TeXLive and MikTeX) italic and Greek letters for the default Times letters, providing a good match for the Libertine text font, which is heavier than Computer Modern but lighter than Times, and in my experience, looks very sharp and clear on the screen.
 
-Current version: 1.23
+Current version: 1.24
 
 This material is subject to the LaTeX Project Public License. See http://www.ctan.org/license/lppl1.3
 for the details of that license.
 
+Changes in version 1.24
+1. Modified math macros to always use mathaccents from newtxtext, as the accents from libertine and other text fonts proved to be not always suitable as math accents.
+2. Added \RequirePackage{textcomp} to newtxtext.sty
+
 Changes in version 1.23
 1. Added macros and glyphs for mathaccents \widearc and \wideOarc.
 2. Added code to newtxtext.sty so that option osf does not affect math use of lining figures, making \useosf unnecessary but harmless. (Thanks to Pablo González for this fine suggestion.)
diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntxbmia.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxbmia.tfm
index 08fd41c3b4c..74306ebdd37 100644
--- a/Master/texmf-dist/fonts/tfm/public/newtx/ntxbmia.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntxbmia.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntxmia.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxmia.tfm
index a2634999601..fd0f746e5ce 100644
--- a/Master/texmf-dist/fonts/tfm/public/newtx/ntxmia.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntxmia.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/nxlbmia.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/nxlbmia.tfm
index 65b91e687cd..9822e07e6e4 100644
--- a/Master/texmf-dist/fonts/tfm/public/newtx/nxlbmia.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/newtx/nxlbmia.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/nxlmia.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/nxlmia.tfm
index ba1e41e9664..e7be10beadd 100644
--- a/Master/texmf-dist/fonts/tfm/public/newtx/nxlmia.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/newtx/nxlmia.tfm
diff --git a/Master/texmf-dist/fonts/vf/public/newtx/ntxbmia.vf b/Master/texmf-dist/fonts/vf/public/newtx/ntxbmia.vf
index bf49d898e20..70560662453 100644
--- a/Master/texmf-dist/fonts/vf/public/newtx/ntxbmia.vf
+++ b/Master/texmf-dist/fonts/vf/public/newtx/ntxbmia.vf
diff --git a/Master/texmf-dist/fonts/vf/public/newtx/ntxmia.vf b/Master/texmf-dist/fonts/vf/public/newtx/ntxmia.vf
index 124e8e239e9..01ccdb29e04 100644
--- a/Master/texmf-dist/fonts/vf/public/newtx/ntxmia.vf
+++ b/Master/texmf-dist/fonts/vf/public/newtx/ntxmia.vf
diff --git a/Master/texmf-dist/fonts/vf/public/newtx/nxlbmia.vf b/Master/texmf-dist/fonts/vf/public/newtx/nxlbmia.vf
index 7841b873b1e..aab2cf1c126 100644
--- a/Master/texmf-dist/fonts/vf/public/newtx/nxlbmia.vf
+++ b/Master/texmf-dist/fonts/vf/public/newtx/nxlbmia.vf
diff --git a/Master/texmf-dist/fonts/vf/public/newtx/nxlmia.vf b/Master/texmf-dist/fonts/vf/public/newtx/nxlmia.vf
index 27d8dac3f37..ffcbac6afd6 100644
--- a/Master/texmf-dist/fonts/vf/public/newtx/nxlmia.vf
+++ b/Master/texmf-dist/fonts/vf/public/newtx/nxlmia.vf
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}