mathalpha (18nov21)

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

2 files changed, 21 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/latex/mathalpha/README b/Master/texmf-dist/doc/latex/mathalpha/README
index 5eaefbe63f5..c20ee09b24d 100644
--- a/Master/texmf-dist/doc/latex/mathalpha/README
+++ b/Master/texmf-dist/doc/latex/mathalpha/README
@@ -11,7 +11,9 @@ It mostly bypasses the usual fd and sty files used to load these
 alphabets in order to allow each to be scaled independently and 
 without silently quantizing the sizes.
 
-Current version: 1.142 2021-11-01
+Current version: 1.143 2021-11-18
+
+Version 1.143 fixes a problem where mathalpha would erase a prior choice of Blackboard Bold font, due to a code duplication that made a test false on the first round but true on the second.
 
 Version 1.142 corrects for missing \fi in a number of \mathfrak definitions due, I think, to an erroneous mass copy and paste in 1.14.
 
diff --git a/Master/texmf-dist/tex/latex/mathalpha/mathalpha.sty b/Master/texmf-dist/tex/latex/mathalpha/mathalpha.sty
index 16d2a5e83de..c32088ce658 100644
--- a/Master/texmf-dist/tex/latex/mathalpha/mathalpha.sty
+++ b/Master/texmf-dist/tex/latex/mathalpha/mathalpha.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
-\def\mathalphaVersion{1.142}
-\def\mathalphaDate{2021/11/01}
+\def\mathalphaVersion{1.143}
+\def\mathalphaDate{2021/11/18}
 \ProvidesPackage{mathalpha}[\mathalphaDate\space-\space\mathalphaVersion
  mathalpha (License LPPL) Michael Sharpe]
 \message{`mathalpha' v\mathalphaVersion, \mathalphaDate, a renaming of mathalfa (msharpe)}
@@ -24,6 +24,9 @@
 \def\bb@lst{ams, lucida, mathpi, mma, mt, mth, pazo, fourier, esstix, boondox, px, tx, txof, libus, dsserif, bboldxLight, bboldx, dsfontserif, dsfontsans, stixtwo, stix}
 \def\cal@lst{cm, euler, rsfso, rsfs, lucida, mathpi, mma, mt, mtc, zapfc, esstix, boondox, boondoxo, dutchcal, pxtx, bickham, bickhams, stix, txupr, boondoxupr, kp, stixplain, stixfancy, stixtwoplain, stixtwofancy}
 \def\frak@lst{euler, lucida, mathpi, mma, mt, esstix, boondox, pxtx, stixtwo}
+\def\mathalfa@bbnr{-1}\def\mathalfa@calnr{-1}
+\def\mathalfa@fraknr{-1}\def\mathalfa@scrnr{-1}
+\def\minusone{-1}
 % aliases
 \newif\ifmathalfa@oldbold
 \define@boolkey{mathalfa}{oldbold}[true]{\@nameuse{mathalfa@oldbold#1}}
@@ -32,8 +35,8 @@
 \define@boolkey{mathalfa}{calsymbols}[true]{\@nameuse{mathalfa@calsym#1}}
 \define@boolkey{mathalfa}{scrsymbols}[true]{\@nameuse{mathalfa@scrsym#1}}
 
-\edef\mathalfa@bbnr{\m@ne}\edef\mathalfa@calnr{\m@ne}
-\edef\mathalfa@fraknr{\m@ne}\edef\mathalfa@scrnr{\m@ne}
+%\edef\mathalfa@bbnr{\m@ne}\edef\mathalfa@calnr{\m@ne}
+%\edef\mathalfa@fraknr{\m@ne}\edef\mathalfa@scrnr{\m@ne}
 % scaled
 \define@key{mathalfa}{scaled}[1.0]{%
 \def\mathalfa@bbscaled{s*[#1]}\def\mathalfa@bbrawscaled{#1} \def\mathalfa@calscaled{s*[#1]}\def\mathalfa@calrawscaled{#1} \def\mathalfa@frakscaled{s*[#1]}\def\mathalfa@frakrawscaled{#1} \def\mathalfa@scrscaled{s*[#1]}\def\mathalfa@scrrawscaled{#1}}% all at once
@@ -74,11 +77,17 @@ frak: lucida, esstix, mathpi^^J
   \x}
 \ProcessOptions* % run \DeclareOption* on each option specified, in order
 % Convert scaled choices to macros
-\expandafter\ifx\csname mathalfa@bbscaled\endcsname\relax \let\mathalfa@bbscaled\@empty
-\fi
-\expandafter\ifx\csname mathalfa@calscaled\endcsname\relax \let\mathalfa@calscaled\@empty\fi
-\expandafter\ifx\csname mathalfa@frakscaled\endcsname\relax \let\mathalfa@frakscaled\@empty\fi
-\expandafter\ifx\csname mathalfa@scrscaled\endcsname\relax \let\mathalfa@scrscaled\@empty\fi
+%\expandafter\ifx\csname mathalfa@bbscaled\endcsname\relax \let\mathalfa@bbscaled\@empty
+%\fi
+%\expandafter\ifx\csname mathalfa@calscaled\endcsname\relax \let\mathalfa@calscaled\@empty\fi
+%\expandafter\ifx\csname mathalfa@frakscaled\endcsname\relax \let\mathalfa@frakscaled\@empty\fi
+%\expandafter\ifx\csname mathalfa@scrscaled\endcsname\relax \let\mathalfa@scrscaled\@empty\fi
+\ifx\mathalfa@bbnr\minusone\else\let\mathbb\relax\let\mathbbb\relax\fi
+%\ifnum \mathalfa@bbnr<0
+%\else\let\mathbb\relax\let\mathbbb\relax\fi
+%\ifx\mathalfa@calnr\minusone\else\let\mathcal\relax\fi
+\ifx\mathalfa@fraknr\minusone\else\let\mathfrak\relax\let\mathbfrak\relax\fi
+\ifx\mathalfa@scrnr\minusone\else\let\mathscr\relax\fi
 % Check for lucida loaded
 \newif\iflucid@loaded \lucid@loadedfalse
 \expandafter\ifx\csname DeclareLucidaFontShape\endcsname\relax\else\lucid@loadedtrue\fi% 
@@ -90,11 +99,6 @@ frak: lucida, esstix, mathpi^^J
 \@ifpackageloaded{amsfonts}{%
   \let\amsloaded=Y%
 }{}%
-% Undefine some previous settings
-\ifx\mathalfa@bbnr\m@ne\else\let\mathbb\relax\let\mathbfbb\relax\fi
-%\ifx\mathalfa@calnr\m@ne\else\let\mathcal\relax\fi
-\ifx\mathalfa@fraknr\m@ne\else\let\mathfrak\relax\let\mathbffrak\relax\fi
-\ifx\mathalfa@scrnr\m@ne\else\let\mathscr\relax\fi
 % Some error messages
 \newcommand*\mathalpha@boldError[2]{%#1=item specified, #2 from bb,cal,scr,frak
 \PackageError{mathalpha}{You specified `#2=#1,b#2', but `#1' has no bold\space#2}{}}