newtx (11oct19)

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

1 files changed, 37 insertions, 32 deletions

diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
index a423dacd191..ce72d71b6c5 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.601}
-\def\filedate{2019/10/02}
+\def\fileversion{1.602}
+\def\filedate{2019/10/09}
 \ProvidesPackage{newtxmath}[\filedate\space v\fileversion ]
 \@ifundefined{newtxmathLoaded}{}{\endinput}
 
@@ -21,7 +21,7 @@
 \let\newtxmathLoaded\endinput
 \RequirePackage{amsmath} % improves extendable delimiter handling
 \RequirePackage{etoolbox}
-\RequirePackage{trimspaces} % for trim@pre@space
+%\RequirePackage{trimspaces} % for trim@pre@space
 
 %\RequirePackage{etextools} % for \ifiscs, conflicts with biblatex
 % Replacement for \ifiscs is not comprehensive, but adequate to distinguish a letter like j from a macro like \rhox, not necessarily existent.
@@ -235,6 +235,8 @@ amssymbols,uprightGreek,nosubscriptcorrection}
   \iftx@libertine\tx@isenhtrue\else
     \iftx@ch\tx@isenhtrue\else
       \iftx@ebgm\tx@isenhtrue\else
+        \iftx@stxtwo\tx@isenhtrue\else
+        \fi
       \fi
     \fi
   \fi
@@ -1809,9 +1811,12 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
 \DeclareMathSymbol{\jmathfrak}{\mathord}{lettersA}{124}
 \DeclareMathSymbol{\imathbb}{\mathord}{lettersA}{125}
 \DeclareMathSymbol{\jmathbb}{\mathord}{lettersA}{126}
-\DeclareMathSymbol{\imathup}{\mathord}{lettersA}{188}
-\DeclareMathSymbol{\jmathup}{\mathord}{lettersA}{189}
-
+\DeclareMathSymbol{\imathup}{\mathord}{lettersA}{186}
+\DeclareMathSymbol{\jmathup}{\mathord}{lettersA}{187}
+\iftx@stxtwo
+  \DeclareMathSymbol{\imathbbs}{\mathord}{lettersA}{184}
+  \DeclareMathSymbol{\jmathbbs}{\mathord}{lettersA}{185}
+\fi
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Math Italic (ntxmi) Definition % letters
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2128,28 +2133,28 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % Accents change, as do Bbb alphabets, some special symbols in mia
-\iftx@stxtwo %
-    \DeclareMathSymbol{\upnabla}{\mathord}{lettersA}{43}
-    \re@DeclareMathSymbol{\nsubset}{\mathrel}{lettersA}{44}
-	\re@DeclareMathSymbol{\nsupset}{\mathrel}{lettersA}{45}
-	\re@DeclareMathSymbol{\notin}{\mathrel}{lettersA}{46}
-	\re@DeclareMathSymbol{\notni}{\mathrel}{lettersA}{47}
-   		\let\notowns=\notni \let\nni=\notni
-	\re@DeclareMathSymbol{\coloneq}{\mathrel}{lettersA}{58}
-	\re@DeclareMathSymbol{\eqcolon}{\mathrel}{lettersA}{59}
-	\re@DeclareMathSymbol{\neq}{\mathrel}{lettersA}{60}
-   		\let\ne=\neq
-	\re@DeclareMathAccent{\grave}{\mathord}{lettersA}{237}
-    \re@DeclareMathAccent{\acute}{\mathord}{lettersA}{238}
-    \re@DeclareMathAccent{\hat}{\mathord}{lettersA}{239}
-    \re@DeclareMathAccent{\tilde}{\mathord}{lettersA}{240}
-    \re@DeclareMathAccent{\bar}{\mathord}{lettersA}{241}
-    \re@DeclareMathAccent{\breve}{\mathord}{lettersA}{87} %{242}
-    \re@DeclareMathAccent{\dot}{\mathord}{lettersA}{243}
-    \re@DeclareMathAccent{\ddot}{\mathord}{lettersA}{244}
-    \re@DeclareMathAccent{\mathring}{\mathord}{lettersA}{245}
-    \re@DeclareMathAccent{\check}{\mathord}{lettersA}{186} %{246}
-\fi
+%\iftx@stxtwo %
+%    \DeclareMathSymbol{\upnabla}{\mathord}{lettersA}{43}
+%    \re@DeclareMathSymbol{\nsubset}{\mathrel}{lettersA}{44}
+%	\re@DeclareMathSymbol{\nsupset}{\mathrel}{lettersA}{45}
+%	\re@DeclareMathSymbol{\notin}{\mathrel}{lettersA}{46}
+%	\re@DeclareMathSymbol{\notni}{\mathrel}{lettersA}{47}
+%   		\let\notowns=\notni \let\nni=\notni
+%	\re@DeclareMathSymbol{\coloneq}{\mathrel}{lettersA}{58}
+%	\re@DeclareMathSymbol{\eqcolon}{\mathrel}{lettersA}{59}
+%	\re@DeclareMathSymbol{\neq}{\mathrel}{lettersA}{60}
+%   		\let\ne=\neq
+%	\re@DeclareMathAccent{\grave}{\mathord}{lettersA}{237}
+%    \re@DeclareMathAccent{\acute}{\mathord}{lettersA}{238}
+%    \re@DeclareMathAccent{\hat}{\mathord}{lettersA}{239}
+%    \re@DeclareMathAccent{\tilde}{\mathord}{lettersA}{240}
+%    \re@DeclareMathAccent{\bar}{\mathord}{lettersA}{241}
+%    \re@DeclareMathAccent{\breve}{\mathord}{lettersA}{87} %{242}
+%    \re@DeclareMathAccent{\dot}{\mathord}{lettersA}{243}
+%    \re@DeclareMathAccent{\ddot}{\mathord}{lettersA}{244}
+%    \re@DeclareMathAccent{\mathring}{\mathord}{lettersA}{245}
+%    \re@DeclareMathAccent{\check}{\mathord}{lettersA}{186} %{246}
+%\fi
 
 %\def\ntx@UC{A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z}
 %\def\ntx@lc{a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z}
