summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-04-11 21:36:21 +0000
committerKarl Berry <karl@freefriends.org>2021-04-11 21:36:21 +0000
commit3183e6721d03f92251424fc14b5de5a5c8c6b9f6 (patch)
treeeb15ba8a19656070bf6c14825ff041d6bfad95ee /Master/texmf-dist/tex
parent86662024018682cdc86b1bd94ae021b0b39a23f8 (diff)
newpx
git-svn-id: svn://tug.org/texlive/trunk@58838 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/newpx/newpxmath.sty504
-rw-r--r--Master/texmf-dist/tex/latex/newpx/newpxtext.sty8
2 files changed, 409 insertions, 103 deletions
diff --git a/Master/texmf-dist/tex/latex/newpx/newpxmath.sty b/Master/texmf-dist/tex/latex/newpx/newpxmath.sty
index 59b10a98cf2..a0f497c1d87 100644
--- a/Master/texmf-dist/tex/latex/newpx/newpxmath.sty
+++ b/Master/texmf-dist/tex/latex/newpx/newpxmath.sty
@@ -11,8 +11,8 @@
% of glyph collisions.
% These modifications are by Michael Sharpe, msharpe at ucsd dot edu
-\def\fileversion{1.414}
-\def\filedate{2020/11/02}
+\def\fileversion{1.415}
+\def\filedate{2021/03/22}
\ProvidesPackage{newpxmath}
[\filedate\space v\fileversion]
%\@ifundefined{newpxmathLoaded}{}{\endinput}
@@ -220,16 +220,16 @@ amssymbols,uprightGreek}
\DeclareSymbolFont{letters}{OML}{npxmi}{m}{it}
\SetSymbolFont{letters}{bold}{OML}{npxmi}{b}{it}
\DeclareFontSubstitution{OML}{npxmi}{m}{it}
-\ifpx@upscr
- \DeclareRobustCommand{\mathscr}[1]{\npx@alfa{#1}{196}{222}{248}{249}{}{letters}}
-\DeclareMathSymbol{\imathscr}{\mathord}{letters}{248}
-\DeclareMathSymbol{\jmathscr}{\mathord}{letters}{249}
-
-\else
- \DeclareRobustCommand{\mathscr}[1]{\npx@alfa{#1}{142}{168}{194}{195}{}{letters}}
-\DeclareMathSymbol{\imathscr}{\mathord}{letters}{194}
-\DeclareMathSymbol{\jmathscr}{\mathord}{letters}{195}
-\fi
+%\ifpx@upscr
+% \DeclareRobustCommand{\mathscr}[1]{\npx@alfa{#1}{196}{222}{248}{249}{}{letters}}
+%\DeclareMathSymbol{\imathscr}{\mathord}{letters}{248}
+%\DeclareMathSymbol{\jmathscr}{\mathord}{letters}{249}
+%
+%\else
+% \DeclareRobustCommand{\mathscr}[1]{\npx@alfa{#1}{142}{168}{194}{195}{}{letters}}
+%\DeclareMathSymbol{\imathscr}{\mathord}{letters}{194}
+%\DeclareMathSymbol{\jmathscr}{\mathord}{letters}{195}
+%\fi
%%%%%%%%%%%%%%%%%
% Math Italic A %
@@ -1893,93 +1893,260 @@ $\m@th\hfil #2#3\hfil$\crcr}}}}
% \edef\npx@char{"\hexnumber@\symboldlettersA\nhex{2}{\the\@tempcnta}}
% \expandafter\mathchar\npx@char
%}
-% Experimental code May 8, 2018
-\newcount\npx@numstart
-\newcount\npx@UCstart
-\newcount\npx@lcstart
-\newcount\npx@tmpc
-\newcount\npx@imath
-\newcount\npx@jmath
-\newif\ifnpx@notempty
-\def\npx@fam{}
-\def\npx@char{}
-\def\npx@alfa#1#2#3#4#5#6#7{%#1=string, #2=UC,#3=lc,#4=imath,#5=jmath,#6=numstart,#7=fam
- \npx@UCstart=#2
- %\gdef\xx{x#3x}
- \@xp\ifblank\@xp{#3}{\npx@lcstart=512 }{\npx@lcstart=#3}
- \@xp\ifblank\@xp{#4}{\npx@imath=512 }{\npx@imath=#4}
- \@xp\ifblank\@xp{#5}{\npx@jmath=512 }{\npx@jmath=#5}
- \@xp\ifblank\@xp{#6}{\npx@numstart=512 }{\npx@numstart=#6}
- \def\npx@fam{#7}
- \@xp\ifblank\@xp{#1}{\relax}{\@xp\npx@@alfa #1\@nil}}
-
-\def\npx@@alfa#1#2\@nil{%
- \npx@out{#1}
- \ifblank{#2}{\relax}{\npx@@alfa #2\@nil}}
-
-\def\npx@out#1{% #1 is always a single token---use values from \npx@alfa
- %\showthe\npx@numstart
- \npx@tmpc=\z@
- \ifx#1\imath\npx@tmpc=128\relax
- \ifnum\npx@imath>255\relax #1\npx@tmpc=256 \message{^^JNo imath in this alphabet^^J}\fi
- \else % not \imath
- \ifx#1\jmath\npx@tmpc=129\relax
- \ifnum\npx@jmath>255\relax #1\npx@tmpc=256 \message{^^JNo jmath in this alphabet^^J}\fi
- \else % neither \imath nor \jmath
- \ifiscseq{#1}{#1\npx@tmpc=256 }{% not a cs
- \npx@tmpc=\number\@xp`#1}
- \fi
- \fi
- %\message{^^JCharacter index = \the\npx@tmpc^^J}
- \ifnum\npx@tmpc<128\relax % neither \imath nor \jmath nor cs
- \px@isAlNum{#1}
- %\message{^^JIsAlNum = \the\px@IsAlNum^^J}
- \ifnum\px@IsAlNum=\@ne % it's a digit
- \ifnum\npx@numstart>255\relax #1\npx@tmpc=256 \message{^^JNo digits in this alphabet^^J}
- \else
- \advance\npx@tmpc -48 % 0..9
- \advance\npx@tmpc \npx@numstart
- \fi
- \else
- \ifnum\px@IsAlNum=\tw@ % it's UC
- \advance\npx@tmpc -65 % 0..25
- \advance\npx@tmpc\npx@UCstart
- \else
- \ifnum\px@IsAlNum>\tw@ % it's lc
- \ifnum\npx@lcstart>255 #1\npx@tmpc=256 \message{^^JNo lowercase in this alphabet^^J}
- \else
- %\message{^^JCharacter index = \the\npx@tmpc^^J
- %lcstart = \the\npx@lcstart^^J}
- \advance\npx@tmpc -97 % 0..25
- \advance\npx@tmpc\npx@lcstart
- %\message{^^JCharacter index = \the\npx@tmpc^^J}
- \fi
- \else % it must be a character outside alphanumerics
- #1
- \fi
- \fi
- \fi
- \else % npx@tmpc>127
- \ifnum\npx@tmpc=128\relax % imath
- \npx@tmpc=\npx@imath
- \else
- \ifnum\npx@tmpc=129\relax % jmath
- \npx@tmpc=\npx@jmath
- \fi
- \fi
- \fi
- \ifnum\px@IsAlNum>\z@
- \ifnum\npx@tmpc<256\relax
- \edef\npx@char{"\@xp\hexnumber@\csname sym\npx@fam\endcsname\nhex{2}{\the\npx@tmpc}}
- %\message{^^Joutput char = \npx@char^^J}
- \@xp\mathchar\npx@char%\traceoff
- \fi %end of ifnum <256
- \fi % end ifnum>0
-}
-
-\DeclareRobustCommand{\vmathbb}[1]{\npx@alfa{#1}{132}{158}{186}{187}{43}{lettersA}}
-\DeclareRobustCommand{\vvmathbb}[1]{\npx@alfa{#1}{193}{225}{186}{187}{43}{lettersA}}
-
+%% Experimental code May 8, 2018
+%\newcount\npx@numstart
+%\newcount\npx@UCstart
+%\newcount\npx@lcstart
+%\newcount\npx@tmpc
+%\newcount\npx@imath
+%\newcount\npx@jmath
+%\newif\ifnpx@notempty
+%\def\npx@fam{}
+%\def\npx@char{}
+%\def\npx@alfa#1#2#3#4#5#6#7{%#1=string, #2=UC,#3=lc,#4=imath,#5=jmath,#6=numstart,#7=fam
+% \npx@UCstart=#2
+% %\gdef\xx{x#3x}
+% \@xp\ifblank\@xp{#3}{\npx@lcstart=512 }{\npx@lcstart=#3}
+% \@xp\ifblank\@xp{#4}{\npx@imath=512 }{\npx@imath=#4}
+% \@xp\ifblank\@xp{#5}{\npx@jmath=512 }{\npx@jmath=#5}
+% \@xp\ifblank\@xp{#6}{\npx@numstart=512 }{\npx@numstart=#6}
+% \def\npx@fam{#7}
+% \@xp\ifblank\@xp{#1}{\relax}{\@xp\npx@@alfa #1\@nil}}
+%
+%\def\npx@@alfa#1#2\@nil{%
+% \npx@out{#1}
+% \ifblank{#2}{\relax}{\npx@@alfa #2\@nil}}
+%
+%\def\npx@out#1{% #1 is always a single token---use values from \npx@alfa
+% %\showthe\npx@numstart
+% \npx@tmpc=\z@
+% \ifx#1\imath\npx@tmpc=128\relax
+% \ifnum\npx@imath>255\relax #1\npx@tmpc=256 \message{^^JNo imath in this alphabet^^J}\fi
+% \else % not \imath
+% \ifx#1\jmath\npx@tmpc=129\relax
+% \ifnum\npx@jmath>255\relax #1\npx@tmpc=256 \message{^^JNo jmath in this alphabet^^J}\fi
+% \else % neither \imath nor \jmath
+% \ifiscseq{#1}{#1\npx@tmpc=256 }{% not a cs
+% \npx@tmpc=\number\@xp`#1}
+% \fi
+% \fi
+% %\message{^^JCharacter index = \the\npx@tmpc^^J}
+% \ifnum\npx@tmpc<128\relax % neither \imath nor \jmath nor cs
+% \px@isAlNum{#1}
+% %\message{^^JIsAlNum = \the\px@IsAlNum^^J}
+% \ifnum\px@IsAlNum=\@ne % it's a digit
+% \ifnum\npx@numstart>255\relax #1\npx@tmpc=256 \message{^^JNo digits in this alphabet^^J}
+% \else
+% \advance\npx@tmpc -48 % 0..9
+% \advance\npx@tmpc \npx@numstart
+% \fi
+% \else
+% \ifnum\px@IsAlNum=\tw@ % it's UC
+% \advance\npx@tmpc -65 % 0..25
+% \advance\npx@tmpc\npx@UCstart
+% \else
+% \ifnum\px@IsAlNum>\tw@ % it's lc
+% \ifnum\npx@lcstart>255 #1\npx@tmpc=256 \message{^^JNo lowercase in this alphabet^^J}
+% \else
+% %\message{^^JCharacter index = \the\npx@tmpc^^J
+% %lcstart = \the\npx@lcstart^^J}
+% \advance\npx@tmpc -97 % 0..25
+% \advance\npx@tmpc\npx@lcstart
+% %\message{^^JCharacter index = \the\npx@tmpc^^J}
+% \fi
+% \else % it must be a character outside alphanumerics
+% #1
+% \fi
+% \fi
+% \fi
+% \else % npx@tmpc>127
+% \ifnum\npx@tmpc=128\relax % imath
+% \npx@tmpc=\npx@imath
+% \else
+% \ifnum\npx@tmpc=129\relax % jmath
+% \npx@tmpc=\npx@jmath
+% \fi
+% \fi
+% \fi
+% \ifnum\px@IsAlNum>\z@
+% \ifnum\npx@tmpc<256\relax
+% \edef\npx@char{"\@xp\hexnumber@\csname sym\npx@fam\endcsname\nhex{2}{\the\npx@tmpc}}
+% %\message{^^Joutput char = \npx@char^^J}
+% \@xp\mathchar\npx@char%\traceoff
+% \fi %end of ifnum <256
+% \fi % end ifnum>0
+%}
+%
+%\DeclareRobustCommand{\vmathbb}[1]{\npx@alfa{#1}{132}{158}{186}{187}{43}{lettersA}}
+%\DeclareRobustCommand{\vvmathbb}[1]{\npx@alfa{#1}{193}{225}{186}{187}{43}{lettersA}}
+
+\DeclareMathSymbol{\m@thbbch@rA}{\mathord}{lettersA}{132}
+\DeclareMathSymbol{\m@thbbch@rB}{\mathord}{lettersA}{133}
+\DeclareMathSymbol{\m@thbbch@rC}{\mathord}{lettersA}{134}
+\DeclareMathSymbol{\m@thbbch@rD}{\mathord}{lettersA}{135}
+\DeclareMathSymbol{\m@thbbch@rE}{\mathord}{lettersA}{136}
+\DeclareMathSymbol{\m@thbbch@rF}{\mathord}{lettersA}{137}
+\DeclareMathSymbol{\m@thbbch@rG}{\mathord}{lettersA}{138}
+\DeclareMathSymbol{\m@thbbch@rH}{\mathord}{lettersA}{139}
+\DeclareMathSymbol{\m@thbbch@rI}{\mathord}{lettersA}{140}
+\DeclareMathSymbol{\m@thbbch@rJ}{\mathord}{lettersA}{141}
+\DeclareMathSymbol{\m@thbbch@rK}{\mathord}{lettersA}{142}
+\DeclareMathSymbol{\m@thbbch@rL}{\mathord}{lettersA}{143}
+\DeclareMathSymbol{\m@thbbch@rM}{\mathord}{lettersA}{144}
+\DeclareMathSymbol{\m@thbbch@rN}{\mathord}{lettersA}{145}
+\DeclareMathSymbol{\m@thbbch@rO}{\mathord}{lettersA}{146}
+\DeclareMathSymbol{\m@thbbch@rP}{\mathord}{lettersA}{147}
+\DeclareMathSymbol{\m@thbbch@rQ}{\mathord}{lettersA}{148}
+\DeclareMathSymbol{\m@thbbch@rR}{\mathord}{lettersA}{149}
+\DeclareMathSymbol{\m@thbbch@rS}{\mathord}{lettersA}{150}
+\DeclareMathSymbol{\m@thbbch@rT}{\mathord}{lettersA}{151}
+\DeclareMathSymbol{\m@thbbch@rU}{\mathord}{lettersA}{152}
+\DeclareMathSymbol{\m@thbbch@rV}{\mathord}{lettersA}{153}
+\DeclareMathSymbol{\m@thbbch@rW}{\mathord}{lettersA}{154}
+\DeclareMathSymbol{\m@thbbch@rX}{\mathord}{lettersA}{155}
+\DeclareMathSymbol{\m@thbbch@rY}{\mathord}{lettersA}{156}
+\DeclareMathSymbol{\m@thbbch@rZ}{\mathord}{lettersA}{157}
+\DeclareMathSymbol{\m@thbbch@ra}{\mathord}{lettersA}{158}
+\DeclareMathSymbol{\m@thbbch@rb}{\mathord}{lettersA}{159}
+\DeclareMathSymbol{\m@thbbch@rc}{\mathord}{lettersA}{160}
+\DeclareMathSymbol{\m@thbbch@rd}{\mathord}{lettersA}{161}
+\DeclareMathSymbol{\m@thbbch@re}{\mathord}{lettersA}{162}
+\DeclareMathSymbol{\m@thbbch@rf}{\mathord}{lettersA}{163}
+\DeclareMathSymbol{\m@thbbch@rg}{\mathord}{lettersA}{164}
+\DeclareMathSymbol{\m@thbbch@rh}{\mathord}{lettersA}{165}
+\DeclareMathSymbol{\m@thbbch@ri}{\mathord}{lettersA}{166}
+\DeclareMathSymbol{\m@thbbch@rj}{\mathord}{lettersA}{167}
+\DeclareMathSymbol{\m@thbbch@rk}{\mathord}{lettersA}{168}
+\DeclareMathSymbol{\m@thbbch@rl}{\mathord}{lettersA}{169}
+\DeclareMathSymbol{\m@thbbch@rm}{\mathord}{lettersA}{170}
+\DeclareMathSymbol{\m@thbbch@rn}{\mathord}{lettersA}{171}
+\DeclareMathSymbol{\m@thbbch@ro}{\mathord}{lettersA}{172}
+\DeclareMathSymbol{\m@thbbch@rp}{\mathord}{lettersA}{173}
+\DeclareMathSymbol{\m@thbbch@rq}{\mathord}{lettersA}{174}
+\DeclareMathSymbol{\m@thbbch@rr}{\mathord}{lettersA}{175}
+\DeclareMathSymbol{\m@thbbch@rs}{\mathord}{lettersA}{176}
+\DeclareMathSymbol{\m@thbbch@rt}{\mathord}{lettersA}{177}
+\DeclareMathSymbol{\m@thbbch@ru}{\mathord}{lettersA}{178}
+\DeclareMathSymbol{\m@thbbch@rv}{\mathord}{lettersA}{179}
+\DeclareMathSymbol{\m@thbbch@rw}{\mathord}{lettersA}{180}
+\DeclareMathSymbol{\m@thbbch@rx}{\mathord}{lettersA}{181}
+\DeclareMathSymbol{\m@thbbch@ry}{\mathord}{lettersA}{182}
+\DeclareMathSymbol{\m@thbbch@rz}{\mathord}{lettersA}{183}
+
+\DeclareMathSymbol{\m@thbbch@rzero}{\mathord}{lettersA}{43}
+\DeclareMathSymbol{\m@thbbch@rone}{\mathord}{lettersA}{44}
+\DeclareMathSymbol{\m@thbbch@rtwo}{\mathord}{lettersA}{45}
+\DeclareMathSymbol{\m@thbbch@rthree}{\mathord}{lettersA}{46}
+\DeclareMathSymbol{\m@thbbch@rfour}{\mathord}{lettersA}{47}
+\DeclareMathSymbol{\m@thbbch@rfive}{\mathord}{lettersA}{48}
+\DeclareMathSymbol{\m@thbbch@rsix}{\mathord}{lettersA}{49}
+\DeclareMathSymbol{\m@thbbch@rseven}{\mathord}{lettersA}{50}
+\DeclareMathSymbol{\m@thbbch@reight}{\mathord}{lettersA}{51}
+\DeclareMathSymbol{\m@thbbch@rnine}{\mathord}{lettersA}{52}
+\DeclareMathSymbol{\m@thbbch@rimath}{\mathord}{lettersA}{184}
+\DeclareMathSymbol{\m@thbbch@rjmath}{\mathord}{lettersA}{185}
+\DeclareMathSymbol{\m@thbbch@rGamma}{\mathord}{lettersA}{219}
+\DeclareMathSymbol{\m@thbbch@rPi}{\mathord}{lettersA}{220}
+\DeclareMathSymbol{\m@thbbch@rgamma}{\mathord}{lettersA}{221}
+\DeclareMathSymbol{\m@thbbch@rpi}{\mathord}{lettersA}{222}
+%\@nameuse{m@thbbch@r 0}
+\@xp\let\csname m@thbbch@r0\endcsname=\m@thbbch@rzero
+\@xp\let\csname m@thbbch@r1\endcsname=\m@thbbch@rone
+\@xp\let\csname m@thbbch@r2\endcsname=\m@thbbch@rtwo
+\@xp\let\csname m@thbbch@r3\endcsname=\m@thbbch@rthree
+\@xp\let\csname m@thbbch@r4\endcsname=\m@thbbch@rfour
+\@xp\let\csname m@thbbch@r5\endcsname=\m@thbbch@rfive
+\@xp\let\csname m@thbbch@r6\endcsname=\m@thbbch@rsix
+\@xp\let\csname m@thbbch@r7\endcsname=\m@thbbch@rseven
+\@xp\let\csname m@thbbch@r8\endcsname=\m@thbbch@reight
+\@xp\let\csname m@thbbch@r9\endcsname=\m@thbbch@rnine
+
+\def\px@@vbb#1#2\@nil{%
+ \ifiscseq{#1}{\ifcsdef{m@thbbch@r\@xp\@gobble\string#1}{\csname m@thbbch@r\@xp\@gobble\string#1\endcsname}{#1}}{%not a cs
+ \csname m@thbbch@r#1\endcsname}
+ \ifblank{#2}{\relax}{\px@@vbb #2\@nil}}
+
+\DeclareRobustCommand*{\varmathbb}[1]{\px@@vbb#1\@nil}
+\let\vmathbb=\varmathbb % was once different, but no longer so
+
+\DeclareMathSymbol{\px@BbbA}{\mathord}{lettersA}{193}
+\DeclareMathSymbol{\px@BbbB}{\mathord}{lettersA}{194}
+\DeclareMathSymbol{\px@BbbC}{\mathord}{lettersA}{195}
+\DeclareMathSymbol{\px@BbbD}{\mathord}{lettersA}{196}
+\DeclareMathSymbol{\px@BbbE}{\mathord}{lettersA}{197}
+\DeclareMathSymbol{\px@BbbF}{\mathord}{lettersA}{198}
+\DeclareMathSymbol{\px@BbbG}{\mathord}{lettersA}{199}
+\DeclareMathSymbol{\px@BbbH}{\mathord}{lettersA}{200}
+\DeclareMathSymbol{\px@BbbI}{\mathord}{lettersA}{201}
+\DeclareMathSymbol{\px@BbbJ}{\mathord}{lettersA}{202}
+\DeclareMathSymbol{\px@BbbK}{\mathord}{lettersA}{203}
+\DeclareMathSymbol{\px@BbbL}{\mathord}{lettersA}{204}
+\DeclareMathSymbol{\px@BbbM}{\mathord}{lettersA}{205}
+\DeclareMathSymbol{\px@BbbN}{\mathord}{lettersA}{206}
+\DeclareMathSymbol{\px@BbbO}{\mathord}{lettersA}{207}
+\DeclareMathSymbol{\px@BbbP}{\mathord}{lettersA}{208}
+\DeclareMathSymbol{\px@BbbQ}{\mathord}{lettersA}{209}
+\DeclareMathSymbol{\px@BbbR}{\mathord}{lettersA}{210}
+\DeclareMathSymbol{\px@BbbS}{\mathord}{lettersA}{211}
+\DeclareMathSymbol{\px@BbbT}{\mathord}{lettersA}{212}
+\DeclareMathSymbol{\px@BbbU}{\mathord}{lettersA}{213}
+\DeclareMathSymbol{\px@BbbV}{\mathord}{lettersA}{214}
+\DeclareMathSymbol{\px@BbbW}{\mathord}{lettersA}{215}
+\DeclareMathSymbol{\px@BbbX}{\mathord}{lettersA}{216}
+\DeclareMathSymbol{\px@BbbY}{\mathord}{lettersA}{217}
+\DeclareMathSymbol{\px@BbbZ}{\mathord}{lettersA}{218}
+
+\DeclareMathSymbol{\px@Bbba}{\mathord}{lettersA}{225}
+\DeclareMathSymbol{\px@Bbbb}{\mathord}{lettersA}{226}
+\DeclareMathSymbol{\px@Bbbc}{\mathord}{lettersA}{227}
+\DeclareMathSymbol{\px@Bbbd}{\mathord}{lettersA}{228}
+\DeclareMathSymbol{\px@Bbbe}{\mathord}{lettersA}{229}
+\DeclareMathSymbol{\px@Bbbf}{\mathord}{lettersA}{230}
+\DeclareMathSymbol{\px@Bbbg}{\mathord}{lettersA}{231}
+\DeclareMathSymbol{\px@Bbbh}{\mathord}{lettersA}{232}
+\DeclareMathSymbol{\px@Bbbi}{\mathord}{lettersA}{233}
+\DeclareMathSymbol{\px@Bbbj}{\mathord}{lettersA}{234}
+\DeclareMathSymbol{\px@Bbbk}{\mathord}{lettersA}{235}
+\DeclareMathSymbol{\px@Bbbl}{\mathord}{lettersA}{236}
+\DeclareMathSymbol{\px@Bbbm}{\mathord}{lettersA}{237}
+\DeclareMathSymbol{\px@Bbbn}{\mathord}{lettersA}{238}
+\DeclareMathSymbol{\px@Bbbo}{\mathord}{lettersA}{239}
+\DeclareMathSymbol{\px@Bbbp}{\mathord}{lettersA}{240}
+\DeclareMathSymbol{\px@Bbbq}{\mathord}{lettersA}{241}
+\DeclareMathSymbol{\px@Bbbr}{\mathord}{lettersA}{242}
+\DeclareMathSymbol{\px@Bbbs}{\mathord}{lettersA}{243}
+\DeclareMathSymbol{\px@Bbbt}{\mathord}{lettersA}{244}
+\DeclareMathSymbol{\px@Bbbu}{\mathord}{lettersA}{245}
+\DeclareMathSymbol{\px@Bbbv}{\mathord}{lettersA}{246}
+\DeclareMathSymbol{\px@Bbbw}{\mathord}{lettersA}{247}
+\DeclareMathSymbol{\px@Bbbx}{\mathord}{lettersA}{248}
+\DeclareMathSymbol{\px@Bbby}{\mathord}{lettersA}{249}
+\DeclareMathSymbol{\px@Bbbz}{\mathord}{lettersA}{250}
+\DeclareMathSymbol{\px@Bbbimath}{\mathord}{lettersA}{125}
+\DeclareMathSymbol{\px@Bbbjmath}{\mathord}{lettersA}{126}
+
+\@xp\let\csname px@Bbb0\endcsname=\m@thbbch@rzero
+\@xp\let\csname px@Bbb1\endcsname=\m@thbbch@rone
+\@xp\let\csname px@Bbb2\endcsname=\m@thbbch@rtwo
+\@xp\let\csname px@Bbb3\endcsname=\m@thbbch@rthree
+\@xp\let\csname px@Bbb4\endcsname=\m@thbbch@rfour
+\@xp\let\csname px@Bbb5\endcsname=\m@thbbch@rfive
+\@xp\let\csname px@Bbb6\endcsname=\m@thbbch@rsix
+\@xp\let\csname px@Bbb7\endcsname=\m@thbbch@rseven
+\@xp\let\csname px@Bbb8\endcsname=\m@thbbch@reight
+\@xp\let\csname px@Bbb9\endcsname=\m@thbbch@rnine
+\@xp\let\csname px@BbbGamma\endcsname=\m@thbbch@rGamma
+\@xp\let\csname px@BbbPi\endcsname=\m@thbbch@rPi
+\@xp\let\csname px@Bbbgamma\endcsname=\m@thbbch@rgamma
+\@xp\let\csname px@Bbbpi\endcsname=\m@thbbch@rpi
+
+% Changed macros which are not limited to a single character, and can include digits, \imath, \jmath
+\def\px@@vvbb#1#2\@nil{%
+ \ifiscseq{#1}{\ifcsdef{px@Bbb\@xp\@gobble\string#1}{\csname px@Bbb\@xp\@gobble\string#1\endcsname}{#1}}{%not a cs
+ \csname px@Bbb#1\endcsname}
+ \ifblank{#2}{\relax}{\px@@vvbb #2\@nil}}
+
+\DeclareRobustCommand*{\vvmathbb}[1]{\px@@vvbb#1\@nil}
\ifpx@vvarbb
\let\mathbb\vvmathbb
\else
@@ -1989,8 +2156,145 @@ $\m@th\hfil #2#3\hfil$\crcr}}}}
\ifpx@ams\else\let\mathbb\vmathbb\fi
\fi
\fi
+\DeclareRobustCommand{\Bbbk}{\mathbb{k}}
\let\varmathbb\vmathbb
\let\vvarmathbb\vvmathbb
+
+% Script letters
+\DeclareMathSymbol{\px@ScrA}{\mathord}{letters}{142}
+\DeclareMathSymbol{\px@ScrB}{\mathord}{letters}{143}
+\DeclareMathSymbol{\px@ScrC}{\mathord}{letters}{144}
+\DeclareMathSymbol{\px@ScrD}{\mathord}{letters}{145}
+\DeclareMathSymbol{\px@ScrE}{\mathord}{letters}{146}
+\DeclareMathSymbol{\px@ScrF}{\mathord}{letters}{147}
+\DeclareMathSymbol{\px@ScrG}{\mathord}{letters}{148}
+\DeclareMathSymbol{\px@ScrH}{\mathord}{letters}{149}
+\DeclareMathSymbol{\px@ScrI}{\mathord}{letters}{150}
+\DeclareMathSymbol{\px@ScrJ}{\mathord}{letters}{151}
+\DeclareMathSymbol{\px@ScrK}{\mathord}{letters}{152}
+\DeclareMathSymbol{\px@ScrL}{\mathord}{letters}{153}
+\DeclareMathSymbol{\px@ScrM}{\mathord}{letters}{154}
+\DeclareMathSymbol{\px@ScrN}{\mathord}{letters}{155}
+\DeclareMathSymbol{\px@ScrO}{\mathord}{letters}{156}
+\DeclareMathSymbol{\px@ScrP}{\mathord}{letters}{157}
+\DeclareMathSymbol{\px@ScrQ}{\mathord}{letters}{158}
+\DeclareMathSymbol{\px@ScrR}{\mathord}{letters}{159}
+\DeclareMathSymbol{\px@ScrS}{\mathord}{letters}{160}
+\DeclareMathSymbol{\px@ScrT}{\mathord}{letters}{161}
+\DeclareMathSymbol{\px@ScrU}{\mathord}{letters}{162}
+\DeclareMathSymbol{\px@ScrV}{\mathord}{letters}{163}
+\DeclareMathSymbol{\px@ScrW}{\mathord}{letters}{164}
+\DeclareMathSymbol{\px@ScrX}{\mathord}{letters}{165}
+\DeclareMathSymbol{\px@ScrY}{\mathord}{letters}{166}
+\DeclareMathSymbol{\px@ScrZ}{\mathord}{letters}{167}
+
+\DeclareMathSymbol{\px@Scra}{\mathord}{letters}{168}
+\DeclareMathSymbol{\px@Scrb}{\mathord}{letters}{169}
+\DeclareMathSymbol{\px@Scrc}{\mathord}{letters}{170}
+\DeclareMathSymbol{\px@Scrd}{\mathord}{letters}{171}
+\DeclareMathSymbol{\px@Scre}{\mathord}{letters}{172}
+\DeclareMathSymbol{\px@Scrf}{\mathord}{letters}{173}
+\DeclareMathSymbol{\px@Scrg}{\mathord}{letters}{174}
+\DeclareMathSymbol{\px@Scrh}{\mathord}{letters}{175}
+\DeclareMathSymbol{\px@Scri}{\mathord}{letters}{176}
+\DeclareMathSymbol{\px@Scrj}{\mathord}{letters}{177}
+\DeclareMathSymbol{\px@Scrk}{\mathord}{letters}{178}
+\DeclareMathSymbol{\px@Scrl}{\mathord}{letters}{179}
+\DeclareMathSymbol{\px@Scrm}{\mathord}{letters}{180}
+\DeclareMathSymbol{\px@Scrn}{\mathord}{letters}{181}
+\DeclareMathSymbol{\px@Scro}{\mathord}{letters}{182}
+\DeclareMathSymbol{\px@Scrp}{\mathord}{letters}{183}
+\DeclareMathSymbol{\px@Scrq}{\mathord}{letters}{184}
+\DeclareMathSymbol{\px@Scrr}{\mathord}{letters}{185}
+\DeclareMathSymbol{\px@Scrs}{\mathord}{letters}{186}
+\DeclareMathSymbol{\px@Scrt}{\mathord}{letters}{187}
+\DeclareMathSymbol{\px@Scru}{\mathord}{letters}{188}
+\DeclareMathSymbol{\px@Scrv}{\mathord}{letters}{189}
+\DeclareMathSymbol{\px@Scrw}{\mathord}{letters}{190}
+\DeclareMathSymbol{\px@Scrx}{\mathord}{letters}{191}
+\DeclareMathSymbol{\px@Scry}{\mathord}{letters}{192}
+\DeclareMathSymbol{\px@Scrz}{\mathord}{letters}{193}
+\DeclareMathSymbol{\px@Scrimath}{\mathord}{letters}{194}
+\DeclareMathSymbol{\px@Scrjmath}{\mathord}{letters}{195}
+
+\DeclareMathSymbol{\px@UScrA}{\mathord}{letters}{196}
+\DeclareMathSymbol{\px@UScrB}{\mathord}{letters}{197}
+\DeclareMathSymbol{\px@UScrC}{\mathord}{letters}{198}
+\DeclareMathSymbol{\px@UScrD}{\mathord}{letters}{199}
+\DeclareMathSymbol{\px@UScrE}{\mathord}{letters}{200}
+\DeclareMathSymbol{\px@UScrF}{\mathord}{letters}{201}
+\DeclareMathSymbol{\px@UScrG}{\mathord}{letters}{202}
+\DeclareMathSymbol{\px@UScrH}{\mathord}{letters}{203}
+\DeclareMathSymbol{\px@UScrI}{\mathord}{letters}{204}
+\DeclareMathSymbol{\px@UScrJ}{\mathord}{letters}{205}
+\DeclareMathSymbol{\px@UScrK}{\mathord}{letters}{206}
+\DeclareMathSymbol{\px@UScrL}{\mathord}{letters}{207}
+\DeclareMathSymbol{\px@UScrM}{\mathord}{letters}{208}
+\DeclareMathSymbol{\px@UScrN}{\mathord}{letters}{209}
+\DeclareMathSymbol{\px@UScrO}{\mathord}{letters}{210}
+\DeclareMathSymbol{\px@UScrP}{\mathord}{letters}{211}
+\DeclareMathSymbol{\px@UScrQ}{\mathord}{letters}{212}
+\DeclareMathSymbol{\px@UScrR}{\mathord}{letters}{213}
+\DeclareMathSymbol{\px@UScrS}{\mathord}{letters}{214}
+\DeclareMathSymbol{\px@UScrT}{\mathord}{letters}{215}
+\DeclareMathSymbol{\px@UScrU}{\mathord}{letters}{216}
+\DeclareMathSymbol{\px@UScrV}{\mathord}{letters}{217}
+\DeclareMathSymbol{\px@UScrW}{\mathord}{letters}{218}
+\DeclareMathSymbol{\px@UScrX}{\mathord}{letters}{219}
+\DeclareMathSymbol{\px@UScrY}{\mathord}{letters}{220}
+\DeclareMathSymbol{\px@UScrZ}{\mathord}{letters}{221}
+
+\DeclareMathSymbol{\px@UScra}{\mathord}{letters}{222}
+\DeclareMathSymbol{\px@UScrb}{\mathord}{letters}{223}
+\DeclareMathSymbol{\px@UScrc}{\mathord}{letters}{224}
+\DeclareMathSymbol{\px@UScrd}{\mathord}{letters}{225}
+\DeclareMathSymbol{\px@UScre}{\mathord}{letters}{226}
+\DeclareMathSymbol{\px@UScrf}{\mathord}{letters}{227}
+\DeclareMathSymbol{\px@UScrg}{\mathord}{letters}{228}
+\DeclareMathSymbol{\px@UScrh}{\mathord}{letters}{229}
+\DeclareMathSymbol{\px@UScri}{\mathord}{letters}{230}
+\DeclareMathSymbol{\px@UScrj}{\mathord}{letters}{231}
+\DeclareMathSymbol{\px@UScrk}{\mathord}{letters}{232}
+\DeclareMathSymbol{\px@UScrl}{\mathord}{letters}{233}
+\DeclareMathSymbol{\px@UScrm}{\mathord}{letters}{234}
+\DeclareMathSymbol{\px@UScrn}{\mathord}{letters}{235}
+\DeclareMathSymbol{\px@UScro}{\mathord}{letters}{236}
+\DeclareMathSymbol{\px@UScrp}{\mathord}{letters}{237}
+\DeclareMathSymbol{\px@UScrq}{\mathord}{letters}{238}
+\DeclareMathSymbol{\px@UScrr}{\mathord}{letters}{239}
+\DeclareMathSymbol{\px@UScrs}{\mathord}{letters}{240}
+\DeclareMathSymbol{\px@UScrt}{\mathord}{letters}{241}
+\DeclareMathSymbol{\px@UScru}{\mathord}{letters}{242}
+\DeclareMathSymbol{\px@UScrv}{\mathord}{letters}{243}
+\DeclareMathSymbol{\px@UScrw}{\mathord}{letters}{244}
+\DeclareMathSymbol{\px@UScrx}{\mathord}{letters}{245}
+\DeclareMathSymbol{\px@UScry}{\mathord}{letters}{246}
+\DeclareMathSymbol{\px@UScrz}{\mathord}{letters}{247}
+\DeclareMathSymbol{\px@UScrimath}{\mathord}{letters}{248}
+\DeclareMathSymbol{\px@UScrjmath}{\mathord}{letters}{249}
+
+\def\npx@@scr#1#2\@nil{%
+ \ifiscseq{#1}{\ifcsdef{px@Scr\@xp\@gobble\string#1}{\csname px@Scr\@xp\@gobble\string#1\endcsname}{#1}}{%not a cs
+ \csname px@Scr#1\endcsname}
+ \ifblank{#2}{\relax}{\npx@@scr #2\@nil}}
+\DeclareRobustCommand*{\mathslscr}[1]{\npx@@scr #1\@nil}
+
+\def\npx@@uscr#1#2\@nil{%
+ \ifiscseq{#1}{\ifcsdef{px@UScr\@xp\@gobble\string#1}{\csname px@UScr\@xp\@gobble\string#1\endcsname}{#1}}{%not a cs
+ \csname px@UScr#1\endcsname}
+ \ifblank{#2}{\relax}{\npx@@uscr #2\@nil}}
+\DeclareRobustCommand*{\mathuscr}[1]{\npx@@uscr #1\@nil}
+
+\ifpx@upscr
+ \let\mathscr=\mathuscr
+ \DeclareMathSymbol{\imathscr}{\mathord}{letters}{248}
+ \DeclareMathSymbol{\jmathscr}{\mathord}{letters}{249}
+\else
+ \let\mathscr=\mathslscr
+ \DeclareMathSymbol{\imathscr}{\mathord}{letters}{194}
+ \DeclareMathSymbol{\jmathscr}{\mathord}{letters}{195}
+\fi
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Math Extension (npxex) Definition % largesymbols
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2126,7 +2430,7 @@ $\m@th\hfil #2#3\hfil$\crcr}}}}
%%% \not= becomes \ne
%%% \not< becomes \nless
%%% \not> becomes \ngtr
-%%% if \notXXX is defined, \not\XXX becomes \notXXX;
+%%% if \notXXX is defined, \not\XXX becomes \nopxXX;
%%% if \nXXX is defined, \not\XXX becomes \nXXX;
%%% otherwise, \not\XXX is done in the usual way.
\DeclareMathSymbol{\n@tch@r}{\mathrel}{symbols}{54}
diff --git a/Master/texmf-dist/tex/latex/newpx/newpxtext.sty b/Master/texmf-dist/tex/latex/newpx/newpxtext.sty
index d182289d342..776533b9749 100644
--- a/Master/texmf-dist/tex/latex/newpx/newpxtext.sty
+++ b/Master/texmf-dist/tex/latex/newpx/newpxtext.sty
@@ -8,8 +8,8 @@
% Modified the definition of \k to bypass problem with grouping.
% Text is now directed to an extension of TeXGyrePagella rather than ppl.
-\def\fileversion{1.321}
-\def\filedate{2017/08/18}
+\def\fileversion{1.415}
+\def\filedate{2021/03/22}
\ProvidesPackage{newpxtext}[\filedate\space v\fileversion]
\message{`newpxtext' v\fileversion, \filedate\space Text macros taking advantage of TeXGyre Pagella and its extensions (msharpe)}
@@ -31,6 +31,7 @@
\newif\ifzpl@adobesc % we don't use this exc. in fd, but may in future
\newif\ifzpl@scosf
\newif\ifzpl@largesc
+\newif\ifzpl@helv \zpl@helvtrue % deefault is to load helvetica as sans serif font
%\newif\ifzpl@babel
%\ifdefined\bbl@tempa \zpl@babeltrue\fi
\define@key{zpl}{babel}[true]{\relax}% for backward compatibility
@@ -51,6 +52,7 @@
\define@key{zpl}{stretch}[.2em]{\gdef\zpl@stretch{#1}}
\define@key{zpl}{shrink}[.1em]{\gdef\zpl@shrink{#1}}
+\DeclareOption{nohelv}{\zpl@helvfalse}
\DeclareOption{lining}{\edef\zpl@figurestyle{lf}}
\DeclareOption{lf}{\edef\zpl@figurestyle{lf}}
\DeclareOption{theoremfont}{\zpl@thrmtrue}
@@ -177,7 +179,7 @@
%\renewcommand*{\sfdefault}{npxss}
-\renewcommand*{\sfdefault}{qhv}
+\ifzpl@helv\renewcommand*{\sfdefault}{qhv}\fi
%\show\qhv@scale
%\show\zpl@helvratio