summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/newpx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-10-03 21:06:58 +0000
committerKarl Berry <karl@freefriends.org>2019-10-03 21:06:58 +0000
commita20ec7ef1e60c911f3bf1847592cc34edae295d6 (patch)
treed0a1d7d4da94c0ceb876e351230627999c1dbcdb /Master/texmf-dist/tex/latex/newpx
parentcee5e9ce7bb309d3753d174033202d76edbabe5b (diff)
newpx (3oct19)
git-svn-id: svn://tug.org/texlive/trunk@52266 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/newpx')
-rw-r--r--Master/texmf-dist/tex/latex/newpx/lmsnpxsy.fd6
-rw-r--r--Master/texmf-dist/tex/latex/newpx/lmxnpxexx.fd4
-rw-r--r--Master/texmf-dist/tex/latex/newpx/newpx-subs.tex17
-rw-r--r--Master/texmf-dist/tex/latex/newpx/newpxmath.sty375
4 files changed, 346 insertions, 56 deletions
diff --git a/Master/texmf-dist/tex/latex/newpx/lmsnpxsy.fd b/Master/texmf-dist/tex/latex/newpx/lmsnpxsy.fd
index 0c96902b5a1..3c68c426624 100644
--- a/Master/texmf-dist/tex/latex/newpx/lmsnpxsy.fd
+++ b/Master/texmf-dist/tex/latex/newpx/lmsnpxsy.fd
@@ -1,11 +1,11 @@
%Filename: lmsnpxsy.fd
-%Created by: tex px-sy-drv
+%Created by: tex px-drv
%Created using fontinst v1.933
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{lmsnpxsy.fd}
- [2016/08/13 Fontinst v1.933 font definitions for LMS/npxsy.]
+ [2016/07/04 Fontinst v1.933 font definitions for LMS/npxsy.]
\expandafter\ifx\csname npxmath@scaled\endcsname\relax
\let\npxmath@@scaled\@empty%
@@ -13,7 +13,7 @@
\edef\npxmath@@scaled{s*[\csname npxmath@scaled\endcsname]}%
\fi
-\DeclareFontFamily{LMS}{npxsy}{\providecommand {\setSYdimens}{}\setSYdimens\skewchar \font =120}
+\DeclareFontFamily{LMS}{npxsy}{\providecommand{\setSYdimens}{}\setSYdimens\skewchar\font=120}
\DeclareFontShape{LMS}{npxsy}{m}{n}{
<-> \npxmath@@scaled zplsy
diff --git a/Master/texmf-dist/tex/latex/newpx/lmxnpxexx.fd b/Master/texmf-dist/tex/latex/newpx/lmxnpxexx.fd
index c3325abea84..ac65cf14155 100644
--- a/Master/texmf-dist/tex/latex/newpx/lmxnpxexx.fd
+++ b/Master/texmf-dist/tex/latex/newpx/lmxnpxexx.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{lmxnpxexx.fd}
- [2016/08/13 Fontinst v1.933 font definitions for LMX/npxexx.]
+ [2016/07/04 Fontinst v1.933 font definitions for LMX/npxexx.]
\expandafter\ifx\csname npxmath@scaled\endcsname\relax
\let\npxmath@@scaled\@empty%
@@ -13,7 +13,7 @@
\edef\npxmath@@scaled{s*[\csname npxmath@scaled\endcsname]}%
\fi
-\DeclareFontFamily{LMX}{npxexx}{\providecommand {\setSYdimens}{}\setSYdimens}
+\DeclareFontFamily{LMX}{npxexx}{\providecommand{\setEXdimens}{}\setEXdimens}
\DeclareFontShape{LMX}{npxexx}{m}{n}{
<-> \npxmath@@scaled zplexx
diff --git a/Master/texmf-dist/tex/latex/newpx/newpx-subs.tex b/Master/texmf-dist/tex/latex/newpx/newpx-subs.tex
new file mode 100644
index 00000000000..02c4b277dbf
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/newpx/newpx-subs.tex
@@ -0,0 +1,17 @@
+{f}{-2.5}
+{j}{-1.5}
+{p}{-1}
+{y}{-1}
+{A}{-1.5}
+{B}{-1}
+{D}{-1}
+{H}{-1}
+{I}{-1}
+{K}{-1}
+{L}{-1}
+{M}{-1}
+{N}{-0.5}
+{P}{-1}
+{X}{-1}
+{\rho}{-1.5}
+{\mu}{-1}
diff --git a/Master/texmf-dist/tex/latex/newpx/newpxmath.sty b/Master/texmf-dist/tex/latex/newpx/newpxmath.sty
index 60b6483fc14..5f83df3dfa0 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.33}
-\def\filedate{2018/11/22}
+\def\fileversion{1.401}
+\def\filedate{2019/10/02}
\ProvidesPackage{newpxmath}
[\filedate\space v\fileversion]
%\@ifundefined{newpxmathLoaded}{}{\endinput}
@@ -31,8 +31,110 @@
\input{binhex}
\RequirePackage{xkeyval}
+\RequirePackage{centernot} % for proper handling of negated relations
+
+\newif\ifpx@sbc
+%\newif\ifpx@spc
+
+%\newcommand\enablesbcorrection{\px@sbctrue\AtBeginDocument{\mathcode`\_=\string"8000 \catcode`\_=12\relax}}
+%\newcommand\disablesbcorrection{\px@sbcfalse\catcode`\_=8\relax}
+%\newcommand\enablespcorrection{\px@spctrue\AtBeginDocument{\mathcode`\^=\string"8000 \catcode`\^=12\relax}}
+%\newcommand\disablespcorrection{\px@spcfalse\catcode`\^=7\relax}
+%\@onlypreamble\enablesbcorrection
+%\@onlypreamble\disablesbcorrection
+%\@onlypreamble\enablespcorrection
+%\@onlypreamble\disablespcorrection
+
+% Should test for which math italic font and customize these numbers.
+\def\px@sb@dflt{% default subscript kerns, usually negative
+ \if\px@next f\mkern-2.5mu\else
+ \if\px@next j\mkern-1.5mu\else
+ \if\px@next p\mkern-1 mu\else
+ \if\px@next y\mkern-1 mu\else
+ \if\px@next A\mkern-1.5mu\else
+ \if\px@next B\mkern-1 mu\else
+ \if\px@next D\mkern-1 mu\else
+ \if\px@next H\mkern-1 mu\else
+ \if\px@next I\mkern-1 mu\else
+ \if\px@next K\mkern-1 mu\else
+ \if\px@next L\mkern-1 mu\else
+ \if\px@next M\mkern-1 mu\else
+ \if\px@next N\mkern-0.5mu\else
+ \if\px@next P\mkern-1 mu\else
+ \if\px@next X\mkern-1 mu\else
+ \ifx\px@next \rho\mkern-1.5mu\else
+ \ifx\px@next \mu\mkern-1 mu\else
+ \fi
+ \fi
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi}
+%\def\px@sp@dflt{% default superscript kerns, usually positive
+% \if\px@next f\mkern 2 mu\else
+% \if\px@next j\mkern 2 mu\else
+% \if\px@next p\mkern1 mu\else
+% \if\px@next y\mkern 2 mu\else
+% \if\px@next \rho\mkern 2 mu\else
+% \if\px@next \mu\mkern 2 mu\else
+% \fi
+% \fi
+% \fi%
+% \fi%
+% \fi%
+% \fi}
+\newtoks\px@tA % accumulate \if\next
+\newtoks\px@tB % accumulate \fi
+\newcommand*{\loadsubfile}[1]{\readsufile{#1}%creates toks px@tA. px@tB
+\px@tA\expandafter{\the\expandafter\px@tA\the\px@tB}
+\expandafter\def\expandafter\px@sb\expandafter{\the\px@tA}\enablesbcorrection}
+%\newcommand*{\loadsupfile}[1]{\readsufile{#1}%creates toks px@tA. px@tB
+%\def\px@sp{\the\px@tA \the\px@tB}\enablespcorrection}
+\newread\px@su
+
+\def\readsufile#1{%
+ \px@tA={}
+ \px@tB={}
+ \openin\px@su=#1
+ \loop\unless\ifeof\px@su
+ \read\px@su to \px@line
+ \if\px@line\par\else
+ \expandafter\px@addrec\px@line
+ \fi
+ \repeat
+}
+%\def\px@Prepend#1(to:)#2{\toks0={#1}%
+% \edef\px@act{\noexpand#2={\the\toks0 \the#2}}%
+% \px@act}
+%\def\px@Append#1(to:)#2{\toks0={#1}%
+% \edef\px@act{\noexpand#2={\the#2 \the\toks0}}%
+% \px@act}
+%\def\px@AppendToks#1(to:)#2{%
+% \edef\px@act{\noexpand#2={\the#2 \the#1}}%
+% \px@act}
+
+\def\px@addrec#1#2{%
+\ifiscseq{#1}{\px@tA\expandafter{\the\px@tA\ifx}}{\px@tA\expandafter{\the\px@tA\if}}
+\px@tA\expandafter{\the\px@tA\ifx\px@next #1\mkern #2 mu\else}
+\px@tB\expandafter{\the\px@tB\fi}}
+%px@AppendToks\toks0(to:)\px@tA \px@AppendToks\fi(to:)\px@tB}
+
+
\let\npxmath@scaled\@empty
\define@key{npxmath}{scaled}[1.0]{\def\npxmath@scaled{#1}}
+\def\npxmath@vecsep{.25ex}
+\define@key{npxmath}{vecsep}[.25ex]{\def\npxmath@vecsep{#1}}
\DeclareOption*{%
\begingroup
\edef\x{\endgroup
@@ -42,9 +144,12 @@
\newif\ifpx@upint %default is sloped
\newif\ifpx@smops %default is large binary operators
\newcount\px@Isdigit
-\newif\ifpx@ams \newif\ifpx@slantedG \newif\ifpx@cmint \newif\ifpx@braces
+\newif\ifpx@ams \newif\ifpx@slantedG \newif\ifpx@cmint \newif\ifpx@braces \newif\ifpx@upscr
+
\newif\ifpx@varbb \newif\ifpx@vvarbb \newif\ifpx@symbolsC \newif\ifpx@bigdelims \newif\ifpx@frenchm % french math
\px@symbolsCtrue
+\DeclareOption{nosubscriptcorrection}{\px@sbcfalse}
+\DeclareOption{subscriptcorrection}{\px@sbctrue}
\DeclareOption{bigdelims}{\px@bigdelimstrue}
\DeclareOption{varbb}{\px@varbbtrue}
\DeclareOption{vvarbb}{\px@vvarbbtrue}
@@ -53,14 +158,33 @@
\DeclareOption{cmbraces}{\px@bracestrue}
\DeclareOption{noamssymbols}{\px@amsfalse}
\DeclareOption{amssymbols}{\px@amstrue}
+\DeclareOption{uprightscript}{\px@upscrtrue}
\DeclareOption{uprightGreek}{\px@slantedGfalse}
\DeclareOption{slantedGreek}{\px@slantedGtrue}
\DeclareOption{frenchmath}{\px@frenchmtrue}
\DeclareOption{upint}{\px@upinttrue}
\DeclareOption{smallerops}{\px@smopstrue}
+\DeclareOption{fracspacing}{%
+ \def\setSYdimens{%
+ \fontdimen 8\font=0.789\fontdimen6\font % was 0.677 of a quad
+ \fontdimen11\font=0.798\fontdimen6\font % was 0.686 of a quad
+ }}
\ExecuteOptions{%
amssymbols,uprightGreek}
\ProcessOptions*
+% Check if xy is loaded
+\AtEndPreamble{%
+\ifpx@sbc
+ \expandafter\ifx\csname xyversion\endcsname\relax \else
+ \PackageError{newpxmath}{xy package is not compatible with the subscriptcorrection macros}{Either remove xy or disable
+ subscriptcorrection}
+ \fi % ifx
+ \IfFileExists{newpx-subs.tex}{\loadsubfile{newpx-subs.tex}}%
+ {\def\px@sb{\px@sb@dflt}\message{File newpx-subs.tex not found. Using basic defaults for subscript correction.^^J}}
+\fi
+}
+
+
% frenchmath implies uprightGreek
\ifpx@frenchm\px@slantedGfalse\fi
@@ -82,17 +206,28 @@ amssymbols,uprightGreek}
\SetMathAlphabet{\mathtt}{bold}{\encodingdefault}{\ttdefault}{b}{n}
% change default def of \hbar in case noamssymbols
-\ifx\encodingdefault\t@one
- \renewcommand{\hbar}{\raisebox{-.04ex}{\mbox{$\mathchar'11$}}\mkern-7.3mu h}%
-\else
- \renewcommand{\hbar}{\raisebox{-.04ex}{\mbox{$\mathchar'26$}}\mkern-7.3mu h}%
-\fi
+%\ifx\encodingdefault\t@one
+% \renewcommand{\hbar}{\raisebox{-.04ex}{\mbox{$\mathchar'11$}}\mkern-7.3mu h}%
+%\else
+% \renewcommand{\hbar}{\raisebox{-.04ex}{\mbox{$\mathchar'26$}}\mkern-7.3mu h}%
+%\fi
%%%%%%%%%%%%%%%
% Math Italic %
%%%%%%%%%%%%%%%
\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
+
%%%%%%%%%%%%%%%%%
% Math Italic A %
%%%%%%%%%%%%%%%%%
@@ -242,6 +377,44 @@ amssymbols,uprightGreek}
}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Subscript correction code
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newtoks\px@sbptoks
+% next 2 macros borrowed from TeX by Topic
+\def\px@Pop#1(into:)#2{%
+ \edef\px@act{\noexpand\px@SplitOff\the#1%
+ (tx@head:)\noexpand#2(tx@tail:)\noexpand#1}%
+ \px@act}
+\def\px@SplitOff#1#2(tx@head:)#3(tx@tail:)#4{\def#3{\noexpand #1}#4={#2}}
+
+\ifpx@sbc
+\AtBeginDocument{\mathcode`\_=\string"8000 \catcode`\_=12\relax} \begingroup
+ \catcode`\_=13 % active
+ \gdef_{\s@@b}
+\endgroup
+%
+\def\s@@b{\ifpx@sbc\expandafter\s@@b@\else\expandafter\sb\fi}
+\def\s@@b@#1{\def\px@next@{#1}%
+\px@sbptoks={#1}%
+\px@Pop\px@sbptoks(into:)\px@next% px@next first non-blank token
+\sb{\px@sb \px@next@}}
+\fi
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Superscript correction code
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%\begingroup
+% \catcode`\^=13 % active
+% \gdef^{\s@@p}
+%\endgroup
+%\def\s@@p{\ifpx@spc\expandafter\s@@p@\else\expandafter\sp\fi}
+%\def\s@@p@#1{\def\px@next@{#1}%
+%\px@sbptoks={#1}%
+%\px@Pop\px@sbptoks(into:)\px@next% first token
+%\sp{\px@sp \px@next@}}
+%\def\px@sp{\px@sp@dflt}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -314,21 +487,34 @@ amssymbols,uprightGreek}
\let\|=\Vert
\DeclareMathDelimiter{\updownarrow}{\mathrel}{symbols}{108}{largesymbols}{63}
\DeclareMathDelimiter{\Updownarrow}{\mathrel}{symbols}{109}{largesymbols}{119}
- \DeclareMathDelimiter{\llbracket}{\mathopen}{lettersA}{251}{largesymbolsPXA}{18}
+ \DeclareMathDelimiter{\llbracket}{\mathopen}{symbols}{201}{largesymbolsPXA}{18}
\let\lBrack=\llbracket
- \DeclareMathDelimiter{\rrbracket}{\mathclose}{lettersA}{252}{largesymbolsPXA}{19}
+ \DeclareMathDelimiter{\rrbracket}{\mathclose}{symbols}{202}{largesymbolsPXA}{19}
\let\rBrack=\rrbracket
\DeclareMathDelimiter{\lvert} {\mathopen} {symbols}{106}{largesymbols}{12}
\DeclareMathDelimiter{\rvert} {\mathclose} {symbols}{106}{largesymbols}{12}
\DeclareMathDelimiter{\lVert} {\mathopen} {symbols}{107}{largesymbols}{13}
\DeclareMathDelimiter{\rVert} {\mathclose} {symbols}{107}{largesymbols}{13}
%\fi
-\DeclareMathSymbol{+}{\mathbin}{lettersA}{253}
+\DeclareMathDelimiter{\smlbrace}{\mathopen}{lettersA}{62}{largesymbols}{8}
+\DeclareMathDelimiter{\smrbrace}{\mathclose}{lettersA}{63}{largesymbols}{9}
+
+\re@DeclareMathSymbol{\Perp}{\mathrel}{symbols}{205} % was symbolsC
+\re@DeclareMathSymbol{\nPerp}{\mathrel}{symbols}{206} % was symbolsC
+\DeclareMathSymbol{+}{\mathbin}{symbols}{207}
%\DeclareMathDelimiter{/}{\mathord}{operators}{47}{largesymbols}{14}
%\DeclareMathSymbol{:}{\mathrel}{operators}{58}
%\DeclareMathSymbol{\colon}{\mathpunct}{operators}{58}
%\DeclareMathSymbol{;}{\mathpunct}{operators}{59}
-\DeclareMathSymbol{=}{\mathrel}{lettersA}{53}
+\DeclareMathSymbol{=}{\mathrel}{lettersA}{61} % was 53
+\re@DeclareMathSymbol{\hslash}{\mathord}{lettersA}{91}
+\re@DeclareMathSymbol{\hbar}{\mathord}{lettersA}{92}
+\DeclareMathSymbol{\lambdabar}{\mathord}{lettersA}{93}
+\DeclareMathSymbol{\Zbar}{\mathord}{lettersA}{94}
+\DeclareMathSymbol{\Angstrom}{\mathord}{lettersA}{95}
+\DeclareMathSymbol{\Euler}{\mathord}{lettersA}{96}
+\DeclareMathSymbol{\lambdaslash}{\mathord}{lettersA}{251}
+
%\DeclareMathSymbol{?}{\mathclose}{operators}{63}
%\DeclareMathDelimiter{[}{\mathopen}{operators}{91}{largesymbols}{2}
%\DeclareMathDelimiter{]}{\mathclose}{operators}{93}{largesymbols}{3}
@@ -336,16 +522,21 @@ amssymbols,uprightGreek}
%\DeclareMathAccent{\dot}{\mathalpha}{operators}{95}
%\DeclareMathAccent{\tilde}{\mathalpha}{operators}{126}
%\DeclareMathAccent{\ddot}{\mathalpha}{operators}{127}
-\re@DeclareMathAccent{\hat}{\mathalpha}{symbols}{198}
-\re@DeclareMathAccent{\grave}{\mathalpha}{symbols}{199}
-\re@DeclareMathAccent{\acute}{\mathalpha}{symbols}{200}
-\re@DeclareMathAccent{\breve}{\mathalpha}{symbols}{201}
-\re@DeclareMathAccent{\check}{\mathalpha}{symbols}{202}
+\re@DeclareMathAccent{\grave}{\mathaord}{symbols}{158}
+\re@DeclareMathAccent{\acute}{\mathord}{symbols}{159}
+\re@DeclareMathAccent{\hat}{\mathord}{symbols}{160}
+\re@DeclareMathAccent{\tilde}{\mathord}{symbols}{161}
+\re@DeclareMathAccent{\bar}{\mathord}{symbols}{162}
+\re@DeclareMathAccent{\breve}{\mathord}{symbols}{163}
+\re@DeclareMathAccent{\mathring}{\mathord}{symbols}{166}
+\re@DeclareMathAccent{\check}{\mathord}{symbols}{167}
\DeclareMathSymbol{\transp}{\mathord}{symbols}{203}
-\re@DeclareMathAccent{\dot}{\mathalpha}{symbols}{219}
-\re@DeclareMathAccent{\ddot}{\mathalpha}{symbols}{220}
-\re@DeclareMathAccent{\dddot}{\mathord}{symbols}{221}
-\re@DeclareMathAccent{\ddddot}{\mathord}{symbols}{222}
+\DeclareMathSymbol{\hermtransp}{\mathord}{symbols}{204}
+ \let\htransp=\hermtransp
+\re@DeclareMathAccent{\dot}{\mathaord}{symbols}{164}
+\re@DeclareMathAccent{\ddot}{\mathord}{symbols}{165}
+\re@DeclareMathAccent{\dddot}{\mathord}{symbols}{168}
+\re@DeclareMathAccent{\ddddot}{\mathord}{symbols}{200}
%\ifx\encodingdefault\t@one%
% \re@DeclareMathAccent{\grave}{\mathalpha}{operators}{0}
% \re@DeclareMathAccent{\acute}{\mathalpha}{operators}{1}
@@ -595,6 +786,25 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\DeclareMathAccent{\widearc}{\mathalpha}{symbols}{175}
\DeclareMathAccent{\wideOarc}{\mathalpha}{symbols}{180}
+%%%%%%% Begin pxvec code 2019-07-31 (adaptive vec)
+\DeclareMathSymbol{\rVec@h}{\mathrel}{symbols}{198}% vector head
+\DeclareMathSymbol{\rVec@x}{\mathrel}{symbols}{199}% vector extension
+%% borrow interface from esvect
+\def\vv{\@ifstar{\vvstar}{\pxvec}}
+\def\vvstar#1#2{{\pxvec{#1}}_{\mkern-1mu\relax#2}}
+%%
+\newcommand{\pxvec}{\mathpalette{\overVec@\Vecfill@}}
+%
+\def\Vecfill@{\@rrowfill@\rVec@x\rVec@h}
+%
+\def\@rrowfill@#1#2#3{$\m@th\mkern2mu%
+\relax#3#1\mkern-1.5mu\cleaders\hbox{$#3\mkern-.4mu#1\mkern-.4mu$}\hfill\mkern-1.5mu#2$}
+%
+\def\overVec@#1#2#3{\mathop{\vbox{\ialign{##\crcr\noalign{\kern-.2ex}%
+#1#2\crcr\noalign{\kern\npxmath@vecsep\nointerlineskip}% kern controls sep to arrow
+$\m@th\hfil #2#3\hfil$\crcr}}}}
+%%%%%%%% End pxvec code
+
%%%%%%%%%%%%
%Integrals
%%%%%%%%%%%%
@@ -1032,7 +1242,7 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\re@DeclareMathSymbol{\eqsim}{\mathrel}{AMSm}{104}
\re@DeclareMathSymbol{\beth}{\mathord}{AMSm}{105}
\re@DeclareMathSymbol{\gimel}{\mathord}{AMSm}{106}
-\re@DeclareMathSymbol{\daleth}{\mathord}{AMSm}{107}
+\re@DeclareMathSymbol{\daleth}{\mathord}{AMSm}{124} % was 107
\re@DeclareMathSymbol{\lessdot}{\mathbin}{AMSm}{108}
\re@DeclareMathSymbol{\gtrdot}{\mathbin}{AMSm}{109}
\re@DeclareMathSymbol{\ltimes}{\mathbin}{AMSm}{110}
@@ -1050,8 +1260,8 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\re@DeclareMathSymbol{\digamma}{\mathord}{AMSm}{122}
%\re@DeclareMathSymbol{\varkappa}{\mathord}{AMSm}{123}
\re@DeclareMathSymbol{\Bbbk}{\mathord}{AMSm}{124}
-\re@DeclareMathSymbol{\hslash}{\mathord}{AMSm}{125}
-\re@DeclareMathSymbol{\hbar}{\mathord}{AMSm}{126}
+%\re@DeclareMathSymbol{\hslash}{\mathord}{AMSm}{125}
+%\re@DeclareMathSymbol{\hbar}{\mathord}{AMSm}{126}
\re@DeclareMathSymbol{\backepsilon}{\mathrel}{AMSm}{127}
\fi
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1189,8 +1399,8 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\re@DeclareMathSymbol{\boxbar}{\mathbin}{symbolsC}{107}
\re@DeclareMathSymbol{\boxslash}{\mathbin}{symbolsC}{108}
\re@DeclareMathSymbol{\Wr}{\mathbin}{symbolsC}{109}
-\re@DeclareMathSymbol{\lambdaslash}{\mathord}{symbolsC}{110}
-\re@DeclareMathSymbol{\lambdabar}{\mathord}{symbolsC}{111}
+%\re@DeclareMathSymbol{\lambdaslash}{\mathord}{symbolsC}{110}
+%\re@DeclareMathSymbol{\lambdabar}{\mathord}{symbolsC}{111}
\re@DeclareMathSymbol{\varclubsuit}{\mathord}{symbolsC}{112}
\re@DeclareMathSymbol{\vardiamondsuit}{\mathord}{symbolsC}{113}
\re@DeclareMathSymbol{\varheartsuit}{\mathord}{symbolsC}{114}
@@ -1201,13 +1411,15 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\re@DeclareMathSymbol{\Swarrow}{\mathrel}{symbolsC}{119}
\re@DeclareMathSymbol{\Top}{\mathord}{symbolsC}{120}
\re@DeclareMathSymbol{\Bot}{\mathord}{symbolsC}{121}
-\re@DeclareMathSymbol{\Perp}{\mathrel}{symbolsC}{121}
+%\re@DeclareMathSymbol{\Perp}{\mathrel}{symbolsC}{121}
\re@DeclareMathSymbol\leadstoext{\mathrel}{symbolsC}{122}
\re@DeclareMathSymbol\leadsto{\mathrel}{symbolsC}{123}
\re@DeclareMathSymbol{\sqcupplus}{\mathbin}{symbolsC}{124}
\re@DeclareMathSymbol{\sqcapplus}{\mathbin}{symbolsC}{125}
\re@DeclareMathDelimiter{\llbracket}{\mathopen}{symbolsC}{126}{largesymbolsPXA}{18}
-\re@DeclareMathDelimiter{\rrbracket}{\mathclose}{symbolsC}{127}{largesymbolsPXA}{19}
+ \let\lBrack=\llbracket
+ \re@DeclareMathDelimiter{\rrbracket}{\mathclose}{symbolsC}{127}{largesymbolsPXA}{19}
+ \let\rBrack=\rrbracket
\re@DeclareMathSymbol{\boxright}{\mathrel}{symbolsC}{128}
\re@DeclareMathSymbol{\boxleft}{\mathrel}{symbolsC}{129}
\re@DeclareMathSymbol{\boxdotright}{\mathrel}{symbolsC}{130}
@@ -1235,10 +1447,51 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\re@DeclareMathSymbol{\multimapdotbothvert}{\mathrel}{symbolsC}{150}
\re@DeclareMathSymbol{\multimapdotbothBvert}{\mathrel}{symbolsC}{151}
\re@DeclareMathSymbol{\multimapdotbothAvert}{\mathrel}{symbolsC}{152}
+\else % \px@symbolsCfalse
+ \newcommand*{\nvarparallel}{\centernot\varparallel}
+ \newcommand*{\nvarparallelinv}{\centernot\varparallelinv}
+ \newcommand*{\nprecsim}{\centernot\precsim}
+ \newcommand*{\nsuccsim}{\centernot\succsim}
+ \newcommand*{\nlesssim}{\centernot\lesssim}
+ \newcommand*{\ngtrsim}{\centernot\gtrsim}
+ \newcommand*{\nlessapprox}{\centernot\lessapprox}
+ \newcommand*{\ngtrapprox}{\centernot\gtrapprox}
+ \newcommand*{\npreccurlyeq}{\centernot\preccurlyeq}
+ \newcommand*{\nsucccurlyeq}{\centernot\succcurlyeq}
+ \newcommand*{\ngtrless}{\centernot\gtrless}
+ \newcommand*{\nlessgtr}{\centernot\lessgtr}
+ \newcommand*{\nbumpeq}{\centernot\bumpeq}
+ \newcommand*{\nBumpeq}{\centernot\Bumpeq}
+ \newcommand*{\nbacksim}{\centernot\backsim}
+ \newcommand*{\nbacksimeq}{\centernot\backsimeq}
+ \newcommand*{\nasymp}{\centernot\asymp}
+ \newcommand*{\nequiv}{\centernot\equiv}
+ %\newcommand*{\nsim}{\centernot\sim}
+ \newcommand*{\napprox}{\centernot\approx}
+ \newcommand*{\nll}{\centernot\ll}
+ \newcommand*{\ngg}{\centernot\gg}
+ \newcommand*{\nthickapprox}{\centernot\thickapprox}
+ \newcommand*{\napproxeq}{\centernot\approxeq}
+ \newcommand*{\nprecapprox}{\centernot\precapprox}
+ \newcommand*{\nsuccapprox}{\centernot\succapprox}
+ \newcommand*{\npreceqq}{\centernot\preceqq}
+ \newcommand*{\nsucceqq}{\centernot\succeqq}
+ \newcommand*{\nsimeq}{\centernot\simeq}
+ \newcommand*{\nSubset}{\centernot\Subset}
+ \newcommand*{\nSupset}{\centernot\Supset}
+ \newcommand*{\nsqsubseteq}{\centernot\sqsubseteq}
+ \newcommand*{\nsqsupseteq}{\centernot\sqsupseteq}
+ \newcommand*{\nplus}{\centernot\plus}
+ \newcommand*{\nsqsubset}{\centernot\sqsubset}
+ \newcommand*{\nsqsupset}{\centernot\sqsupset}
+ \newcommand*{\ntwoheadrightarrow}{\centernot\twoheadrightarrow}
+ \newcommand*{\ntwoheadleftarrow}{\centernot\twoheadleftarrow}
\fi
-% The following may be used for [[ and ]] without loading symbolsC as a math family. They replace \llbracket and \rrbracket.
-\def\dlb{\ensuremath\raisebox{.15ex}{\mbox{\usefont{U}{pxsyc}{m}{n}\char126}}}
-\def\drb{\ensuremath\raisebox{.15ex}{\mbox{\usefont{U}{pxsyc}{m}{n}\char127}}}
+%\def\dlb{\ensuremath\raisebox{.15ex}{\mbox{\usefont{U}{pxsyc}{m}{n}\char126}}}
+%\def\drb{\ensuremath\raisebox{.15ex}{\mbox{\usefont{U}{pxsyc}{m}{n}\char127}}}
+\let\dlb\llbracket
+\let\drb\rrbracket
+
% Changes to put some symbolsC glyphs into lettersA
\re@DeclareMathSymbol{\nsubset}{\mathrel}{lettersA}{54}
\re@DeclareMathSymbol{\nsupset}{\mathrel}{lettersA}{55}
@@ -1249,6 +1502,13 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\re@DeclareMathSymbol{\eqcolon}{\mathrel}{lettersA}{59}
\re@DeclareMathSymbol{\neq}{\mathrel}{lettersA}{60}
\let\ne=\neq
+%Additional imath and jmath
+\DeclareMathSymbol{\imathfrak}{\mathord}{lettersA}{123}
+\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}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1342,8 +1602,9 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Math Italic A (npxmia) Definition % lettersA
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\re@DeclareMathSymbol{\varkappa}{\mathord}{lettersA}{41}
-\re@DeclareMathSymbol{\varkappaup}{\mathord}{lettersA}{42}
+ \re@DeclareMathSymbol{\varkappait}{\mathord}{letters}{129}
+ \let\varkappa\varkappait
+ \re@DeclareMathSymbol{\varkappaup}{\mathord}{lettersA}{129}
% upright Greek
\re@DeclareMathSymbol{\Gammaup}{\mathalpha}{lettersA}{0}
@@ -1542,7 +1803,8 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\re@DeclareMathSymbol{\varsigmait}{\mathord}{letters}{38}
\re@DeclareMathSymbol{\varphiit}{\mathord}{letters}{39}
-\re@DeclareMathSymbol{\varg}{\mathord}{lettersA}{49}
+%\re@DeclareMathSymbol{\varg}{\mathord}{lettersA}{49} % change this
+\def\varg{\mathnormal{g}}
\DeclareMathSymbol{\uppartial}{\mathord}{lettersA}{64}
%\def\npx@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}
@@ -1710,8 +1972,8 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\fi %end of ifnum <256
}
-\DeclareRobustCommand{\vmathbb}[1]{\npx@alfa{#1}{129}{159}{}{}{}{lettersA}}
-\DeclareRobustCommand{\vvmathbb}[1]{\npx@alfa{#1}{193}{225}{}{}{176}{lettersA}}
+\DeclareRobustCommand{\vmathbb}[1]{\npx@alfa{#1}{132}{158}{186}{187}{43}{lettersA}}
+\DeclareRobustCommand{\vvmathbb}[1]{\npx@alfa{#1}{193}{225}{186}{187}{43}{lettersA}}
\ifpx@vvarbb
\let\mathbb\vvmathbb
@@ -1864,22 +2126,19 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
%%% otherwise, \not\XXX is done in the usual way.
\DeclareMathSymbol{\n@tch@r}{\mathrel}{symbols}{54}
+\@namedef{not=}{\ne}
+\@namedef{not>}{\ngtr}
+\@namedef{not<}{\nless}
\DeclareRobustCommand*{\not}[1]{%
- \ifx #1=\ne\else
- \ifx #1<\nless\else
- \ifx #1>\ngtr\else
- \n@t@@n{#1}\fi\fi\fi}
-
-\def\n@t@@n#1{%
- \begingroup \escapechar\m@ne\xdef\@gtempa{not\string#1}\endgroup%
- \expandafter\@ifundefined{\@gtempa}%
- {\not@n@{#1}}%
- {\@nameuse{\@gtempa}}}
+ \begingroup \escapechar\m@ne\xdef\@gtempa{not\string#1}\endgroup
+ \@ifundefined{\@gtempa}%
+ {\not@n@{#1}}%
+ {\@nameuse{\@gtempa}}}
\def\not@n@#1{%
- \begingroup \escapechar\m@ne\xdef\@gtempa{n\string#1}\endgroup%
- \expandafter\@ifundefined{\@gtempa}%
- {\n@tch@r #1}%
- {\@nameuse{\@gtempa}}}
+ \begingroup \escapechar\m@ne\xdef\@gtempa{n\string#1}\endgroup
+ \@ifundefined{\@gtempa}%
+ {\n@tch@r #1}%
+ {\@nameuse{\@gtempa}}}
%%%
%%% for AMS classes
@@ -1942,5 +2201,19 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\advance\count@\@ne
\repeat
\typeout{***}}
-
+%%%%%%% Additional pdf to unicode values not in Ross Moore's collection
+% Conditional needed for engines other than pdflatex
+\ifx\pdfglyphtounicode\@undefined \else
+\pdfglyphtounicode{nPerp}{2AEB 2215}% .. ..
+\pdfglyphtounicode{periodcentered.B}{00B7}
+\pdfglyphtounicode{periodcentered.BB}{22C5}
+\pdfglyphtounicode{openbullet.S}{25CB}
+\pdfglyphtounicode{bullet.S}{25C5}
+\pdfglyphtounicode{bullet.SS}{2022}
+\pdfglyphtounicode{bullet.SSS}{2219}
+\pdfglyphtounicode{emptyset.alt1}{2300}
+\pdfglyphtounicode{emptyset.alt2}{2205}
+\pdfglyphtounicode{transpose}{1D40}
+\pdfglyphtounicode{hermitconj}{22B9}
+\fi
\endinput