CTAN sync 202001120300

4 files changed, 48 insertions, 37 deletions

diff --git a/fonts/newtx/README b/fonts/newtx/README
index 5150d2e2cf..784e30533e 100644
--- a/fonts/newtx/README
+++ b/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.622 2019-12-28
+Current version: 1.623 2020-01-11
 
 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.623
+Corrected code which prevented use of the frenchmath option to newtxmath.
+
 Changes in version 1.622
 Fixed a bad bug inadvertently introduced in 1.621.
 Changes in version 1.621
diff --git a/fonts/newtx/doc/newtxdoc.pdf b/fonts/newtx/doc/newtxdoc.pdf
index 89e028dfbc..8ff456b436 100644
--- a/fonts/newtx/doc/newtxdoc.pdf
+++ b/fonts/newtx/doc/newtxdoc.pdf
diff --git a/fonts/newtx/doc/newtxdoc.tex b/fonts/newtx/doc/newtxdoc.tex
index a66c468f9f..8ce2f68551 100644
--- a/fonts/newtx/doc/newtxdoc.tex
+++ b/fonts/newtx/doc/newtxdoc.tex
@@ -15,7 +15,7 @@
 \usepackage{fonttable}
 %SetFonts
 % newtxtext text and newtxmath
-\usepackage{amsthm}
+\usepackage{amsmath,amsthm}
 \newtheoremstyle{oldplain}
   {\topsep}   % ABOVESPACE
   {\topsep}   % BELOWSPACE
@@ -222,6 +222,7 @@ Don't use these unless you know what you're doing.
 \item {\tt libertine} loads different versions of math italic and bold math italic based on \textsf{Libertine} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default;
 \item (new in version 1.55) {\tt stix2} loads different versions of math italic and bold math italic based on \textsf{StixTwoMath} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case. See the documentation to the {\tt SticksToo} package, which contains more details and some math samples.
 \item (new in version 1.60) {\tt ebgaramond} loads different versions of math italic and bold math italic based on \textsf{EBGaramond} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case. See the end of Appendix 2 for an example of a preamble.
