12 files changed, 68 insertions, 46 deletions
diff --git a/fonts/notomath/README.txt b/fonts/notomath/README
index 85bdda80f2..6dd9049204 100644
--- a/fonts/notomath/README.txt
+++ b/fonts/notomath/README
@@ -1,8 +1,14 @@
 This small package provides a math package that amounts to modifications of the NotoSerif and NotoSans Roman and Greek letters with most symbols taken from newtxmath which must of course be installed (version 1.629 or higher) and its map file enabled.  The eight font files in this package are in pfb format, licensed under the SIL OFL, version 1.1. All other LaTeX support files are subject to the LaTeX Project Public License. See 
 http://www.ctan.org/license/lppl1.3 for the details of that license. 
-Copyright (c) 2020-2021 Michael Sharpe
+Copyright (c) 2020-2023 Michael Sharpe
 
-Current version: 1.02 2021-03-24
+Current version: 1.03 2023-08-21
+
+Changes in version 1.03
+1. Due to the ravages of time, parts of the package became disfunctional. The fixes involve
+(i) remaking the lettersA  virtual fonts for both noto-serif and noto-sans math;
+(ii) completely rewriting notomath.sty to use only \PassOptionsToPackage with one option at a time.
+2. Corrected some minor errors in the documentation.
 
 Changes in version 1.02
 Brought math blackboard bold alphabets into conformance with additions to newtxmath.
diff --git a/fonts/notomath/doc/notomath-doc.pdf b/fonts/notomath/doc/notomath-doc.pdf
index d9dec49e41..2c93489e07 100644
--- a/fonts/notomath/doc/notomath-doc.pdf
+++ b/fonts/notomath/doc/notomath-doc.pdf
diff --git a/fonts/notomath/doc/notomath-doc.tex b/fonts/notomath/doc/notomath-doc.tex
index f84df86388..e985a7ab30 100644
--- a/fonts/notomath/doc/notomath-doc.tex
+++ b/fonts/notomath/doc/notomath-doc.tex
@@ -8,7 +8,7 @@
 %\usepackage{amssymb}% don't use with newtxmath
 %SetFonts
 % libertine+newtxmath
-\pdfmapfile{=NotoMath.map}
+%\pdfmapfile{=NotoMath.map}
 \usepackage[T1]{fontenc}
 %\usepackage[scaled=1.1]{zlmtt}
 %\usepackage[scaled=1.1]{newtxtt}
@@ -55,7 +55,7 @@ The effect of this is:
 load {\tt noto-serif} and {\tt noto-sans} scaled down by the factor .9 to an x-height of 482;
 \item set the main text font to NotoSerif and set \verb|\sfdefault| to 
 NotoSans;
-\item the only weight used from the nine available weights are {\tt regular} and {\tt bold}, as these are the weights used in {\tt newtxmath} with options {\tt noto} and {\tt notosans};
+\item the only weights used from the nine available weights are {\tt regular} and {\tt bold}, as these are the weights used in {\tt newtxmath} with options {\tt noto} and {\tt notosans};
 \item load {\tt newtxmath} with option {noto} at natural scale.
 \end{itemize}
 
@@ -90,7 +90,8 @@ and works well in {\tt T1} encoding. There is no {\tt OT1} encoded version curre
 \item The TT package {\tt nimbusmononarrow} does have a {\tt visiblespace} glyph and its {\tt OT1} encoding is in {\tt TEX TYPEWRITER TEXT} so \verb|\verb| and \verb|\texttt| function correctly even in {\tt OT1} encoding. Caps are not too tall---this is my preferred serifed TT with NotoSans text.
 \end{itemize}
 
-\item 
+\item As with all {\tt newtxmath} based packages, you should not load {\tt amssymb}---{\tt newtxmath} has its own replacement for the AMSm math symbol fonts, of a more approriate size and color match. You do not need to load {\tt amsmath}, though doing so does no harm.
+
 \end{itemize}
 
  
@@ -126,12 +127,24 @@ will output the Noto fonts scaled to x-height 482 with matching math symbols. Th
 \textsc{Example 4:}
 \begin{verbatim}
 \usepackage[scaled=1.24]{nimbusmononarrow}% typewriter font
-\usepackage[scale=1.11,sfdefault,pf,osf]{notomath}
+\usepackage[scale=1.11,sfdefault,pf,osf,subscriptcorrection]{notomath}
 % load NotoSerif, NotoSans, mainfont=NotoSans
 % option subscriptcorrection passed to newtxmath
 \end{verbatim}
 will output the Noto fonts scaled to x-height $536$ with matching math symbols. The main text font will be NotoSans with proportional oldstyle figures except in math, which always uses tabular lining figures.
 
