From ec7a1297e2d0b24b0373221d7d7f99eca726f0e6 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Thu, 6 Nov 2014 23:27:51 +0000
Subject: newtx (6nov14)

git-svn-id: svn://tug.org/texlive/trunk@35528 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 19 ++++++++++++++-----
 Master/texmf-dist/tex/latex/newtx/newtxtext.sty |  4 ++--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
index 51459567caf..f0914688c38 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.30}
-\def\filedate{2014/10/31}
+\def\fileversion{1.31}
+\def\filedate{2014/11/05}
 \ProvidesPackage{newtxmath}
 	[\filedate\space v\fileversion]
 \@ifundefined{newtxmathLoaded}{}{\endinput}
@@ -49,6 +49,7 @@
 \newif\iftx@altnu
 \newif\iftx@largelibfigs \newif\iftx@frenchm % french math
 \newif\iftx@minion \newif\iftx@libaltvw \newif\iftx@bv \newif\iftx@ut
+\newif\iftx@ch
 \DeclareOption{timesmathacc}{\tx@tmatrue}
 \DeclareOption{bigdelims}{\tx@bigdelimstrue}
 \DeclareOption{varbb}{\tx@varbbtrue}
@@ -65,6 +66,8 @@
 \DeclareOption{Heuristica}{\tx@uttrue}
 \DeclareOption{Erewhon}{\tx@uttrue}
 \DeclareOption{erewhon}{\tx@uttrue}
+\DeclareOption{charter}{\tx@chtrue}
+\DeclareOption{xcharter}{\tx@chtrue}
 \DeclareOption{cmintegrals}{\tx@cminttrue}
 \DeclareOption{cmbraces}{\tx@bracestrue}
 \DeclareOption{noamssymbols}{\tx@amsfalse}
@@ -144,9 +147,15 @@ amssymbols,uprightGreek}
           \SetSymbolFont{letters}{bold}{OML}{zutmi}{b}{it}
           \DeclareFontSubstitution{OML}{zutmi}{m}{it}          
         \else
-          \DeclareSymbolFont{letters}{OML}{ntxmi}{m}{it}
-          \SetSymbolFont{letters}{bold}{OML}{ntxmi}{b}{it}
-          \DeclareFontSubstitution{OML}{ntxmi}{m}{it}
+          \iftx@ch
+            \DeclareSymbolFont{letters}{OML}{zchmi}{m}{it}
+            \SetSymbolFont{letters}{bold}{OML}{zchmi}{b}{it}
+            \DeclareFontSubstitution{OML}{zchmi}{m}{it}          
+          \else
+            \DeclareSymbolFont{letters}{OML}{ntxmi}{m}{it}
+            \SetSymbolFont{letters}{bold}{OML}{ntxmi}{b}{it}
+            \DeclareFontSubstitution{OML}{ntxmi}{m}{it}
+          \fi  
         \fi
       \fi
     \fi
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
index adda306b49b..d9b49a04312 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.30}
-\def\filedate{2014/10/31}
+\def\fileversion{1.31}
+\def\filedate{2014/11/05}
 \ProvidesPackage{newtxtext}[\filedate\space v\fileversion]
 
 \message{`newtxtext' v\fileversion, \filedate\space Text macros based on txfonts (msharpe)}
-- 
cgit v1.2.3