diff options
Diffstat (limited to 'Master')
22 files changed, 495 insertions, 115 deletions
diff --git a/Master/texmf-dist/doc/fonts/newpx/README b/Master/texmf-dist/doc/fonts/newpx/README index 323029dc201..3b5cf277a08 100644 --- a/Master/texmf-dist/doc/fonts/newpx/README +++ b/Master/texmf-dist/doc/fonts/newpx/README @@ -1,10 +1,15 @@ This package, based initially on pxfonts, provides many fixes and enhancements to that package, splitting it in two parts---newpxtext and newpxmath---which may be run independently of one another. It provides scaling, improved metrics, and other options. For proper operation, the packages require that the packages newtxmath, pxfonts and TeXGyrePagella be installed and their map files enabled. The text package now relies on an extension of the TeXGyrePagella Type1 fonts that is provided with this package. The accompanying MANIFEST-newpx.txt provides details of the extension as requested by GUST-FONT-LICENSE.txt -Current version: 1.414 2020-11-02 +Current version: 1.415 2021-03-24 This material is subject to the LaTeX Project Public License. See http://www.ctan.org/license/lppl1.3 for the details of that license. +Changes in version 1.415 +1. Added same corrections to math fonts as in newtx 1.641. +2. Added new lowercase letters to the math BB alphabet addressed by the option varbb. +3. Added an option "nohelv" to newpxtext to prevent the Helvetica clone loading as the sans serif text font. + Changes in version 1.414 Corrected zpl[b]sy,{tfm,vf} and pxbsys.pfb so that \nPerp renders as expected in both regular and bold. diff --git a/Master/texmf-dist/doc/fonts/newpx/newpxdoc.pdf b/Master/texmf-dist/doc/fonts/newpx/newpxdoc.pdf Binary files differindex e194787586c..811a0a966b8 100644 --- a/Master/texmf-dist/doc/fonts/newpx/newpxdoc.pdf +++ b/Master/texmf-dist/doc/fonts/newpx/newpxdoc.pdf diff --git a/Master/texmf-dist/doc/fonts/newpx/newpxdoc.tex b/Master/texmf-dist/doc/fonts/newpx/newpxdoc.tex index 22e9fcdd8ef..ba5cc4a189f 100644 --- a/Master/texmf-dist/doc/fonts/newpx/newpxdoc.tex +++ b/Master/texmf-dist/doc/fonts/newpx/newpxdoc.tex @@ -86,7 +86,7 @@ the new package is split into separate text and math packages that do not need t \item The problem with the {\tt ogonek} accent and tabular environments (bad definition of \verb|\k|) is fixed; \item The default encoding for \textsf{newpxtext} is now T$1$, but support is offered also for OT$1$ and LY$1$. As some add-on packages are available only in T$1$, that seems the best current choice. \item The font collection used for rendering text is based on TeXGyrePagella with a number of additions, denoted by TeXGyrePagellaX. The superior figures in this addition are set by default to render footnote markers. (It is also possible customize footnote markers by redefining \verb|\thefootnote| after loading {\tt newpxtext.sty}.) Small caps are available in all weights and styles, and are offered in two sizes. The default small caps supplied by TeXGyrePagella are really \textsc{Petite Caps}, having xheights approximately the same x-heights (sometimes smaller) as lowercase letters. Option \texttt{largesc} increases the size of small caps by about 8\%, approximating the size of Adobe Palatino Small Caps. IMO, this is a better match in terms of weight and size. For a side by side comparison: {\pcf Petite Caps}, \textsc{Small Caps}. -\item Sans serif is by default taken from TeXGyreHeros, and by default at 94\% of the scale factor (set by {\tt scaled}, default value {\tt1}). The option {\tt helvratio=.98} will change that to 98\%. +\item Sans serif is by default taken from TeXGyreHeros, a Helvetica clone, and by default at 94\% of the scale factor (set by {\tt scaled}, default value {\tt1}). The option {\tt helvratio=.98} will change that to 98\%. As of newpx version 1.415, there is an option {\tt nohelv} that prevents this loading. \item New math accents such as \verb|\widearc| have been introduced in tandem with the {\tt newtx} package, where they are documented. \end{itemize} \section{Text mode options and macros} @@ -107,7 +107,7 @@ load roman and typewriter text fonts at 95\% of normal size, and the sans serif The option \texttt{osf} instructs the text fonts to use old-style figures \oldstylenums{1234567890} rather than the default lining figures $1234567890$. As of version $1.23$, {\tt newpxtext} loads initially with lining figures so the math package uses lining figures in math mode. The option {\tt osf} switches to old-style figures in text at the very end of the preamble, forcing the use of oldstyle figures in text, but not math. In previous versions, it was necessary to run \verb|\useosf| after loading math. This is no longer required, but does no harm. See the discussion in section 4 for further details. - +As of version 1.415, the new option {\tt nohelv} prevents the loading of the default Helvetica clone as the sans serif text font. If you use this option, you should load your preferred sans serif font, otherwise you will be left with the Computer Modern default, most likely in a metafont version if not using OT1 encoding. As described above, option {\tt largesc} increases the size of small caps by about 8\%. diff --git a/Master/texmf-dist/fonts/afm/public/newpx/pxbmiaX.afm b/Master/texmf-dist/fonts/afm/public/newpx/pxbmiaX.afm index 1d1d7df14b1..6a2f2654859 100644 --- a/Master/texmf-dist/fonts/afm/public/newpx/pxbmiaX.afm +++ b/Master/texmf-dist/fonts/afm/public/newpx/pxbmiaX.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 -Comment Generated by FontForge 20190801 -Comment Creation Date: Mon Sep 9 21:11:06 2019 +Comment Generated by FontForge 20200314 +Comment Creation Date: Sun Mar 21 13:08:27 2021 FontName pxbmiaX FullName pxbmiaX FamilyName pxbmiaX @@ -13,7 +13,7 @@ UnderlineThickness 50 Version 3.1 EncodingScheme FontSpecific FontBBox -26 -302 1115 899 -StartCharMetrics 168 +StartCharMetrics 208 C 0 ; WX 556 ; N u1D6AA ; B 28 -3 539 682 ; C 1 ; WX 687 ; N u1D6AB ; B 25 0 662 693 ; C 2 ; WX 833 ; N u1D6AF ; B 47 -17 787 695 ; @@ -166,7 +166,34 @@ C 151 ; WX 1120 ; N u1D54E ; B -3 -14 1115 705 ; C 152 ; WX 784 ; N u1D54F ; B 3 -9 776 705 ; C 153 ; WX 667 ; N u1D550 ; B -2 -9 665 710 ; C 154 ; WX 817 ; N uni2124 ; B 4 -9 800 697 ; +C 155 ; WX 488 ; N u1D552 ; B 26 -10 452 483 ; +C 156 ; WX 665 ; N u1D553 ; B 25 -10 628 717 ; +C 157 ; WX 470 ; N u1D554 ; B 26 -10 433 483 ; +C 158 ; WX 547 ; N u1D555 ; B 26 -10 513 717 ; +C 159 ; WX 481 ; N u1D556 ; B 26 -10 445 483 ; +C 160 ; WX 538 ; N u1D557 ; B 34 0 511 717 ; +C 161 ; WX 525 ; N u1D558 ; B 26 -229 490 484 ; +C 162 ; WX 688 ; N u1D559 ; B 34 0 652 717 ; +C 163 ; WX 407 ; N u1D55A ; B 26 0 376 717 ; +C 164 ; WX 396 ; N u1D55B ; B 32 -229 308 717 ; C 165 ; WX 676 ; N u1D55C ; B 11 -18 680 733 ; +C 166 ; WX 421 ; N u1D55D ; B 34 0 384 717 ; +C 167 ; WX 949 ; N u1D55E ; B 16 0 923 483 ; +C 168 ; WX 649 ; N u1D55F ; B 16 0 625 483 ; +C 169 ; WX 515 ; N u1D560 ; B 26 -10 489 483 ; +C 170 ; WX 559 ; N u1D561 ; B 33 -228 521 483 ; +C 171 ; WX 549 ; N u1D562 ; B 26 -228 513 484 ; +C 172 ; WX 517 ; N u1D563 ; B 26 0 482 483 ; +C 173 ; WX 385 ; N u1D564 ; B 37 -10 349 482 ; +C 174 ; WX 436 ; N u1D565 ; B 28 -10 400 608 ; +C 175 ; WX 660 ; N u1D566 ; B 16 -11 628 472 ; +C 176 ; WX 677 ; N u1D567 ; B 23 -15 644 472 ; +C 177 ; WX 926 ; N u1D568 ; B 30 -15 892 472 ; +C 178 ; WX 632 ; N u1D569 ; B 23 0 606 472 ; +C 179 ; WX 681 ; N u1D56A ; B 23 -229 649 472 ; +C 180 ; WX 553 ; N u1D56B ; B 10 0 520 472 ; +C 181 ; WX 407 ; N u1D55A.dtls ; B 26 0 376 484 ; +C 182 ; WX 396 ; N u1D55B.dtls ; B 32 -229 308 483 ; C 186 ; WX 350 ; N caron ; B -2 556 353 741 ; C 187 ; WX 350 ; N breve ; B 16 556 335 728 ; C 188 ; WX 791 ; N uni2AEB ; B 65 0 727 579 ; @@ -182,5 +209,18 @@ C 252 ; WX 664 ; N dblbracketright ; B 57 -203 519 755 ; C 253 ; WX 600 ; N plus ; B 35 0 565 533 ; C 254 ; WX 350 ; N grave ; B 8 556 259 751 ; C 255 ; WX 350 ; N acute ; B 91 556 341 751 ; +C -1 ; WX 1000 ; N NameMe.64.1 ; B 0 0 0 0 ; +C -1 ; WX 592 ; N NameMe.53 ; B 20 -16 567 692 ; +C -1 ; WX 592 ; N NameMe.54 ; B 20 -16 567 692 ; +C -1 ; WX 592 ; N NameMe.55 ; B 20 -16 567 692 ; +C -1 ; WX 592 ; N NameMe.56 ; B 20 -16 567 692 ; +C -1 ; WX 592 ; N NameMe.57 ; B 20 -16 567 692 ; +C -1 ; WX 592 ; N NameMe.58 ; B 20 -16 567 692 ; +C -1 ; WX 592 ; N NameMe.59 ; B 20 -16 567 692 ; +C -1 ; WX 592 ; N NameMe.60 ; B 20 -16 567 692 ; +C -1 ; WX 592 ; N NameMe.61 ; B 20 -16 567 692 ; +C -1 ; WX 592 ; N NameMe.62 ; B 20 -16 567 692 ; +C -1 ; WX 592 ; N NameMe.63 ; B 20 -16 567 692 ; +C -1 ; WX 592 ; N NameMe.64 ; B 20 -16 567 692 ; EndCharMetrics EndFontMetrics diff --git a/Master/texmf-dist/fonts/afm/public/newpx/pxbsys.afm b/Master/texmf-dist/fonts/afm/public/newpx/pxbsys.afm index 46e211593f0..ca19171f068 100644 --- a/Master/texmf-dist/fonts/afm/public/newpx/pxbsys.afm +++ b/Master/texmf-dist/fonts/afm/public/newpx/pxbsys.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 Comment Generated by FontForge 20200314 -Comment Creation Date: Mon Nov 2 13:06:53 2020 +Comment Creation Date: Sun Mar 21 12:08:05 2021 FontName pxbsys FullName pxbsys FamilyName pxbsys @@ -28,8 +28,8 @@ C 10 ; WX 777 ; N circlemultiply ; B 18 -100 759 641 ; C 11 ; WX 777 ; N circledivide ; B 18 -100 759 641 ; C 12 ; WX 777 ; N circledot ; B 18 -100 759 641 ; C 13 ; WX 1103 ; N circlecopyrt ; B 65 -220 1038 751 ; -C 14 ; WX 551 ; N openbullet ; B 65 106 486 527 ; -C 15 ; WX 551 ; N bullet ; B 65 106 486 527 ; +C 14 ; WX 551 ; N openbullet ; B 65 60 486 481 ; +C 15 ; WX 551 ; N bullet ; B 65 60 486 481 ; C 16 ; WX 711 ; N equivasymptotic ; B 57 24 653 517 ; C 17 ; WX 711 ; N equivalence ; B 65 0 646 541 ; C 18 ; WX 711 ; N reflexsubset ; B 54 -103 656 644 ; diff --git a/Master/texmf-dist/fonts/afm/public/newpx/pxmiaX.afm b/Master/texmf-dist/fonts/afm/public/newpx/pxmiaX.afm index c9c0221fb61..2ce77fbad57 100644 --- a/Master/texmf-dist/fonts/afm/public/newpx/pxmiaX.afm +++ b/Master/texmf-dist/fonts/afm/public/newpx/pxmiaX.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 -Comment Generated by FontForge 20190801 -Comment Creation Date: Sat Sep 7 14:04:40 2019 +Comment Generated by FontForge 20200314 +Comment Creation Date: Sun Mar 21 13:02:49 2021 FontName pxmiaX FullName pxmiaX FamilyName pxmiaX @@ -17,7 +17,7 @@ CapHeight 697 XHeight 450 Ascender 642 Descender -217 -StartCharMetrics 181 +StartCharMetrics 208 C 0 ; WX 556 ; N uni0393 ; B 22 -3 536 692 ; C 1 ; WX 689 ; N uni0394 ; B 27 -4 662 697 ; C 2 ; WX 786 ; N uni0398 ; B 22 -20 764 709 ; @@ -169,7 +169,34 @@ C 151 ; WX 1098 ; N u1D54E ; B 5 -12 1086 696 ; C 152 ; WX 864 ; N u1D54F ; B 11 0 846 696 ; C 153 ; WX 759 ; N u1D550 ; B 23 0 740 696 ; C 154 ; WX 769 ; N uni2124 ; B 9 0 754 696 ; +C 155 ; WX 488 ; N u1D552 ; B 26 -10 452 483 ; +C 156 ; WX 665 ; N u1D553 ; B 25 -10 628 717 ; +C 157 ; WX 470 ; N u1D554 ; B 26 -10 433 483 ; +C 158 ; WX 547 ; N u1D555 ; B 26 -10 513 717 ; +C 159 ; WX 481 ; N u1D556 ; B 26 -10 445 483 ; +C 160 ; WX 538 ; N u1D557 ; B 34 0 511 717 ; +C 161 ; WX 525 ; N u1D558 ; B 26 -229 490 484 ; +C 162 ; WX 688 ; N u1D559 ; B 34 0 652 717 ; +C 163 ; WX 407 ; N u1D55A ; B 26 0 376 717 ; +C 164 ; WX 396 ; N u1D55B ; B 32 -229 308 717 ; C 165 ; WX 631 ; N u1D55C ; B 7 0 636 719 ; +C 166 ; WX 421 ; N u1D55D ; B 34 0 384 717 ; +C 167 ; WX 949 ; N u1D55E ; B 16 0 923 483 ; +C 168 ; WX 649 ; N u1D55F ; B 16 0 625 483 ; +C 169 ; WX 515 ; N u1D560 ; B 26 -10 489 483 ; +C 170 ; WX 559 ; N u1D561 ; B 33 -228 521 483 ; +C 171 ; WX 549 ; N u1D562 ; B 26 -228 513 484 ; +C 172 ; WX 517 ; N u1D563 ; B 26 0 482 483 ; +C 173 ; WX 385 ; N u1D564 ; B 37 -10 349 482 ; +C 174 ; WX 436 ; N u1D565 ; B 28 -10 400 608 ; +C 175 ; WX 660 ; N u1D566 ; B 16 -11 628 472 ; +C 176 ; WX 677 ; N u1D567 ; B 23 -15 644 472 ; +C 177 ; WX 926 ; N u1D568 ; B 30 -15 892 472 ; +C 178 ; WX 632 ; N u1D569 ; B 23 0 606 472 ; +C 179 ; WX 681 ; N u1D56A ; B 23 -229 649 472 ; +C 180 ; WX 553 ; N u1D56B ; B 10 0 520 472 ; +C 181 ; WX 407 ; N u1D55A.dtls ; B 26 0 376 484 ; +C 182 ; WX 396 ; N u1D55B.dtls ; B 32 -229 308 483 ; C 186 ; WX 333 ; N caron ; B 11 507 322 674 ; C 187 ; WX 333 ; N breve ; B 26 507 307 664 ; C 188 ; WX 749 ; N uni2AEB ; B 65 0 684 579 ; diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/pxbmiaX.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/pxbmiaX.tfm Binary files differindex 13e88279a8d..7292ee5e66e 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/pxbmiaX.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/pxbmiaX.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/pxbsys.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/pxbsys.tfm Binary files differindex 0a2f7f03d1e..73e1276d87a 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/pxbsys.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/pxbsys.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/pxmiaX.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/pxmiaX.tfm Binary files differindex 787df53c393..788c93c8041 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/pxmiaX.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/pxmiaX.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplbexx.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplbexx.tfm Binary files differindex a5ac5695ebf..436de9c1e2f 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplbexx.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplbexx.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplbmia.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplbmia.tfm Binary files differindex 48544a503b4..878f5edd85c 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplbmia.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplbmia.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplbsy.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplbsy.tfm Binary files differindex 6df43cb0545..8963fdb73de 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplbsy.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplbsy.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplexx.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplexx.tfm Binary files differindex 4a35d9165fd..2456bc38d48 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplexx.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplexx.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplmia.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplmia.tfm Binary files differindex 054c1d6d492..64a651c5c5a 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplmia.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplmia.tfm diff --git a/Master/texmf-dist/fonts/type1/public/newpx/pxbmiaX.pfb b/Master/texmf-dist/fonts/type1/public/newpx/pxbmiaX.pfb Binary files differindex ea5bf4e3b05..e8a9c5d9601 100644 --- a/Master/texmf-dist/fonts/type1/public/newpx/pxbmiaX.pfb +++ b/Master/texmf-dist/fonts/type1/public/newpx/pxbmiaX.pfb diff --git a/Master/texmf-dist/fonts/type1/public/newpx/pxbsys.pfb b/Master/texmf-dist/fonts/type1/public/newpx/pxbsys.pfb Binary files differindex 72c3d6cf5f0..322cc5c8e91 100644 --- a/Master/texmf-dist/fonts/type1/public/newpx/pxbsys.pfb +++ b/Master/texmf-dist/fonts/type1/public/newpx/pxbsys.pfb diff --git a/Master/texmf-dist/fonts/type1/public/newpx/pxmiaX.pfb b/Master/texmf-dist/fonts/type1/public/newpx/pxmiaX.pfb Binary files differindex efac5ee6486..8ae147ac7d8 100644 --- a/Master/texmf-dist/fonts/type1/public/newpx/pxmiaX.pfb +++ b/Master/texmf-dist/fonts/type1/public/newpx/pxmiaX.pfb diff --git a/Master/texmf-dist/fonts/vf/public/newpx/zplbmia.vf b/Master/texmf-dist/fonts/vf/public/newpx/zplbmia.vf Binary files differindex a9c4cb7434e..d78184e1788 100644 --- a/Master/texmf-dist/fonts/vf/public/newpx/zplbmia.vf +++ b/Master/texmf-dist/fonts/vf/public/newpx/zplbmia.vf diff --git a/Master/texmf-dist/fonts/vf/public/newpx/zplmia.vf b/Master/texmf-dist/fonts/vf/public/newpx/zplmia.vf Binary files differindex 350e9cc9eb2..f8ac61f5593 100644 --- a/Master/texmf-dist/fonts/vf/public/newpx/zplmia.vf +++ b/Master/texmf-dist/fonts/vf/public/newpx/zplmia.vf 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 diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 72e2dcbed4c..0493b120019 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -922,6 +922,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`); 'newalg', "die 'skipping, noinfo license, 1995'", 'newapa', "die 'skipping, await request for old bst+sty'", 'newproof', "die 'skipping, use piff'", + 'newpx', "&MAKEflatten", 'newsletr', "&MAKEnewsletr", 'newthm', "die 'skipping, obsolete, no longer on ctan'", 'newtx', "&MAKEflatten", @@ -2083,6 +2084,7 @@ $standardtex 'navigator', '(t-)?navigator.tex|' . $standardtex, 'nddiss', '\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$', 'newpax', '.*\.lua|' . $standardtex, + 'newpx', '.*-subs\.tex|' . $standardtex, 'newtx', '.*-subs\.tex|' . $standardtex, 'nodetree', 'nodetree.(tex|lua)|' . $standardtex, 'noindentafter', "noindentafter\.sty", |