summaryrefslogtreecommitdiff
path: root/fonts/newtx/tex/newtxmath.sty
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-09-30 03:00:43 +0000
committerNorbert Preining <norbert@preining.info>2019-09-30 03:00:43 +0000
commitbbbe8128e7ae9d816a221377dbf5ff3969bb203b (patch)
tree0283a521760b879b30e61872f14f235645745675 /fonts/newtx/tex/newtxmath.sty
parent14ce8b68fe7df49e8a8891bb94c63b9a846da232 (diff)
CTAN sync 201909300300
Diffstat (limited to 'fonts/newtx/tex/newtxmath.sty')
-rw-r--r--fonts/newtx/tex/newtxmath.sty699
1 files changed, 460 insertions, 239 deletions
diff --git a/fonts/newtx/tex/newtxmath.sty b/fonts/newtx/tex/newtxmath.sty
index 8861a37ac4..a7ad97ac76 100644
--- a/fonts/newtx/tex/newtxmath.sty
+++ b/fonts/newtx/tex/newtxmath.sty
@@ -10,8 +10,8 @@
% of glyph collisions.
% These modifications are by Michael Sharpe, msharpe at ucsd dot edu
-\def\fileversion{1.553}
-\def\filedate{2018/05/15}
+\def\fileversion{1.60}
+\def\filedate{2019/09/20}
\ProvidesPackage{newtxmath}[\filedate\space v\fileversion ]
\@ifundefined{newtxmathLoaded}{}{\endinput}
@@ -21,8 +21,10 @@
\let\newtxmathLoaded\endinput
\RequirePackage{amsmath} % improves extendable delimiter handling
\RequirePackage{etoolbox}
+\RequirePackage{trimspaces} % for trim@pre@space
+
%\RequirePackage{etextools} % for \ifiscs, conflicts with biblatex
-% replacement for \ifiscs
+% Replacement for \ifiscs is not comprehensive, but adequate to distinguish a letter like j from a macro like \rhox, not necessarily existent.
\def\ifiscseq#1{\ifcat$\expandafter\@gobble\string#1$\expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi}
\RequirePackage{ifxetex,ifluatex,xkeyval}
@@ -34,15 +36,18 @@
\xl@otftrue
\fi
\fi
-\newif\iftx@noopt
+\newif\iftx@noopt \newif\iftx@upscr
\def\cmr@default{lmr} % changed from cmr 20170911
\def\ly@one{LY1}
\def\t@one{T1}
\def\ot@one{OT1}
\newcount\tx@cntz
\input{binhex}
+
\let\ntxmath@scaled\@empty
\define@key{ntxmath}{scaled}[1.0]{\def\ntxmath@scaled{s*[#1]}}
+\def\ntxmath@vecsep{.25ex}
+\define@key{ntxmath}{vecsep}[.25ex]{\def\ntxmath@vecsep{#1}}
%\define@key{ntxmath}{scalesubdrop}[1.0]{\DeclareRobustCommand{\ntx@scalesub}{%
%\fontdimen16\font=#1\fontdimen16\font\fontdimen17\font=#1\fontdimen17\font}}
\DeclareOption*{%
@@ -56,7 +61,9 @@
\newcount\tx@IsAlNum
\newif\iftx@ams \newif\iftx@slantedG \newif\iftx@cmint \newif\iftx@braces
\newif\iftx@libertine \newif\iftx@varbb \newif\iftx@vvarbb \newif\iftx@symbolsC
-\newif\iftx@gm \newif\iftx@bigdelims
+\newif\iftx@gm
+\newif\iftx@ebgm
+\newif\iftx@bigdelims
\newif\iftx@liby \newif\iftx@tma % use Times math accents
\tx@symbolsCtrue
\newif\iftx@altnu
@@ -73,6 +80,10 @@
\newif\iftx@ptm
\newif\iftx@nozchvw
\newif\iftx@stxtwo
+\newif\iftx@sbc
+%\newif\iftx@spc
+\newif\iftx@isenh % the math style is enhanced and can make use of new macros
+% Currently (2019-0921) only txmath, libertine and XCharter have been enhanced.
%\show\rmdefault
\edef\tx@rmdefault{\rmdefault}
\edef\tx@encdefault{\encodingdefault}
@@ -83,10 +94,95 @@
\@ifundefined{ver@tgtermes.sty}{}{\tx@hastmtrue}
\iftx@hastm\def\rmdefaultB{ntxtlf}\fi
%
-\newcommand\enablesbcorrection{\AtBeginDocument{\mathcode`\_=\string"8000 \catcode`\_=12\relax}}
-\newcommand\disablesbcorrection{\catcode`\_=8\relax}
-\DeclareOption{nosubscriptcorrection}{\disablesbcorrection}
-\DeclareOption{subscriptcorrection} {\enablesbcorrection}
+%\newcommand\enablesbcorrection{\tx@sbctrue\AtBeginDocument{\mathcode`\_=\string"8000 \catcode`\_=12\relax}}
+%\newcommand\disablesbcorrection{\tx@sbcfalse\catcode`\_=8\relax}
+%\newcommand\enablespcorrection{\tx@spctrue\AtBeginDocument{\mathcode`\^=\string"8000 \catcode`\^=12\relax}}
+%\newcommand\disablespcorrection{\tx@spcfalse\catcode`\^=7\relax}
+%\@onlypreamble\enablesbcorrection
+%\@onlypreamble\disablesbcorrection
+%\@onlypreamble\enablespcorrection
+%\@onlypreamble\disablespcorrection
+
+% Should test for which math italic font and customize these numbers.
+\def\tx@sb@dflt{% default subscript kerns, usually negative
+ \if\next f\mkern-3mu\else
+ \if\next j\mkern-3mu\else
+ \if\next p\mkern-\@ne mu\else
+ \if\next y\mkern-\@ne mu\else
+ \if\next A\mkern-\tw@ mu\else
+ \if\next B\mkern-\@ne mu\else
+ \if\next D\mkern-\@ne mu\else
+ \if\next H\mkern-\@ne mu\else
+ \if\next I\mkern-\@ne mu\else
+ \if\next K\mkern-\@ne mu\else
+ \if\next L\mkern-\@ne mu\else
+ \if\next M\mkern-\@ne mu\else
+ \if\next N\mkern-0.5mu\else
+ \if\next P\mkern-\@ne mu\else
+ \if\next X\mkern-\@ne mu\else
+ \ifx\next \rho\mkern-1.5mu\else
+ \ifx\next \mu\mkern-1 mu\else
+ \fi
+ \fi
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ \fi}
+%\def\tx@sp@dflt{% default superscript kerns, usually positive
+% \if\tx@next f\mkern\tw@ mu\else
+% \if\tx@next j\mkern\tw@ mu\else
+% \if\tx@next p\mkern\@ne mu\else
+% \if\tx@next y\mkern\tw@ mu\else
+% \if\tx@next \rho\mkern\tw@ mu\else
+% \if\tx@next \mu\mkern\tw@ mu\else
+% \fi
+% \fi
+% \fi%
+% \fi%
+% \fi%
+% \fi}
+\newtoks\tx@tA
+\newtoks\tx@tB
+\newcommand*{\loadsubfile}[1]{\readsufile{#1}%creates toks tx@tA. tx@tB
+\tx@tA\expandafter{\the\expandafter\tx@tA\the\tx@tB}
+\expandafter\def\expandafter\tx@sb\expandafter{\the\tx@tA}}
+
+%\def\tx@sb{\the\tx@tA \the\tx@tB}\enablesbcorrection}
+%\newcommand*{\loadsupfile}[1]{\readsufile{#1}%creates toks tx@tA. tx@tB
+%\def\tx@sp{\the\tx@tA \the\tx@tB}\enablespcorrection}
+\newread\tx@su
+
+\def\readsufile#1{%
+ \tx@tA={}
+ \tx@tB={}
+ \openin\tx@su=#1
+ \loop\unless\ifeof\tx@su
+ \read\tx@su to \tx@line
+ \if\tx@line\par\else
+ \expandafter\tx@addrec\tx@line
+ \fi
+ \repeat
+}
+\def\tx@addrec#1#2{%
+\ifiscseq{#1}{\tx@tA\expandafter{\the\tx@tA\ifx}}{\tx@tA\expandafter{\the\tx@tA\if}}
+\tx@tA\expandafter{\the\tx@tA\next #1\mkern #2 mu\else}
+\tx@tB\expandafter{\the\tx@tB\fi}}
+
+\DeclareOption{nosubscriptcorrection}{\tx@sbcfalse}
+\DeclareOption{subscriptcorrection}{\tx@sbctrue}
+%\DeclareOption{nosuperscriptcorrection}{\disablespcorrection}
+%\DeclareOption{superscriptcorrection} {\enablespcorrection}
\DeclareOption{timesmathacc}{\tx@tmatrue}
\DeclareOption{bigdelims}{\tx@bigdelimstrue}
\DeclareOption{varbb}{\tx@varbbtrue}
@@ -97,6 +193,7 @@
\DeclareOption{minion}{\tx@miniontrue\tx@ntxmathfalse\tx@otfalse}
\DeclareOption{cochineal}{\tx@cochtrue\tx@ntxmathfalse}
\DeclareOption{garamondx}{\tx@gmtrue\tx@ntxmathfalse\tx@otfalse}
+\DeclareOption{ebgaramond}{\tx@ebgmtrue\tx@ntxmathfalse\tx@otfalse}
\DeclareOption{baskerville}{\tx@batrue\tx@ntxmathfalse}
\DeclareOption{Baskerville}{\tx@batrue\tx@ntxmathfalse}
\DeclareOption{baskervillef}{\tx@batrue\tx@ntxmathfalse}
@@ -114,6 +211,7 @@
\DeclareOption{cmbraces}{\tx@bracestrue}
\DeclareOption{noamssymbols}{\tx@amsfalse}
\DeclareOption{amssymbols}{\tx@amstrue}
+\DeclareOption{uprightscript}{\tx@upscrtrue}
\DeclareOption{uprightGreek}{\tx@slantedGfalse}
\DeclareOption{slantedGreek}{\tx@slantedGtrue}
\DeclareOption{altnu}{\tx@altnutrue}
@@ -127,11 +225,31 @@
\DeclareOption{useBImacros}{\tx@BItrue}
\DeclareOption{noxchvw}{\tx@nozchvwtrue}
\DeclareOption{noXchvw}{\tx@nozchvwtrue}
-\DeclareOption{stix2}{\tx@stxtwotrue} % added in 1.55
-\DeclareOption{stickstoo}{\tx@stxtwotrue} % added in 1.55
+\DeclareOption{stix2}{\tx@stxtwotrue\tx@ntxmathfalse} % added in 1.55
+\DeclareOption{stickstoo}{\tx@stxtwotrue\tx@ntxmathfalse} % added in 1.55
\ExecuteOptions{%
amssymbols,uprightGreek,nosubscriptcorrection}
-\ProcessOptions*
+\ProcessOptions*
+% Check whether math face is enhanced
+\iftx@ntxmath\tx@isenhtrue\else
+ \iftx@libertine\tx@isenhtrue\else
+ \iftx@ch\tx@isenhtrue\else
+ \fi
+ \fi
+\fi
+\AtEndPreamble{%
+%\traceon
+\iftx@sbc
+ \expandafter\ifx\csname xyversion\endcsname\relax \else
+ \PackageError{newtxmath}{xy package is not compatible with the subscriptcorrection macros}{Either remove xy or disable
+ subscriptcorrection by means of package option nosubscriptcorrection}
+ \fi
+ \IfFileExists{\tx@subs}{\loadsubfile{\tx@subs}}%
+ {\def\tx@sb{\tx@sb@dflt}\message{File \tx@subs\space not found. Using internal defaults for subscript correction.^^J}}
+\fi
+%\traceoff
+}
+
% stix2 forces timesmathacc and no optical sizes
\iftx@stxtwo\tx@tmatrue \tx@noopttrue\fi
% frenchmath implies uprightGreek
@@ -146,6 +264,7 @@ amssymbols,uprightGreek,nosubscriptcorrection}
\iftx@ch\let\X@s@v@rg\@undefined\fi
\iftx@coch\let\X@s@v@rg\@undefined\fi
\iftx@gm\let\X@s@v@rg\@undefined\fi
+\iftx@ebgm\let\X@s@v@rg\@undefined\fi
\iftx@bv\let\X@s@v@rg\@undefined\fi
\iftx@ba\let\X@s@v@rg\@undefined\fi
\iftx@stxtwo\let\X@s@v@rg\@undefined\fi
@@ -187,59 +306,73 @@ amssymbols,uprightGreek,nosubscriptcorrection}
\SetMathAlphabet{\mathtt}{bold}{\encodingdefault}{\ttdefault}{b}{n}
% change default def of \hbar in case noamssymbols
-\ifx\tx@encdefault\t@one
- \renewcommand{\hbar}{\raisebox{-.13ex}{\mbox{$\mathchar'11$}}\mkern-8mu h}%
-\else
- \renewcommand{\hbar}{\raisebox{-.13ex}{\mbox{$\mathchar'26$}}\mkern-8mu h}%
-\fi
+%\iftx@ams
+%\else
+% \ifx\tx@encdefault\t@one
+% \renewcommand{\hbar}{\raisebox{-.13ex}{\mbox{$\mathchar'11$}} \mkern-8mu h}%
+% \else
+% \renewcommand{\hbar}{\raisebox{-.13ex}{\mbox{$\mathchar'26$}}\mkern-8mu h}%
+% \fi%
+%\fi
+
%%%%%%%%%%%%%%%
% Math Italic %
%%%%%%%%%%%%%%%
\iftx@libertine
+ \def\tx@subs{libertine.subs}
\DeclareSymbolFont{letters}{OML}{nxlmi}{m}{it}
\SetSymbolFont{letters}{bold}{OML}{nxlmi}{b}{it}
\DeclareFontSubstitution{OML}{nxlmi}{m}{it}
\else
\iftx@minion
+ \def\tx@subs{minion.subs}
\DeclareSymbolFont{letters}{OML}{zmnmi}{m}{it}
\SetSymbolFont{letters}{bold}{OML}{zmnmi}{b}{it}
\DeclareFontSubstitution{OML}{zmnmi}{m}{it}
\else
\iftx@gm
+ \def\tx@subs{garamond.subs}
\DeclareSymbolFont{letters}{OML}{zgmmi}{m}{it}
\SetSymbolFont{letters}{bold}{OML}{zgmmi}{b}{it}
\DeclareFontSubstitution{OML}{zgmmi}{m}{it}
\else
\iftx@bv
- \DeclareSymbolFont{letters}{OML}{zbvmi}{m}{it}
+ \def\tx@subs{baskervald.subs}
+ \DeclareSymbolFont{letters}{OML}{zbvmi}{m}{it}
\SetSymbolFont{letters}{bold}{OML}{zbvmi}{b}{it}
\DeclareFontSubstitution{OML}{zbvmi}{m}{it}
\else
\iftx@ut
+ \def\tx@subs{utopia.subs}
\DeclareSymbolFont{letters}{OML}{zutmi}{m}{it}
\SetSymbolFont{letters}{bold}{OML}{zutmi}{b}{it}
\DeclareFontSubstitution{OML}{zutmi}{m}{it}
\else
\iftx@ch
+ \def\tx@subs{xcharter.subs}
\DeclareSymbolFont{letters}{OML}{zchmi}{m}{it}
\SetSymbolFont{letters}{bold}{OML}{zchmi}{b}{it}
\DeclareFontSubstitution{OML}{zchmi}{m}{it}
\else
\iftx@coch
+ \def\tx@subs{cochineal.subs}
\DeclareSymbolFont{letters}{OML}{zcochmi}{m}{it}
\SetSymbolFont{letters}{bold}{OML}{zcochmi}{b}{it}
\DeclareFontSubstitution{OML}{zcochmi}{m}{it}
\else
\iftx@ba
+ \def\tx@subs{baskervillef.subs}
\DeclareSymbolFont{letters}{OML}{zbami}{m}{it}
\SetSymbolFont{letters}{bold}{OML}{zbami}{b}{it}
\DeclareFontSubstitution{OML}{zbami}{m}{it}
\else
\iftx@stxtwo
+ \def\tx@subs{stickstoo.subs}
\DeclareSymbolFont{letters}{OML}{ntxstx2mi}{m}{it}
\SetSymbolFont{letters}{bold}{OML}{ntxstx2mi}{b}{it}
\DeclareFontSubstitution{OML}{ntxstx2mi}{m}{it}
\else
+ \def\tx@subs{newtx.subs}
\DeclareSymbolFont{letters}{OML}{ntxmi}{m}{it}
\SetSymbolFont{letters}{bold}{OML}{ntxmi}{b}{it}
\DeclareFontSubstitution{OML}{ntxmi}{m}{it}
@@ -252,6 +385,18 @@ amssymbols,uprightGreek,nosubscriptcorrection}
\fi
\fi
\fi
+
+\iftx@isenh
+\iftx@upscr
+ \DeclareRobustCommand{\mathscr}[1]{\ntx@alfa{#1}{196}{222}{248}{249}{}{letters}}
+ \DeclareMathSymbol{\imathscr}{\mathord}{letters}{248}
+ \DeclareMathSymbol{\jmathscr}{\mathord}{letters}{249}
+\else
+ \DeclareRobustCommand{\mathscr}[1]{\ntx@alfa{#1}{142}{168}{194}{195}{}{letters}}
+ \DeclareMathSymbol{\imathscr}{\mathord}{letters}{194}
+ \DeclareMathSymbol{\jmathscr}{\mathord}{letters}{195}
+\fi
+\fi
%%%%%%%%%%%%%%%%%
% Math Italic A %
%%%%%%%%%%%%%%%%%
@@ -380,63 +525,6 @@ amssymbols,uprightGreek,nosubscriptcorrection}
\DeclareMathSymbol{#1}{#2}{#3}{#4}
\advance #4 by1}
-\DeclareRobustCommand{\BI@}[1]{%
-\begingroup\text{\mathversion{bold}$#1$}\endgroup}
-\iftx@BI
-\DeclareRobustCommand{\BIA}{\BI@{A}}
-\DeclareRobustCommand{\BIB}{\BI@{B}}
-\DeclareRobustCommand{\BIC}{\BI@{C}}
-\DeclareRobustCommand{\BID}{\BI@{D}}
-\DeclareRobustCommand{\BIE}{\BI@{E}}
-\DeclareRobustCommand{\BIF}{\BI@{F}}
-\DeclareRobustCommand{\BIG}{\BI@{G}}
-\DeclareRobustCommand{\BIH}{\BI@{H}}
-\DeclareRobustCommand{\BII}{\BI@{I}}
-\DeclareRobustCommand{\BIJ}{\BI@{J}}
-\DeclareRobustCommand{\BIK}{\BI@{K}}
-\DeclareRobustCommand{\BIL}{\BI@{L}}
-\DeclareRobustCommand{\BIM}{\BI@{M}}
-\DeclareRobustCommand{\BIN}{\BI@{N}}
-\DeclareRobustCommand{\BIO}{\BI@{O}}
-\DeclareRobustCommand{\BIP}{\BI@{P}}
-\DeclareRobustCommand{\BIQ}{\BI@{Q}}
-\DeclareRobustCommand{\BIR}{\BI@{R}}
-\DeclareRobustCommand{\BIS}{\BI@{S}}
-\DeclareRobustCommand{\BIT}{\BI@{T}}
-\DeclareRobustCommand{\BIU}{\BI@{U}}
-\DeclareRobustCommand{\BIV}{\BI@{V}}
-\DeclareRobustCommand{\BIW}{\BI@{W}}
-\DeclareRobustCommand{\BIX}{\BI@{X}}
-\DeclareRobustCommand{\BIY}{\BI@{Y}}
-\DeclareRobustCommand{\BIZ}{\BI@{Z}}
-\DeclareRobustCommand{\BIa}{\BI@{a}}
-\DeclareRobustCommand{\BIb}{\BI@{b}}
-\DeclareRobustCommand{\BIc}{\BI@{c}}
-\DeclareRobustCommand{\BId}{\BI@{d}}
-\DeclareRobustCommand{\BIe}{\BI@{e}}
-\DeclareRobustCommand{\BIf}{\BI@{f}}
-\DeclareRobustCommand{\BIg}{\BI@{g}}
-\DeclareRobustCommand{\BIh}{\BI@{h}}
-\DeclareRobustCommand{\BIi}{\BI@{i}}
-\DeclareRobustCommand{\BIj}{\BI@{j}}
-\DeclareRobustCommand{\BIk}{\BI@{k}}
-\DeclareRobustCommand{\BIl}{\BI@{l}}
-\DeclareRobustCommand{\BIm}{\BI@{m}}
-\DeclareRobustCommand{\BIn}{\BI@{n}}
-\DeclareRobustCommand{\BIo}{\BI@{o}}
-\DeclareRobustCommand{\BIp}{\BI@{p}}
-\DeclareRobustCommand{\BIq}{\BI@{q}}
-\DeclareRobustCommand{\BIr}{\BI@{r}}
-\DeclareRobustCommand{\BIs}{\BI@{s}}
-\DeclareRobustCommand{\BIt}{\BI@{t}}
-\DeclareRobustCommand{\BIu}{\BI@{u}}
-\DeclareRobustCommand{\BIv}{\BI@{v}}
-\DeclareRobustCommand{\BIw}{\BI@{w}}
-\DeclareRobustCommand{\BIx}{\BI@{x}}
-\DeclareRobustCommand{\BIy}{\BI@{y}}
-\DeclareRobustCommand{\BIz}{\BI@{z}}
-\fi% end \iftx@BI
-
\def\tx@isdigit#1{% #1 should be a single character
\tx@Isdigit=\z@ %
\tx@cntz=\number`#1\relax%
@@ -467,48 +555,120 @@ amssymbols,uprightGreek,nosubscriptcorrection}
\fi
\fi
}
-
%\def\tx@XXX#1#2\@nil{% #1=first character, #2=rest of string
%\tx@isdigit{#1}%
%\ifnum\tx@Isdigit>\z@ $#1$\else#1\fi%
%\if\relax\detokenize{#2}\relax \else
%\edef\tx@XXXcmd{\noexpand\tx@XXX #2\noexpand\@nil}\tx@XXXcmd \fi}
%
+\newcommand{\tx@unbrace}[1]{#1}
+\def\tx@XXX#1#2\@nil{#1}% #1=first character, #2=rest of string
+%\tx@isdigit{#1}%
+%\ifnum\tx@Isdigit>\z@ $#1$\else#1\fi%
+%\if\relax\detokenize{#2}\relax \else
+%\edef\tx@XXXcmd{\noexpand\tx@XXX #2\noexpand\@nil}\tx@XXXcmd \fi}
+
%\def\equalht#1{\tx@XXX #1\@nil}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Subscript correction code
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begingroup
+\newtoks\tx@sbptoks
+% next 2 macros borrowed from TeX by Topic
+\def\tx@Pop#1(into:)#2{%
+ \edef\tx@act{\noexpand\tx@SplitOff\the#1%
+ (tx@head:)\noexpand#2(tx@tail:)\noexpand#1}%
+ \tx@act}
+\def\tx@SplitOff#1#2(tx@head:)#3(tx@tail:)#4{\def#3{\noexpand #1}#4={#2}}
+
+\iftx@sbc
+\AtBeginDocument{\mathcode`\_=\string"8000 \catcode`\_=12\relax} \begingroup
\catcode`\_=13
- \gdef_{\futurelet\next\s@@b}
+ \gdef_{\expandafter\s@@b@}
\endgroup
-\def\s@@b{\ifcat\relax\noexpand\next\expandafter\sb\else
- \expandafter\s@@b@\fi}
-\def\s@@b@#1{\sb{\futurelet\next\sb@#1}}
-\def\sb@{%
- \ifx\next\space@\def\next@. {\futurelet\next\sb@}\else
- \def\next@.{%
- \ifx\next f\mkern-\tw@ mu\else
- \ifx\next j\mkern-\tw@ mu\else
- \ifx\next p\mkern-\@ne mu\else
- %\ifx\next t\mkern\@ne mu\else
- \ifx\next y\mkern-\@ne mu\else
- \ifx\next A\mkern-\tw@ mu\else
- \ifx\next B\mkern-\@ne mu\else
- \ifx\next D\mkern-\@ne mu\else
- \ifx\next H\mkern-\@ne mu\else
- \ifx\next I\mkern-\@ne mu\else
- \ifx\next K\mkern-\@ne mu\else
- \ifx\next L\mkern-\@ne mu\else
- \ifx\next M\mkern-\@ne mu\else
- \ifx\next N\mkern-0.5mu\else
- \ifx\next P\mkern-\@ne mu\else
- \ifx\next X\mkern-\@ne mu\else
- \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi}%
- \fi
- \next@.}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%\def\s@@b{\expandafter\s@@b@}
+\def\s@@b@#1{\def\tx@next@{#1}%
+\tx@sbptoks={#1}%
+\tx@Pop\tx@sbptoks(into:)\next% first token is \next
+\sb{\tx@sb \tx@next@}} % \tx@sb provides mkern to insert before first tok
+\fi
+%%%%%% Code that seems to work well except for unprotected spacing commands
+%\def\space@.{\futurelet\space@\relax}
+%\space@. %
+%
+%\iftx@sbc
+% \begingroup
+% \catcode`\_=13
+% \gdef_{\futurelet\tx@next\s@@b}
+%\endgroup
+%\def\s@@b{\expandafter\s@@b@}
+%\def\s@@b@#1{\sb{\futurelet\tx@next\sb@#1}}
+%\def\sb@{%
+% \ifx\tx@next\space@\def\tx@next@{\futurelet\tx@next\sb@}\else
+% \def\tx@next@{\tx@sb}
+% \fi
+% \tx@next@}
+%\AtBeginDocument{\mathcode`\_=\string"8000 \catcode`\_=12\relax}
+%\fi % iftx@sbc
+
+%%%%%Code that works except for unprotected spacing commands, like \,
+%\iftx@sbc
+%\begingroup
+% \catcode`\_=13
+% \gdef_{\futurelet\next\s@@b}
+%\endgroup
+%\def\s@@b{\expandafter\s@@b@}
+%\def\s@@b@#1{\sb{\futurelet\next\sb@#1}}
+%\def\sb@{%
+% \ifx\next\space@\def\next@. {\futurelet\next\sb@}\else%
+% \def\next@.{\tx@sb@dflt}\fi\next@.}
+%\AtBeginDocument{\mathcode`\_=\string"8000 \catcode`\_=12\relax}
+%\fi
+%%%% End working code
+
+%
+%\def\s@@b{\expandafter\s@@b@}
+%\def\s@@b@#1{\def\tx@next@{#1}%
+%\tx@sbptoks={\tx@next@}%
+%\tx@Pop\tx@sbptoks(into:)\tx@next% first token
+%\show\tx@next
+%\sb{\tx@sb \tx@next@}}
+%%
+%\iftx@sbc
+%\begingroup
+% \catcode`\_=13 % active
+% \gdef_{\s@@b}
+%\endgroup
+%\AtBeginDocument{\mathcode`\_=\string"8000 \catcode`\_=12\relax}
+%\fi
+%%\fi
+%\def\s@@b{\iftx@sbc\expandafter\s@@b@\else\expandafter\sb\fi}
+%\def\s@@b@#1{\def\next@@@@{#1}%
+%\expandafter\def\expandafter\next@\expandafter{\detokenize{#1}}%
+%\if\relax\next@\def\next{}
+%\else
+%\edef\tx@XXXcmd{\noexpand\tx@XXX \next@\noexpand\@nil}
+%\edef\next{\tx@XXXcmd}% first character
+%\fi%
+%\sb{\tx@sb \next@@@@}}
+%\def\s@@b{\iftx@sbc\expandafter\s@@b@\else\expandafter\sb\fi}
+%\def\tx@sb{\tx@sb@dflt}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Superscript correction code
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%\begingroup
+% \catcode`\^=13 % active
+% \gdef^{\s@@p}
+%\endgroup
+%\def\s@@p{\iftx@spc\expandafter\s@@p@\else\expandafter\sp\fi}
+%\def\s@@p@#1{\def\tx@next@{#1}%
+%\tx@sbptoks={#1}%
+%\tx@Pop\tx@sbptoks(into:)\tx@next% first token
+%\sp{\tx@sp \tx@next@}}
+
+%%%%%%%%%%%%%%
% Math Symbols & Notations Definitions
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -574,15 +734,21 @@ amssymbols,uprightGreek,nosubscriptcorrection}
\let\|=\Vert
\DeclareMathDelimiter{\updownarrow}{\mathrel}{symbols}{108}{largesymbols}{63}
\DeclareMathDelimiter{\Updownarrow}{\mathrel}{symbols}{109}{largesymbols}{119}
- \DeclareMathDelimiter{\llbracket}{\mathopen}{lettersA}{251}{largesymbolsTXA}{18}
+ \DeclareMathDelimiter{\llbracket}{\mathopen}{symbols}{201}{largesymbolsTXA}{18}
\let\lBrack=\llbracket
- \DeclareMathDelimiter{\rrbracket}{\mathclose}{lettersA}{252}{largesymbolsTXA}{19}
+ \DeclareMathDelimiter{\rrbracket}{\mathclose}{symbols}{202}{largesymbolsTXA}{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}
+\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
+
%\else
% \iftx@braces
% \DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{142}
@@ -599,12 +765,26 @@ amssymbols,uprightGreek,nosubscriptcorrection}
% \fi
%\fi
%\DeclareMathSymbol{+}{\mathbin}{operators}{43}
-\DeclareMathSymbol{+}{\mathbin}{lettersA}{253}
+\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}{61}
+\iftx@isenh
+ \re@DeclareMathSymbol{\hslash}{\mathord}{lettersA}{91}
+ \re@DeclareMathSymbol{\hbar}{\mathord}{lettersA}{92}
+ \re@DeclareMathSymbol{\lambdabar}{\mathord}{lettersA}{93}
+ \re@DeclareMathSymbol{\lambdaslash}{\mathord}{lettersA}{251}
+ \DeclareMathSymbol{\Zbar}{\mathord}{lettersA}{94}
+ \DeclareMathSymbol{\Angstrom}{\mathord}{lettersA}{95}
+ \DeclareMathSymbol{\Euler}{\mathord}{lettersA}{96}
+\else
+ \re@DeclareMathSymbol{\hslash}{\mathord}{AMSm}{125}
+ \re@DeclareMathSymbol{\hbar}{\mathord}{AMSm}{126}
+ \re@DeclareMathSymbol{\lambdaslash}{\mathord}{symbolsC}{110}
+ \re@DeclareMathSymbol{\lambdabar}{\mathord}{symbolsC}{111}
+\fi
%\DeclareMathSymbol{?}{\mathclose}{operators}{63}
%change the following two for better sizing
%\DeclareMathDelimiter{[}{\mathopen}{operators}{91}{largesymbols}{2}
@@ -612,21 +792,21 @@ amssymbols,uprightGreek,nosubscriptcorrection}
%\DeclareMathAccent{\hat}{\mathalpha}{operators}{94}
%\DeclareMathAccent{\tilde}{\mathalpha}{operators}{126}
\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}{\mathalpha}{symbols}{164}
+\re@DeclareMathAccent{\ddot}{\mathalpha}{symbols}{165}
+\re@DeclareMathAccent{\dddot}{\mathord}{symbols}{168}
+\re@DeclareMathAccent{\ddddot}{\mathord}{symbols}{200}
\iftx@tma
- \re@DeclareMathAccent{\grave}{\mathord}{lettersA}{254}
- \re@DeclareMathAccent{\acute}{\mathord}{lettersA}{255}
- \re@DeclareMathAccent{\check}{\mathord}{lettersA}{186}
- \re@DeclareMathAccent{\breve}{\mathord}{lettersA}{187}
- \re@DeclareMathAccent{\bar}{\mathord}{lettersA}{221}
- \re@DeclareMathAccent{\mathring}{\mathord}{lettersA}{222}
- \re@DeclareMathAccent{\hat}{\mathord}{lettersA}{223}
-% \re@DeclareMathAccent{\dot}{\mathord}{lettersA}{224}
- \re@DeclareMathAccent{\tilde}{\mathord}{lettersA}{219}
-% \re@DeclareMathAccent{\ddot}{\mathord}{lettersA}{220}
+ \re@DeclareMathAccent{\grave}{\mathord}{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}
\else
\iftx@ot %no change needed if using OT1 for operators
\else
@@ -638,13 +818,10 @@ amssymbols,uprightGreek,nosubscriptcorrection}
\re@DeclareMathAccent{\bar}{\mathalpha}{operators}{9}
\re@DeclareMathAccent{\mathring}{\mathalpha}{operators}{6}
\re@DeclareMathAccent{\hat}{\mathalpha}{operators}{2}
-% \re@DeclareMathAccent{\dot}{\mathalpha}{operators}{10}
\re@DeclareMathAccent{\tilde}{\mathalpha}{operators}{3}
-% \re@DeclareMathAccent{\ddot}{\mathalpha}{operators}{4}
\else\ifx\encodingdefault\ly@one
\re@DeclareMathAccent{\bar}{\mathalpha}{operators}{175}
\re@DeclareMathAccent{\hat}{\mathalpha}{operators}{94}
-% \re@DeclareMathAccent{\dot}{\mathalpha}{operators}{5}
\DeclareMathAccent{\tilde}{\mathalpha}{operators}{152}
\fi\fi\fi
\fi
@@ -835,12 +1012,33 @@ amssymbols,uprightGreek,nosubscriptcorrection}
\DeclareMathSymbol{\grouprda}{\mathord}{largesymbolsTXA}{83}
\DeclareMathSymbol{\grouplua}{\mathord}{largesymbolsTXA}{84}
\DeclareMathSymbol{\grouprua}{\mathord}{largesymbolsTXA}{85}
+%\def\rVecmp@h{\mathrel{\mathpalette\mathsm@sh\rVec@h}}
+%\def\rVecmp@x{\mathrel{\mathpalette\mathsm@sh\rVec@x}}
% Override default definitions of \widehat and \widetilde
\xdef\widehat#1{\mathaccent"0\hexnumber@\symlargesymbols 62{#1}}
%\DeclareMathAccent{\widehat}{\mathord}{largesymbols}{98}
\xdef\widetilde#1{\mathaccent"0\hexnumber@\symlargesymbols 65{#1}}
%\re@DeclareMathAccent{\widetilde}{\mathord}{largesymbols}{101}
+%%%%%%% Begin txvec code 2019-07-31 (adaptive vec)
+\DeclareMathSymbol{\rVec@h}{\mathrel}{symbols}{198}% vector head
+\DeclareMathSymbol{\rVec@x}{\mathrel}{symbols}{199}% vector extension
+%% borrow interfacefrom esvect
+\def\vv{\@ifstar{\vvstar}{\txvec}}
+\def\vvstar#1#2{{\txvec{#1}}_{\mkern-1mu\relax#2}}
+%%
+\newcommand{\txvec}{\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\ntxmath@vecsep\nointerlineskip}% kern controls sep to arrow
+$\m@th\hfil #2#3\hfil$\crcr}}}}
+%%%%%%%% End txvec code
+
\def\overgroup#1{\mathop{\vbox{\ialign{##\crcr\noalign{\kern.4\p@}%
\downgroupfill\crcr\noalign{\kern1.5\p@\nointerlineskip}%
$\hfil\displaystyle{#1}\hfil$\crcr}}}\limits}
@@ -1325,7 +1523,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}
@@ -1342,9 +1540,9 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\re@DeclareMathSymbol{\curvearrowright}{\mathrel}{AMSm}{121}
\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{\Bbbk}{\mathord}{AMSm}{107} % was 124
+%\re@DeclareMathSymbol{\hslash}{\mathord}{AMSm}{125}
+%\re@DeclareMathSymbol{\hbar}{\mathord}{AMSm}{126}
\re@DeclareMathSymbol{\backepsilon}{\mathrel}{AMSm}{127}
\fi
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1494,7 +1692,7 @@ $\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}
@@ -1586,7 +1784,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}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Math Italic (ntxmi) Definition % letters
@@ -1678,15 +1882,15 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Math Italic A (ntxmia) Definition % lettersA
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%\iftx@minion
-% \re@DeclareMathSymbol{\varkappa}{\mathord}{AMSm}{123}
-% \re@DeclareMathSymbol{\varkappaup}{\mathord}{AMSm}{123}
-%\else
+\iftx@isenh
+ \re@DeclareMathSymbol{\varkappait}{\mathord}{letters}{129}
+ \re@DeclareMathSymbol{\varkappaup}{\mathord}{lettersA}{129}
+\else
\re@DeclareMathSymbol{\varkappait}{\mathord}{lettersA}{41}
\let\varkappa\varkappait
\re@DeclareMathSymbol{\varkappaup}{\mathord}{lettersA}{42}
-
-%\fi
+\fi
+ \let\varkappa\varkappait
% upright Greek
\re@DeclareMathSymbol{\Gammaup}{\mathalpha}{lettersA}{0}
\re@DeclareMathSymbol{\Deltaup}{\mathalpha}{lettersA}{1}
@@ -1832,10 +2036,18 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\DeclareMathSymbol{Y}{\mathalpha}{operators}{89}
\DeclareMathSymbol{Z}{\mathalpha}{operators}{90}
\fi
-\re@DeclareMathSymbol{\varg}{\mathord}{lettersA}{49}
-\re@DeclareMathSymbol{\vary}{\mathord}{lettersA}{50}
-\re@DeclareMathSymbol{\varv}{\mathord}{lettersA}{51}
-\re@DeclareMathSymbol{\varw}{\mathord}{lettersA}{52}
+\re@DeclareMathSymbol{\varg}{\mathord}{lettersA}{181} % was 49
+\re@DeclareMathSymbol{\vary}{\mathord}{lettersA}{182} % was 50
+\re@DeclareMathSymbol{\varv}{\mathord}{lettersA}{183} % was 51
+\re@DeclareMathSymbol{\varw}{\mathord}{lettersA}{184} % was 52
+%\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}
+
+
\re@DeclareMathSymbol{\nexists}{\mathord}{symbols}{"9A}
\let\nexistsAlt=\nexists
%\re@DeclareMathSymbol{\exists}{\mathord}{lettersA}{92}
@@ -1912,11 +2124,11 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\re@DeclareMathAccent{\hat}{\mathord}{lettersA}{239}
\re@DeclareMathAccent{\tilde}{\mathord}{lettersA}{240}
\re@DeclareMathAccent{\bar}{\mathord}{lettersA}{241}
- \re@DeclareMathAccent{\breve}{\mathord}{lettersA}{242}
+ \re@DeclareMathAccent{\breve}{\mathord}{lettersA}{87} %{242}
\re@DeclareMathAccent{\dot}{\mathord}{lettersA}{243}
\re@DeclareMathAccent{\ddot}{\mathord}{lettersA}{244}
\re@DeclareMathAccent{\mathring}{\mathord}{lettersA}{245}
- \re@DeclareMathAccent{\check}{\mathord}{lettersA}{246}
+ \re@DeclareMathAccent{\check}{\mathord}{lettersA}{186} %{246}
\fi
%\def\ntx@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}
@@ -1925,35 +2137,34 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
%\@for\ntx@x:=\ntx@UC\do{\edef\ntx@tmp{\edef\csname
-\DeclareMathSymbol{\m@thbbch@rA}{\mathord}{lettersA}{129}
-\DeclareMathSymbol{\m@thbbch@rA}{\mathord}{lettersA}{129}
-\DeclareMathSymbol{\m@thbbch@rB}{\mathord}{lettersA}{130}
-\DeclareMathSymbol{\m@thbbch@rC}{\mathord}{lettersA}{131}
-\DeclareMathSymbol{\m@thbbch@rD}{\mathord}{lettersA}{132}
-\DeclareMathSymbol{\m@thbbch@rE}{\mathord}{lettersA}{133}
-\DeclareMathSymbol{\m@thbbch@rF}{\mathord}{lettersA}{134}
-\DeclareMathSymbol{\m@thbbch@rG}{\mathord}{lettersA}{135}
-\DeclareMathSymbol{\m@thbbch@rH}{\mathord}{lettersA}{136}
-\DeclareMathSymbol{\m@thbbch@rI}{\mathord}{lettersA}{137}
-\DeclareMathSymbol{\m@thbbch@rJ}{\mathord}{lettersA}{138}
-\DeclareMathSymbol{\m@thbbch@rK}{\mathord}{lettersA}{139}
-\DeclareMathSymbol{\m@thbbch@rL}{\mathord}{lettersA}{140}
-\DeclareMathSymbol{\m@thbbch@rM}{\mathord}{lettersA}{141}
-\DeclareMathSymbol{\m@thbbch@rN}{\mathord}{lettersA}{142}
-\DeclareMathSymbol{\m@thbbch@rO}{\mathord}{lettersA}{143}
-\DeclareMathSymbol{\m@thbbch@rP}{\mathord}{lettersA}{144}
-\DeclareMathSymbol{\m@thbbch@rQ}{\mathord}{lettersA}{145}
-\DeclareMathSymbol{\m@thbbch@rR}{\mathord}{lettersA}{146}
-\DeclareMathSymbol{\m@thbbch@rS}{\mathord}{lettersA}{147}
-\DeclareMathSymbol{\m@thbbch@rT}{\mathord}{lettersA}{148}
-\DeclareMathSymbol{\m@thbbch@rU}{\mathord}{lettersA}{149}
-\DeclareMathSymbol{\m@thbbch@rV}{\mathord}{lettersA}{150}
-\DeclareMathSymbol{\m@thbbch@rW}{\mathord}{lettersA}{151}
-\DeclareMathSymbol{\m@thbbch@rX}{\mathord}{lettersA}{152}
-\DeclareMathSymbol{\m@thbbch@rY}{\mathord}{lettersA}{153}
-\DeclareMathSymbol{\m@thbbch@rZ}{\mathord}{lettersA}{154}
-
-\DeclareMathSymbol{\m@thbbch@rk}{\mathord}{lettersA}{169}
+\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@rk}{\mathord}{lettersA}{168}
% Original \varmathbb macro, slightly polished
\def\DoFutureLet{%
\def\@FutureLetDecide{%
@@ -2074,9 +2285,13 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\DeclareRobustCommand{\vvmathbb}[1]{\ntx@alfa{#1}{129}{155}{181}{182}{48}{lettersA}}
\DeclareRobustCommand{\vmathbb}[1]{\ntx@alfa{#1}{183}{209}{235}{236}{48}{lettersA}}
\else
- \DeclareRobustCommand{\vmathbb}[1]{\ntx@alfa{#1}{129}{159}{}{}{}{lettersA}}
- \DeclareRobustCommand{\vvmathbb}[1]{\ntx@alfa{#1}{193}{225}{}{}{176}{lettersA}}
- %\DeclareRobustCommand{\vvmathbbb}[1]{\ntx@alfa{#1}{193}{225}{}{}{48}{boldlettersA}}
+ \iftx@isenh
+ \DeclareRobustCommand{\vmathbb}[1]{\ntx@alfa{#1}{132}{158}{186}{187}{43}{lettersA}}
+ \DeclareRobustCommand{\vvmathbb}[1]{\ntx@alfa{#1}{193}{225}{186}{187}{43}{lettersA}}
+ \else % the old mia layout
+ \DeclareRobustCommand{\vmathbb}[1]{\ntx@alfa{#1}{129}{159}{}{}{176}{lettersA}}
+ \DeclareRobustCommand{\vvmathbb}[1]{\ntx@alfa{#1}{193}{225}{}{}{176}{lettersA}}
+ \fi
\fi
%%%%%%%%%%%
%End experimental code
@@ -2241,70 +2456,6 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\bracerd\braceld%
\mkern-1mu\cleaders\hbox{$\mkern-.5mu\br@cext\mkern-.5mu$}\hfill\mkern-1mu\braceru$}
-%\iftx@libertine%
-% \iftx@largelibfigs%
-% \DeclareMathSymbol{0}{\mathalpha}{lettersA}{155}
-% \DeclareMathSymbol{1}{\mathalpha}{lettersA}{156}
-% \DeclareMathSymbol{2}{\mathalpha}{lettersA}{157}
-% \DeclareMathSymbol{3}{\mathalpha}{lettersA}{158}
-% \DeclareMathSymbol{4}{\mathalpha}{lettersA}{159}
-% \DeclareMathSymbol{5}{\mathalpha}{lettersA}{160}
-% \DeclareMathSymbol{6}{\mathalpha}{lettersA}{161}
-% \DeclareMathSymbol{7}{\mathalpha}{lettersA}{162}
-% \DeclareMathSymbol{8}{\mathalpha}{lettersA}{163}
-% \DeclareMathSymbol{9}{\mathalpha}{lettersA}{164}
-% \else
-% \DeclareMathSymbol{0}{\mathalpha}{letters}{48}
-% \DeclareMathSymbol{1}{\mathalpha}{letters}{49}
-% \DeclareMathSymbol{2}{\mathalpha}{letters}{50}
-% \DeclareMathSymbol{3}{\mathalpha}{letters}{51}
-% \DeclareMathSymbol{4}{\mathalpha}{letters}{52}
-% \DeclareMathSymbol{5}{\mathalpha}{letters}{53}
-% \DeclareMathSymbol{6}{\mathalpha}{letters}{54}
-% \DeclareMathSymbol{7}{\mathalpha}{letters}{55}
-% \DeclareMathSymbol{8}{\mathalpha}{letters}{56}
-% \DeclareMathSymbol{9}{\mathalpha}{letters}{57}
-% \fi
-% \DeclareMathSymbol{\Libzero}{\mathord}{lettersA}{155}
-% \DeclareMathSymbol{\Libone}{\mathalpha}{lettersA}{156}
-% \DeclareMathSymbol{\Libtwo}{\mathalpha}{lettersA}{157}
-% \DeclareMathSymbol{\Libthree}{\mathalpha}{lettersA}{158}
-% \DeclareMathSymbol{\Libfour}{\mathalpha}{lettersA}{159}
-% \DeclareMathSymbol{\Libfive}{\mathalpha}{lettersA}{160}
-% \DeclareMathSymbol{\Libsix}{\mathalpha}{lettersA}{161}
-% \DeclareMathSymbol{\Libseven}{\mathalpha}{lettersA}{162}
-% \DeclareMathSymbol{\Libeight}{\mathalpha}{lettersA}{163}
-% \DeclareMathSymbol{\Libnine}{\mathalpha}{lettersA}{164}
-%%
-% \DeclareMathSymbol{\libzero}{\mathalpha}{letters}{48}
-% \DeclareMathSymbol{\libone}{\mathalpha}{letters}{49}
-% \DeclareMathSymbol{\libtwo}{\mathalpha}{letters}{50}
-% \DeclareMathSymbol{\libthree}{\mathalpha}{letters}{51}
-% \DeclareMathSymbol{\libfour}{\mathalpha}{letters}{52}
-% \DeclareMathSymbol{\libfive}{\mathalpha}{letters}{53}
-% \DeclareMathSymbol{\libsix}{\mathalpha}{letters}{54}
-% \DeclareMathSymbol{\libseven}{\mathalpha}{letters}{55}
-% \DeclareMathSymbol{\libeight}{\mathalpha}{letters}{56}
-% \DeclareMathSymbol{\libnine}{\mathalpha}{letters}{57}
-% \else
-% \iftx@gm
-% \else
-% \iftx@minion
-% \else % newtxtext
-%% \DeclareMathSymbol{0}{\mathalpha}{letters}{48}
-%% \DeclareMathSymbol{1}{\mathalpha}{letters}{49}
-%% \DeclareMathSymbol{2}{\mathalpha}{letters}{50}
-%% \DeclareMathSymbol{3}{\mathalpha}{letters}{51}
-%% \DeclareMathSymbol{4}{\mathalpha}{letters}{52}
-%% \DeclareMathSymbol{5}{\mathalpha}{letters}{53}
-%% \DeclareMathSymbol{6}{\mathalpha}{letters}{54}
-%% \DeclareMathSymbol{7}{\mathalpha}{letters}{55}
-%% \DeclareMathSymbol{8}{\mathalpha}{letters}{56}
-%% \DeclareMathSymbol{9}{\mathalpha}{letters}{57}
-% \fi
-% \fi
-% \fi
-%%\fi
% Changed again 20171121 to prevent possible damage due pandoc
%%% \not redefined:
@@ -2358,6 +2509,64 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
%\DeclareRobustCommand{\textsquare}{\begingroup \usefont{U}{ntxsya}{m}{n}\thr@@\endgroup}
%\DeclareRobustCommand{\openbox}{\begingroup \usefont{U}{ntxsya}{m}{n}\thr@@\endgroup}
+\DeclareRobustCommand{\BI@}[1]{%
+\begingroup\text{\mathversion{bold}$#1$}\endgroup}
+\iftx@BI
+\DeclareRobustCommand{\BIA}{\BI@{A}}
+\DeclareRobustCommand{\BIB}{\BI@{B}}
+\DeclareRobustCommand{\BIC}{\BI@{C}}
+\DeclareRobustCommand{\BID}{\BI@{D}}
+\DeclareRobustCommand{\BIE}{\BI@{E}}
+\DeclareRobustCommand{\BIF}{\BI@{F}}
+\DeclareRobustCommand{\BIG}{\BI@{G}}
+\DeclareRobustCommand{\BIH}{\BI@{H}}
+\DeclareRobustCommand{\BII}{\BI@{I}}
+\DeclareRobustCommand{\BIJ}{\BI@{J}}
+\DeclareRobustCommand{\BIK}{\BI@{K}}
+\DeclareRobustCommand{\BIL}{\BI@{L}}
+\DeclareRobustCommand{\BIM}{\BI@{M}}
+\DeclareRobustCommand{\BIN}{\BI@{N}}
+\DeclareRobustCommand{\BIO}{\BI@{O}}
+\DeclareRobustCommand{\BIP}{\BI@{P}}
+\DeclareRobustCommand{\BIQ}{\BI@{Q}}
+\DeclareRobustCommand{\BIR}{\BI@{R}}
+\DeclareRobustCommand{\BIS}{\BI@{S}}
+\DeclareRobustCommand{\BIT}{\BI@{T}}
+\DeclareRobustCommand{\BIU}{\BI@{U}}
+\DeclareRobustCommand{\BIV}{\BI@{V}}
+\DeclareRobustCommand{\BIW}{\BI@{W}}
+\DeclareRobustCommand{\BIX}{\BI@{X}}
+\DeclareRobustCommand{\BIY}{\BI@{Y}}
+\DeclareRobustCommand{\BIZ}{\BI@{Z}}
+\DeclareRobustCommand{\BIa}{\BI@{a}}
+\DeclareRobustCommand{\BIb}{\BI@{b}}
+\DeclareRobustCommand{\BIc}{\BI@{c}}
+\DeclareRobustCommand{\BId}{\BI@{d}}
+\DeclareRobustCommand{\BIe}{\BI@{e}}
+\DeclareRobustCommand{\BIf}{\BI@{f}}
+\DeclareRobustCommand{\BIg}{\BI@{g}}
+\DeclareRobustCommand{\BIh}{\BI@{h}}
+\DeclareRobustCommand{\BIi}{\BI@{i}}
+\DeclareRobustCommand{\BIj}{\BI@{j}}
+\DeclareRobustCommand{\BIk}{\BI@{k}}
+\DeclareRobustCommand{\BIl}{\BI@{l}}
+\DeclareRobustCommand{\BIm}{\BI@{m}}
+\DeclareRobustCommand{\BIn}{\BI@{n}}
+\DeclareRobustCommand{\BIo}{\BI@{o}}
+\DeclareRobustCommand{\BIp}{\BI@{p}}
+\DeclareRobustCommand{\BIq}{\BI@{q}}
+\DeclareRobustCommand{\BIr}{\BI@{r}}
+\DeclareRobustCommand{\BIs}{\BI@{s}}
+\DeclareRobustCommand{\BIt}{\BI@{t}}
+\DeclareRobustCommand{\BIu}{\BI@{u}}
+\DeclareRobustCommand{\BIv}{\BI@{v}}
+\DeclareRobustCommand{\BIw}{\BI@{w}}
+\DeclareRobustCommand{\BIx}{\BI@{x}}
+\DeclareRobustCommand{\BIy}{\BI@{y}}
+\DeclareRobustCommand{\BIz}{\BI@{z}}
+\fi% end \iftx@BI
+
+
\def\defaultscriptratio{.73} % default is .7
\def\defaultscriptscriptratio{.55} % default is .5
\DeclareMathSizes{5} {5.5} {5.5} {5.5}
@@ -2406,5 +2615,17 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\advance\count@\@ne
\repeat
\typeout{***}}
-
+%%%%%%% Additional pdf to unicode values not in Ross Moore's collection
+\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}
+
\endinput