@@ -2302,12 +2307,12 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
 }
 % This really needs to be reorganized
 \iftx@stxtwo
-	\DeclareRobustCommand{\vvmathbb}[1]{\ntx@alfa{#1}{129}{155}{181}{182}{48}{lettersA}}
-	\DeclareRobustCommand{\vmathbb}[1]{\ntx@alfa{#1}{183}{209}{235}{236}{48}{lettersA}}
+	\DeclareRobustCommand{\vvmathbb}[1]{\ntx@alfa{#1}{132}{158}{125}{126}{48}{lettersA}}
+	\DeclareRobustCommand{\vmathbb}[1]{\ntx@alfa{#1}{193}{225}{184}{185}{48}{lettersA}}
 \else
   \iftx@isenh
-	\DeclareRobustCommand{\vmathbb}[1]{\ntx@alfa{#1}{132}{158}{186}{187}{43}{lettersA}}
-	\DeclareRobustCommand{\vvmathbb}[1]{\ntx@alfa{#1}{193}{225}{186}{187}{43}{lettersA}}
+	\DeclareRobustCommand{\vmathbb}[1]{\ntx@alfa{#1}{132}{158}{125}{126}{43}{lettersA}}
+	\DeclareRobustCommand{\vvmathbb}[1]{\ntx@alfa{#1}{193}{225}{125}{126}{43}{lettersA}}
   \else % the old mia layout
 	   	\DeclareRobustCommand{\vmathbb}[1]{\ntx@alfa{#1}{129}{159}{}{}{176}{lettersA}}
 	    \DeclareRobustCommand{\vvmathbb}[1]{\ntx@alfa{#1}{193}{225}{}{}{176}{lettersA}}