summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
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/newtxtext.sty
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/newtxtext.sty')
-rw-r--r--Master/texmf-dist/tex/latex/newtx/newtxtext.sty21
1 files changed, 13 insertions, 8 deletions
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}