+\textsc{Example 5:}
+\begin{verbatim}
+\usepackage[scaled=1.24]{nimbusmononarrow}% typewriter font
+\usepackage[scale=1.11,sfdefault,pf,osf,subscriptcorrection]{notomath}
+% load NotoSans as mainfont, then newtxmath with option notosans
+% option subscriptcorrection passed to newtxmath
+\usepackage[book,medium,scaled=1,sfdefault]{FiraSans}
+% then replace mainfont by FiraSans
+\end{verbatim}
+will output FiraSans as main text font, with math symbols from {\tt newtxmath} and math letters from {\tt notosans}. This combination seems to work well with {\tt beamer}, though each {\tt scale}  should be multiplied by the same factor.
+
+
 The examples above all work with {\tt pdflatex}, and with {\tt xelatex} if some additional rules are followed. With {\tt xelatex}, the lines in the above examples must precede  the loading of {\tt fontspec}, which must use the option {\tt nomath}. After that, one may load any text fonts required for secondary use, or even replace the main Noto fonts.
 \section*{Subscript Correction}
 The spacing of math letters was adjusted so the superscripts would not collide with the base letters. This was necessary mainly for letters like $j$, $f$, $y$ and $\beta$ as superscripts and like $D$ and $\Omega$ as base letters. As a result of these adjustments, some of the formerly problematic superscript letters become problematic subscript letters. Two files are provided to make adjustments to the letter by inserting appropriate kerns when that letter is the first character in a subscript---one for NotoSerif and one for NotoSans letters, under the respective names 