+\item (new in version 1.62) {\tt nc, ncf} load different versions of math italic and bold math italic based on \textsf{ScholaX} (\textsf{New Century Schoolbook}) rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case. The difference is that o[tion {\tt nc} loads math Greek letters from {\tt newtxmath}, while option {\tt ncf} loads math greek from an adaptation of {\tt fourier} Greek.
 \item {\tt minion} loads different versions of math italic and bold math italic based on \textsf{MinionPro} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default---see the extended discussion below;
 \item {\tt garamondx} loads different versions of math italic and bold math italic based on \textsf{garamondx} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default.
 \item {\tt baskervaldx} (or {\tt Baskervaldx}) loads different versions of math italic and bold math italic based on \textsf{Baskervaldx} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default.
@@ -336,7 +337,7 @@ so that \verb|\BIA| works as expected in all math styles (display, text, script,
 \usepackage[T1]{fontenc} % best for Western European languages
 \usepackage{textcomp} % required to get special symbols
 \usepackage[varqu,varl]{inconsolata}% a typewriter font must be defined
-\usepackage{amsthm}% must be loaded before newtxmath
+\usepackage{amsmath,amsthm}% must be loaded before newtxmath
 \usepackage[libertine,vvarbb]{newtxmath}
 \usepackage[scr=rsfso]{mathalfa}
 \usepackage{bm}% load after all math to give access to bold math
@@ -368,7 +369,7 @@ The following examples illustrate some general models, the most unintuitive bein
 \usepackage[T1]{fontenc}
 \usepackage[scaled=.85]{beramono}% used only by \mathtt
 \usepackage[type1]{cabin}% used only by \mathsf
-\usepackage{amsthm}% must be loaded before newtxmath
+\usepackage{amsmath,amsthm}% must be loaded before newtxmath
 \usepackage[libertine]{newtxmath}
 % loads minlibertine because no other Roman text package was specified
 % so that \mathrm and \mathbf also use minlibertine
@@ -388,7 +389,7 @@ The next example is similar, but in math mode, numbers, basic symbols, operator
 \renewcommand{\rmdefault}{fbb-LF}% Roman font for use in math mode
 \usepackage[scaled=.85]{beramono}% used only by \mathtt
 \usepackage[type1]{cabin}% used only by \mathsf
-\usepackage{amsthm}% load before newtxmath
+\usepackage{amsmath,amsthm}% load before newtxmath
 \usepackage[libertine,vvarbb]{newtxmath}
 % does not load minlibertine because another Roman text package was specified
 \usepackage[scr=rsfso]{mathalfa}
@@ -797,13 +798,15 @@ newtx-subs.tex
 newtx-libertine-subs.tex
 newtx-xcharter-subs.tex
 newtx-cochineal-subs.tex
-baskervillef-subs.tex
+newtx-baskervillef-subs.tex
 newtx-stickstoo-subs.tex
 newtx-garamond-subs.tex
 newtx-ebgaramond-subs.tex
 newtx-baskervald-subs.tex
 newtx-erewhon-subs.tex
 newtx-minion-subs.tex
+newtx-nc-subs.tex
+newtx-ncf-subs.tex
 \end{verbatim}
 
 \subsection{New glyphs added} \textbf{(For enhanced packages only)} Math family 1 {\tt (letters)} has been extended from 128 slots to 256, retaining the {\tt OML} encoding of the first 128. Most of additional slots have been allocated to a script font from the old STIX collection and an upright modification of that font.
@@ -882,7 +885,7 @@ As {\tt ebgaramond} has an x-height considerably smaller than {\tt newtx}, some
 \usepackage[T1]{fontenc} % best for Western European languages
 \usepackage{textcomp} % required to get special symbols
 \usepackage[varqu,varl]{inconsolata}% a typewriter font must be defined
-\usepackage{amsthm}% must be loaded before newtxmath
+\usepackage{amsmath,amsthm}% must be loaded before newtxmath
 \usepackage[ebgaramond,vvarbb,subscriptcorrection]{newtxmath} % STIX Bbb
 \usepackage{bm}% load after all math to give access to bold math
 \end{verbatim}
diff --git a/fonts/newtx/tex/newtxmath.sty b/fonts/newtx/tex/newtxmath.sty
index 576f3754fd..0591749901 100644
--- a/fonts/newtx/tex/newtxmath.sty
+++ b/fonts/newtx/tex/newtxmath.sty
@@ -11,8 +11,8 @@
 % of glyph collisions.
 % These modifications are by Michael Sharpe, msharpe at ucsd dot edu
 
-\def\fileversion{1.622}
-\def\filedate{2019/12/28}
+\def\fileversion{1.623}
+\def\filedate{2020/01/11}
 \ProvidesPackage{newtxmath}[\filedate\space v\fileversion ]
 \@ifundefined{newtxmathLoaded}{}{\endinput}
 
@@ -575,9 +575,14 @@ amssymbols,uprightGreek,nosubscriptcorrection}
 % Common Macros
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 \def\re@DeclareMathSymbol#1#2#3#4{%
-    \let#1=\undefined
-    \DeclareMathSymbol{#1}{#2}{#3}{#4}}
+\if\relax\noexpand#1\let#1=\undefined \fi \DeclareMathSymbol{#1}{#2}{#3}{#4}}
+
+
+%\def\re@DeclareMathSymbol#1#2#3#4{%
+%    \let#1=\undefined
+%    \DeclareMathSymbol{#1}{#2}{#3}{#4}}
 
 \def\re@DeclareMathDelimiter#1#2#3#4#5#6{%
     \let#1=\undefined
@@ -2086,32 +2091,32 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
   \let\varsigma\varsigmaup
   \let\varphi\varphiup
   \let\varkappa\varkappaup
-  \re@DeclareMathSymbol{A}{\mathalpha}{operators}{65}
-  \re@DeclareMathSymbol{B}{\mathalpha}{operators}{66}
-  \re@DeclareMathSymbol{C}{\mathalpha}{operators}{67}
-  \re@DeclareMathSymbol{D}{\mathalpha}{operators}{68}
-  \re@DeclareMathSymbol{E}{\mathalpha}{operators}{69}
-  \re@DeclareMathSymbol{F}{\mathalpha}{operators}{70}
-  \re@DeclareMathSymbol{G}{\mathalpha}{operators}{71}
-  \re@DeclareMathSymbol{H}{\mathalpha}{operators}{72}
-  \re@DeclareMathSymbol{I}{\mathalpha}{operators}{73}
-  \re@DeclareMathSymbol{J}{\mathalpha}{operators}{74}
-  \re@DeclareMathSymbol{K}{\mathalpha}{operators}{75}
-  \re@DeclareMathSymbol{L}{\mathalpha}{operators}{76}
-  \re@DeclareMathSymbol{M}{\mathalpha}{operators}{77}
-  \re@DeclareMathSymbol{N}{\mathalpha}{operators}{78}
-  \re@DeclareMathSymbol{O}{\mathalpha}{operators}{79}
-  \re@DeclareMathSymbol{P}{\mathalpha}{operators}{80}
-  \re@DeclareMathSymbol{Q}{\mathalpha}{operators}{81}
-  \re@DeclareMathSymbol{R}{\mathalpha}{operators}{82}
-  \re@DeclareMathSymbol{S}{\mathalpha}{operators}{83}
-  \re@DeclareMathSymbol{T}{\mathalpha}{operators}{84}
-  \re@DeclareMathSymbol{U}{\mathalpha}{operators}{85}
-  \re@DeclareMathSymbol{V}{\mathalpha}{operators}{86}
-  \re@DeclareMathSymbol{W}{\mathalpha}{operators}{87}
-  \re@DeclareMathSymbol{X}{\mathalpha}{operators}{88}
-  \re@DeclareMathSymbol{Y}{\mathalpha}{operators}{89}
-  \re@DeclareMathSymbol{Z}{\mathalpha}{operators}{90}
+  \DeclareMathSymbol{A}{\mathalpha}{operators}{65}
+  \DeclareMathSymbol{B}{\mathalpha}{operators}{66}
+  \DeclareMathSymbol{C}{\mathalpha}{operators}{67}
+  \DeclareMathSymbol{D}{\mathalpha}{operators}{68}
+  \DeclareMathSymbol{E}{\mathalpha}{operators}{69}
+  \DeclareMathSymbol{F}{\mathalpha}{operators}{70}
+  \DeclareMathSymbol{G}{\mathalpha}{operators}{71}
+  \DeclareMathSymbol{H}{\mathalpha}{operators}{72}
+  \DeclareMathSymbol{I}{\mathalpha}{operators}{73}
+  \DeclareMathSymbol{J}{\mathalpha}{operators}{74}
+  \DeclareMathSymbol{K}{\mathalpha}{operators}{75}
+  \DeclareMathSymbol{L}{\mathalpha}{operators}{76}
+  \DeclareMathSymbol{M}{\mathalpha}{operators}{77}
+  \DeclareMathSymbol{N}{\mathalpha}{operators}{78}
+  \DeclareMathSymbol{O}{\mathalpha}{operators}{79}
+  \DeclareMathSymbol{P}{\mathalpha}{operators}{80}
+  \DeclareMathSymbol{Q}{\mathalpha}{operators}{81}
+  \DeclareMathSymbol{R}{\mathalpha}{operators}{82}
+  \DeclareMathSymbol{S}{\mathalpha}{operators}{83}
+  \DeclareMathSymbol{T}{\mathalpha}{operators}{84}
+  \DeclareMathSymbol{U}{\mathalpha}{operators}{85}
+  \DeclareMathSymbol{V}{\mathalpha}{operators}{86}
+  \DeclareMathSymbol{W}{\mathalpha}{operators}{87}
+  \DeclareMathSymbol{X}{\mathalpha}{operators}{88}
+  \DeclareMathSymbol{Y}{\mathalpha}{operators}{89}
+  \DeclareMathSymbol{Z}{\mathalpha}{operators}{90}
 \fi
 \re@DeclareMathSymbol{\varg}{\mathord}{lettersA}{181} % was 49
 \re@DeclareMathSymbol{\vary}{\mathord}{lettersA}{182}  % was 50