From 30ae7ee6eed959e0df4c31b3e35ebc7cb6f8f9c3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 26 Sep 2015 21:15:38 +0000 Subject: newtx (26sep15) git-svn-id: svn://tug.org/texlive/trunk@38467 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/fonts/newtx/README | 5 ++- Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 44 +++++++++++++++---------- Master/texmf-dist/tex/latex/newtx/newtxtext.sty | 4 +-- 3 files changed, 33 insertions(+), 20 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/fonts/newtx/README b/Master/texmf-dist/doc/fonts/newtx/README index 866fc1880f6..0615bbb2e31 100644 --- a/Master/texmf-dist/doc/fonts/newtx/README +++ b/Master/texmf-dist/doc/fonts/newtx/README @@ -1,10 +1,13 @@ This package, initially 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.461 2015-09-14 +Current version: 1.462 2015-09-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.462 +Changes to newtxmath.sty to handle mismatched choices of fonts in text and math operators/math italic. + Changes in version 1.461 1. Removed second \newif\ntx@babel, which was causing misbehavior. 2. Added definition of \LGCscale for use with Tempora and similar packages containing Greek and Cyrillic to match Times text. diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index 93b12c33956..d2c9e5f7271 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.461} -\def\filedate{2015/09/14} +\def\fileversion{1.462} +\def\filedate{2015/09/24} \ProvidesPackage{newtxmath}[\filedate\space v\fileversion] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -56,13 +56,18 @@ \newif\iftx@minion \newif\iftx@libaltvw \newif\iftx@bv \newif\iftx@ut \newif\iftx@ch \newif\iftx@crimson \newif\iftx@ot % use OT1 for operators +\newif\iftx@ntxmath \tx@ntxmathtrue % default is Times operators and math italic \def\@tx@ptm{ptm} \newif\iftx@ptm \edef\tx@rmdefault{\rmdefault} \edef\tx@encdefault{\encodingdefault} \tx@ottrue % default is true -\let\rmdefaultB\rmdefault -\ifx\tx@rmdefault\@tx@ptm \def\rmdefaultB{ntxtlf}\fi % newtxtext +\let\rmdefaultB\rmdefault +\newif\iftx@hastm +\ifx\tx@rmdefault\@tx@ptm \tx@hastmtrue\fi\@ifundefined{ver@newtxtext.sty}{}{\tx@hastmtrue} +\@ifundefined{ver@tgtermes.sty}{}{\tx@hastmtrue} +\iftx@hastm\def\rmdefaultB{ntxtlf}\fi +% \newcommand\enablesbcorrection{\AtBeginDocument{\mathcode`\_=\string"8000 \catcode`\_=12\relax}} \newcommand\disablesbcorrection{\catcode`\_=8\relax} \DeclareOption{nosubscriptcorrection}{\disablesbcorrection} @@ -73,19 +78,19 @@ \DeclareOption{vvarbb}{\tx@vvarbbtrue} \DeclareOption{libaltvw}{\tx@libaltvwtrue} \DeclareOption{nosymbolsc}{\tx@symbolsCfalse} -\DeclareOption{libertine}{\tx@libertinetrue} -\DeclareOption{minion}{\tx@miniontrue\tx@otfalse} -\DeclareOption{crimson}{\tx@crimsontrue} -\DeclareOption{garamondx}{\tx@gmtrue\tx@otfalse} -\DeclareOption{baskervaldx}{\tx@bvtrue\tx@otfalse} -\DeclareOption{Baskervaldx}{\tx@bvtrue\tx@otfalse} -\DeclareOption{utopia}{\tx@uttrue\tx@otfalse} -\DeclareOption{heuristica}{\tx@uttrue\tx@otfalse} -\DeclareOption{Heuristica}{\tx@uttrue\tx@otfalse} -\DeclareOption{Erewhon}{\tx@uttrue\tx@otfalse} -\DeclareOption{erewhon}{\tx@uttrue\tx@otfalse} -\DeclareOption{charter}{\tx@chtrue} -\DeclareOption{xcharter}{\tx@chtrue} +\DeclareOption{libertine}{\tx@libertinetrue\tx@ntxmathfalse} +\DeclareOption{minion}{\tx@miniontrue\tx@ntxmathfalse\tx@otfalse} +\DeclareOption{crimson}{\tx@crimsontrue\tx@ntxmathfalse} +\DeclareOption{garamondx}{\tx@gmtrue\tx@ntxmathfalse\tx@otfalse} +\DeclareOption{baskervaldx}{\tx@bvtrue\tx@ntxmathfalse\tx@otfalse} +\DeclareOption{Baskervaldx}{\tx@bvtrue\tx@ntxmathfalse\tx@otfalse} +\DeclareOption{utopia}{\tx@uttrue\tx@ntxmathfalse\tx@otfalse} +\DeclareOption{heuristica}{\tx@uttrue\tx@ntxmathfalse\tx@otfalse} +\DeclareOption{Heuristica}{\tx@uttrue\tx@ntxmathfalse\tx@otfalse} +\DeclareOption{Erewhon}{\tx@uttrue\tx@ntxmathfalse\tx@otfalse} +\DeclareOption{erewhon}{\tx@uttrue\tx@ntxmathfalse\tx@otfalse} +\DeclareOption{charter}{\tx@chtrue\tx@ntxmathfalse} +\DeclareOption{xcharter}{\tx@chtrue\tx@ntxmathfalse} \DeclareOption{cmintegrals}{\tx@cminttrue} \DeclareOption{cmbraces}{\tx@bracestrue} \DeclareOption{noamssymbols}{\tx@amsfalse} @@ -120,6 +125,11 @@ amssymbols,uprightGreek,nosubscriptcorrection} \renewcommand{\rmdefault}{minlibertine}% since can't load libertine twice \fi \fi +\else + \iftx@libertine + \ifx\iflibertine@otf\undefined % libertine text not loaded + \tx@otfalse + \fi\fi \fi \edef\bold@wt{\ifx\iflibertine@otf\undefined b\else sb\fi} \let\tx@enc\encodingdefault diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index 42bd4ea4650..91eadce7757 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty @@ -1,7 +1,7 @@ \NeedsTeXFormat{LaTeX2e} -\def\fileversion{1.461} -\def\filedate{2015/09/14} +\def\fileversion{1.462} +\def\filedate{2015/09/24} \ProvidesPackage{newtxtext}[\filedate\space v\fileversion] \message{`newtxtext' v\fileversion, \filedate\space Text macros taking advantage of TeX-Gyre Termes fonts (msharpe)} -- cgit v1.2.3