@@ -209,7 +222,7 @@ At its lowest level, you invoke NotoMath in {\tt newtxmath} using the option {\t
 \def\e{\varepsilon}
 \textbf{An inversion formula:} Let $g:\mathbb{R}^+\to \mathbb{R}$
  be bounded and right continuous, and let
-$\varphi(\alpha)\coloneqq\int_0^\infty e^{-\alpha t}g(t)\,dt$ denote its Laplace transform. Then, for every $t>0$,
+$\varphi(\alpha)\coloneq\int_0^\infty e^{-\alpha t}g(t)\,dt$ denote its Laplace transform. Then, for every $t>0$,
 \begin{equation}
 g(t)=\lim_{\mathstrut\e\to 0}\lim_{\mathstrut\lambda\to\infty}\e^{-1}\sum_{\lambda t<k\le (\lambda+\e)t}
 \frac{(-1)^k}{k!}\lambda^k\varphi ^{(k)}(\lambda).
@@ -221,7 +234,7 @@ g(t)=\lim_{\mathstrut\e\to 0}\lim_{\mathstrut\lambda\to\infty}\e^{-1}\sum_{\lamb
 \end{equation}
  Fix an initial point $\bp_0$ in the interior of $U$, and assume $\bv(\bp_0,\bal_0)\neq\mathbf{0}$. Then, for sufficiently small $t$, $|\bp-\bp_0|$ and $|\bal-\bal_0|$, the system~(\ref{eq:first}) has a unique solution $\bx_{\bal}(t)$  satisfying the initial condition $\bx_{\bal}(0)=\bp$, and that solution depends differentiably (of class~$C^k$) on $t$, $\bp$ and $\bal$.
 
-\textbf{Stirling's formula:} 
+\textbf{Stirling's formula:}  
 \begin{equation}
 \Gamma(z)\sim e^{-z}z^{z-1/2}\sqrt{2\pi}\bigg[1+\frac{1}{12z}+\frac{1}{288z^2}-\frac{139}{51840z^3}+\ldots\bigg],\quad z\to\infty \text{ in $|\arg z|<\pi$}.
 \end{equation}
@@ -231,7 +244,7 @@ $z_2$,
 $z_3$,
 $z_4$ in  $\mathbb{C}$, define  the B\'ezier
 curve with control points $z_1$, $z_2$, $z_3$, $z_4$ by
-\[z(t)\coloneqq(1-t)^3z_1+3(1-t)^2tz_2+3(1-t)t^2z_3+t^3z_4,\qquad 0\le t\le 1.\]
+\[z(t)\coloneq(1-t)^3z_1+3(1-t)^2tz_2+3(1-t)t^2z_3+t^3z_4,\qquad 0\le t\le 1.\]
 Because $(1-t)^3+3(1-t)^2t+3(1-t)t^2+t^3=(1-t+t)^3=1$
 and all summands are positive for $0\le t\le1$, $z(t)$
 is a convex combination of the four points~$z_k$, hence
diff --git a/fonts/notomath/tex/notomath.sty b/fonts/notomath/tex/notomath.sty
index 715d9d341b..9939912d3b 100644
--- a/fonts/notomath/tex/notomath.sty
+++ b/fonts/notomath/tex/notomath.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.00}
-\def\filedate{2020/08/04}
+\def\fileversion{1.03}
+\def\filedate{2023/08/21}
 \ProvidesPackage{notomath}
     [\filedate\space v\fileversion.\space (Michael Sharpe)  Supports Noto text and math fonts for LaTeX usage.]
 
@@ -16,55 +16,58 @@
 \newcommand*{\NotoMath@scale}{1}
 \newcommand*{\NotoText@scale}{1}
 \newif\ifnoto@sfdefault \noto@sfdefaultfalse
-\newif\ifnoto@pf \noto@pffalse
-\newif\ifnoto@osf \noto@osffalse
+%\newif\ifnoto@pf \noto@pffalse
+%\newif\ifnoto@osf \noto@osffalse
 %\newcommand*{\NotoSerifMono@scale}{1}
+\newcommand{\noto@MO}[1]{\PassOptionsToPackage{#1}{newtxmath}}% pass math option
+\newcommand{\noto@TO}[1]{\PassOptionsToPackage{#1}{noto-serif}\PassOptionsToPackage{#1}{noto-sans}
+}% pass text option to each possible text font
+\newcommand{\noto@TTO}[1]{\PassOptionsToPackage{#1}{noto-mono}}
+\noto@TTO{type1}
 \DeclareOptionX{scaled}{\renewcommand*{\NotoMath@scale}{#1}}
 \DeclareOptionX{scale}{\renewcommand*{\NotoMath@scale}{#1}}
 
-\edef\noto@mopt{noto}
-
 \newif\ifnotomath@mono \notomath@monofalse
 
-\DeclareOptionX{sfdefault}{\edef\noto@mopt{notosans}\noto@sfdefaulttrue}
-\DeclareOptionX{proportional}{\noto@pftrue}
-\DeclareOptionX{pf}{\noto@pftrue}
-\DeclareOptionX{oldstyle}{\noto@osftrue}
-\DeclareOptionX{osf}{\noto@osftrue}
+\DeclareOptionX{sfdefault}{\noto@sfdefaulttrue}
+\DeclareOptionX{proportional}{\noto@TO{pf}}
+\DeclareOptionX{pf}{\noto@TO{pf}}
+\DeclareOptionX{oldstyle}{\noto@TO{osf}}
+\DeclareOptionX{osf}{\noto@TO{osf}}
 \DeclareOptionX{mono}{\notomath@monotrue}
-\DeclareOptionX{varbb}{\edef\noto@mopt{\noto@mopt,varbb}}
-\DeclareOptionX{vvarbb}{\edef\noto@mopt{\noto@mopt,vvarbb}}
-\DeclareOptionX{upint}{\edef\noto@mopt{\noto@mopt,upint}}
-\DeclareOptionX{noamssymbols}{\edef\noto@mopt{\noto@mopt,noamssymbols}}
-\DeclareOptionX{slantedGreek}{\edef\noto@mopt{\noto@mopt,slantedGreek}}
-\DeclareOptionX{frenchmath}{\edef\noto@mopt{\noto@mopt,frenchmath}}
-\DeclareOptionX{nosymbolsc}{\edef\noto@mopt{\noto@mopt,nosymbolsc}}
-\DeclareOptionX{subscriptcorrection}{\edef\noto@mopt{\noto@mopt,subscriptcorrection}}
-\DeclareOptionX{timesmathacc}{\edef\noto@mopt{\noto@mopt,timesmathacc}}
-\DeclareOptionX{uprightscript}{\edef\noto@mopt{\noto@mopt,uprightscript}}
-\DeclareOptionX{smallerops}{\edef\noto@mopt{\noto@mopt,smallerops}}
-\DeclareOptionX{useBImacros}{\edef\noto@mopt{\noto@mopt,useBImacros}}
-\DeclareOptionX{noOT1}{\edef\noto@mopt{\noto@mopt,noOT1}}
+\DeclareOptionX{varbb}{\noto@MO{varbb}}
+\DeclareOptionX{vvarbb}{\noto@MO{vvarbb}}
+\DeclareOptionX{upint}{\noto@MO{upint}}
+\DeclareOptionX{noamssymbols}{\noto@MO{noamssymbols}}
+\DeclareOptionX{slantedGreek}{\noto@MO{slantedGreek}}
+\DeclareOptionX{frenchmath}{\noto@MO{frenchmath}}
+\DeclareOptionX{nosymbolsc}{\noto@MO{nosymbolsc}}
+\DeclareOptionX{subscriptcorrection}{\noto@MO{subscriptcorrection}}
+\DeclareOptionX{timesmathacc}{\noto@MO{timesmathacc}}
+\DeclareOptionX{uprightscript}{\noto@MO{uprightscript}}
+\DeclareOptionX{smallerops}{\noto@MO{smallerops}}
+\DeclareOptionX{useBImacros}{\noto@MO{useBImacros}}
+\DeclareOptionX{noOT1}{\noto@MO{noOT1}}
 
 \ProcessOptionsX\relax
-\edef\noto@mopt{scale=\NotoMath@scale,\noto@mopt}
-%\show\noto@mopt
+
+\ifnoto@sfdefault{\noto@MO{notosans}\else\noto@MO{noto}\fi
+%\edef\noto@mopt{scale=\NotoMath@scale,\noto@mopt}
 \newdimen\notomath@dima
 % use the scale for math to set noto text scale factors
 \notomath@dima=\NotoMath@scale\p@
 \notomath@dima=.9\notomath@dima
 \edef\NotoText@scale{\strip@pt\notomath@dima}
-%\let\NotoSans@scale\NotoText@scale
-%\let\NotoSansMono@scale\NotoSerif@scale
-\edef\nototext@opt{scale=\NotoText@scale}
-\ifnoto@pf\edef\nototext@opt{\nototext@opt,pf}\fi
-\ifnoto@osf\edef\nototext@opt{\nototext@opt,osf}\fi
-\usepackage[\nototext@opt]{noto-serif}
-\ifnoto@sfdefault\edef\nototext@opt{\nototext@opt,sfdefault}\fi
-\usepackage[\nototext@opt]{noto-sans}
-\ifnotomath@mono\usepackage[type1,scale=\NotoText@scale]{noto-mono}\fi
-%\show\noto@mopt
-\usepackage[\noto@mopt]{newtxmath}
+
+\noto@TO{scale=\NotoText@scale}
+\noto@TTO{scale=\NotoText@scale}
+\noto@MO{scale=\NotoMath@scale}
+
+\ifnotomath@mono\usepackage{noto-mono}\fi
+\usepackage{noto-serif}
+\ifnoto@sfdefault\noto@TO{sfdefault}\fi
+\usepackage{noto-sans}
+\usepackage{newtxmath}
 \def\seriesdefault{\mdseries@rm}
 \def\mdseries@rm{m}
 \def\bfseries@rm{b}
diff --git a/fonts/notomath/tfm/notobmia.tfm b/fonts/notomath/tfm/notobmia.tfm
index 9ee6be9989..6421c31057 100644
--- a/fonts/notomath/tfm/notobmia.tfm
+++ b/fonts/notomath/tfm/notobmia.tfm
diff --git a/fonts/notomath/tfm/notomia.tfm b/fonts/notomath/tfm/notomia.tfm
index b830788372..01a56dc7b2 100644
--- a/fonts/notomath/tfm/notomia.tfm
+++ b/fonts/notomath/tfm/notomia.tfm
diff --git a/fonts/notomath/tfm/notosansbmia.tfm b/fonts/notomath/tfm/notosansbmia.tfm
index eb492370ef..fee55a9ee2 100644
--- a/fonts/notomath/tfm/notosansbmia.tfm
+++ b/fonts/notomath/tfm/notosansbmia.tfm
diff --git a/fonts/notomath/tfm/notosansmia.tfm b/fonts/notomath/tfm/notosansmia.tfm
index 2546b282ed..4a291d51dc 100644
--- a/fonts/notomath/tfm/notosansmia.tfm
+++ b/fonts/notomath/tfm/notosansmia.tfm
diff --git a/fonts/notomath/vf/notobmia.vf b/fonts/notomath/vf/notobmia.vf
index 419def74aa..69b2ca11af 100644
--- a/fonts/notomath/vf/notobmia.vf
+++ b/fonts/notomath/vf/notobmia.vf
diff --git a/fonts/notomath/vf/notomia.vf b/fonts/notomath/vf/notomia.vf
index 2f5966ada6..a63cae9fe3 100644
--- a/fonts/notomath/vf/notomia.vf
+++ b/fonts/notomath/vf/notomia.vf
diff --git a/fonts/notomath/vf/notosansbmia.vf b/fonts/notomath/vf/notosansbmia.vf
index 4495007dce..7c3469a1d3 100644
--- a/fonts/notomath/vf/notosansbmia.vf
+++ b/fonts/notomath/vf/notosansbmia.vf
diff --git a/fonts/notomath/vf/notosansmia.vf b/fonts/notomath/vf/notosansmia.vf
index 0329a12503..13cc644a59 100644
--- a/fonts/notomath/vf/notosansmia.vf
+++ b/fonts/notomath/vf/notosansmia.vf