summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FILES.byname301
-rw-r--r--FILES.byname.gzbin2555445 -> 2555557 bytes
-rw-r--r--FILES.last07days146
-rw-r--r--biblio/ctan-bibdata/ctan.bib24
-rw-r--r--biblio/ctan-bibdata/ctan.pdfbin3720417 -> 3720474 bytes
-rw-r--r--fonts/newpx/README19
-rw-r--r--fonts/newpx/afm/npxsups-Bold.afm216
-rw-r--r--fonts/newpx/afm/npxsups-BoldItalic.afm220
-rw-r--r--fonts/newpx/afm/npxsups-Italic.afm216
-rw-r--r--fonts/newpx/afm/npxsups-Regular.afm216
-rw-r--r--fonts/newpx/afm/npxsups-Slanted.afm220
-rw-r--r--fonts/newpx/doc/footsnippet-crop.pdfbin0 -> 17296 bytes
-rw-r--r--fonts/newpx/doc/newpxdoc.pdfbin424168 -> 432735 bytes
-rw-r--r--fonts/newpx/doc/newpxdoc.tex52
-rw-r--r--fonts/newpx/enc/npxdnom_LY1.enc8
-rw-r--r--fonts/newpx/enc/npxdnom_T1.enc2
-rw-r--r--fonts/newpx/enc/npxnumr_LY1.enc8
-rw-r--r--fonts/newpx/enc/npxnumr_T1.enc2
-rw-r--r--fonts/newpx/enc/npxsubs_LY1.enc8
-rw-r--r--fonts/newpx/enc/npxsubs_T1.enc2
-rw-r--r--fonts/newpx/enc/npxsups_LY1.enc10
-rw-r--r--fonts/newpx/enc/npxsups_OT1.enc2
-rw-r--r--fonts/newpx/enc/npxsups_T1.enc4
-rw-r--r--fonts/newpx/map/newpx.map36
-rw-r--r--fonts/newpx/tex/ly1minzpl.fd2
-rw-r--r--fonts/newpx/tex/ly1zpllf.fd48
-rw-r--r--fonts/newpx/tex/ly1zplosf.fd48
-rw-r--r--fonts/newpx/tex/ly1zpltlf.fd48
-rw-r--r--fonts/newpx/tex/ly1zpltosf.fd48
-rw-r--r--fonts/newpx/tex/newpxtext.sty230
-rw-r--r--fonts/newpx/tex/newpxtext1.sty766
-rw-r--r--fonts/newpx/tex/newpxtextX.sty506
-rw-r--r--fonts/newpx/tex/ot1minzpl.fd2
-rw-r--r--fonts/newpx/tex/ot1zpllf.fd48
-rw-r--r--fonts/newpx/tex/ot1zplosf.fd48
-rw-r--r--fonts/newpx/tex/ot1zpltlf.fd48
-rw-r--r--fonts/newpx/tex/ot1zpltosf.fd48
-rw-r--r--fonts/newpx/tex/t1minzpl.fd2
-rw-r--r--fonts/newpx/tex/t1zpldnom.fd2
-rw-r--r--fonts/newpx/tex/t1zplinf.fd2
-rw-r--r--fonts/newpx/tex/t1zpllf.fd48
-rw-r--r--fonts/newpx/tex/t1zplosf.fd48
-rw-r--r--fonts/newpx/tex/t1zpltlf.fd48
-rw-r--r--fonts/newpx/tex/t1zpltosf.fd48
-rw-r--r--fonts/newpx/tex/ts1zpllf.fd34
-rw-r--r--fonts/newpx/tex/ts1zplosf.fd34
-rw-r--r--fonts/newpx/tex/ts1zpltlf.fd32
-rw-r--r--fonts/newpx/tex/ts1zpltosf.fd32
-rw-r--r--fonts/newpx/tfm/zplsups-Bold-ly1.tfmbin2568 -> 3688 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-Bold-ot1.tfmbin1108 -> 3160 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-Bold-t1.tfmbin4936 -> 3624 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-Bold-ts1.tfmbin960 -> 792 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-BoldItalic-ly1.tfmbin2624 -> 3844 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-BoldItalic-ot1.tfmbin1288 -> 3312 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-BoldItalic-t1.tfmbin4384 -> 3784 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-BoldItalic-ts1.tfmbin1036 -> 808 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-BoldSlanted-ly1.tfmbin0 -> 3928 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-BoldSlanted-ot1.tfmbin0 -> 3372 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-BoldSlanted-t1.tfmbin0 -> 3860 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-BoldSlanted-ts1.tfmbin0 -> 824 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-Italic-ly1.tfmbin2760 -> 3836 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-Italic-ot1.tfmbin1276 -> 3304 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-Italic-t1.tfmbin5080 -> 3772 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-Italic-ts1.tfmbin1036 -> 800 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-Regular-ly1.tfmbin2696 -> 3772 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-Regular-ot1.tfmbin1140 -> 3244 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-Regular-t1.tfmbin5108 -> 3708 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-Regular-ts1.tfmbin956 -> 796 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-Slanted-ly1.tfmbin0 -> 3968 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-Slanted-ot1.tfmbin0 -> 3420 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-Slanted-t1.tfmbin0 -> 3904 bytes
-rw-r--r--fonts/newpx/tfm/zplsups-Slanted-ts1.tfmbin0 -> 828 bytes
-rw-r--r--fonts/newpx/type1/npxsups-Bold.pfbbin33407 -> 25914 bytes
-rw-r--r--fonts/newpx/type1/npxsups-BoldItalic.pfbbin32189 -> 25723 bytes
-rw-r--r--fonts/newpx/type1/npxsups-Italic.pfbbin32378 -> 25513 bytes
-rw-r--r--fonts/newpx/type1/npxsups-Regular.pfbbin32525 -> 24651 bytes
-rw-r--r--fonts/newpx/type1/npxsups-Slanted.pfbbin32822 -> 32852 bytes
-rw-r--r--graphics/pgf/contrib/tikz-osci/doc/tikz-osci-doc.pdfbin154401 -> 178335 bytes
-rw-r--r--graphics/pgf/contrib/tikz-osci/doc/tikz-osci-doc.tex214
-rw-r--r--graphics/pgf/contrib/tikz-osci/doc/tikz-osci-example.pdfbin137767 -> 114395 bytes
-rw-r--r--graphics/pgf/contrib/tikz-osci/doc/tikz-osci-example.tex30
-rw-r--r--graphics/pgf/contrib/tikz-osci/tikz-osci.sty309
-rw-r--r--macros/latex/contrib/customenvs/doc/customenvs-doc-en.pdfbin95687 -> 96017 bytes
-rw-r--r--macros/latex/contrib/customenvs/doc/customenvs-doc-en.tex19
-rw-r--r--macros/latex/contrib/customenvs/doc/customenvs-doc-fr.pdfbin203410 -> 321239 bytes
-rw-r--r--macros/latex/contrib/customenvs/doc/customenvs-doc-fr.tex161
-rw-r--r--macros/latex/contrib/customenvs/tex/customenvs.sty319
-rw-r--r--macros/latex/contrib/hereapplies/ChangeLog.md7
-rw-r--r--macros/latex/contrib/hereapplies/README.md4
-rw-r--r--macros/latex/contrib/hereapplies/hereapplies-doc.lyx8
-rw-r--r--macros/latex/contrib/hereapplies/hereapplies-doc.pdfbin366138 -> 367285 bytes
-rw-r--r--macros/latex/contrib/hereapplies/hereapplies-doc.tex12
-rw-r--r--macros/latex/contrib/hereapplies/hereapplies-example.pdfbin49410 -> 49699 bytes
-rw-r--r--macros/latex/contrib/hereapplies/hereapplies.sty19
-rw-r--r--macros/latex/contrib/hereapplies/package.json2
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-code.dtx1224
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-code.pdfbin943866 -> 953487 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.pdfbin590286 -> 593655 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.tex179
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.pdfbin606674 -> 610304 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.tex205
-rw-r--r--support/TeX4ht/source/ChangeLog4
-rw-r--r--support/TeX4ht/source/tex4ht-4ht.tex4
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl2
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb267
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.md52
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha5122
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc16
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.xzbin2480092 -> 2477744 bytes
-rw-r--r--timestamp2
110 files changed, 4692 insertions, 2251 deletions
diff --git a/FILES.byname b/FILES.byname
index 2870e63eed..1f5926d5f9 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -2058,12 +2058,12 @@
2023/10/05 | 1710 | biblio/citation-style-language/README.md
2023/10/05 | 12878 | biblio/citation-style-language/vancouver.csl
2023/10/05 | 4531754 | biblio/citation-style-language.zip
-2023/10/23 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/10/24 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2022/10/08 | 127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx
-2023/10/23 | 2819854 | biblio/ctan-bibdata/ctan.bib
-2023/10/23 | 3718031 | biblio/ctan-bibdata/ctan.pdf
+2023/10/24 | 2820450 | biblio/ctan-bibdata/ctan.bib
+2023/10/24 | 3720417 | biblio/ctan-bibdata/ctan.pdf
2023/01/16 | 1489 | biblio/ctan-bibdata/README
-2023/10/23 | 4121707 | biblio/ctan-bibdata.zip
+2023/10/24 | 4124646 | biblio/ctan-bibdata.zip
2023/02/23 | 3126 | biblio/pbibtex/pbibtex-base/cpp.awk
2023/02/23 | 1009 | biblio/pbibtex/pbibtex-base/generate.sh
2023/02/23 | 22362 | biblio/pbibtex/pbibtex-base/jabbrv.bst
@@ -5423,7 +5423,7 @@
1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp
1990/10/02 | 812 | dviware/vutex/vaxvms.ins
1990/10/02 | 127576 | dviware/vutex/vutex.web
-2023/10/23 | 38823 | FILES.last07days
+2023/10/24 | 64143 | FILES.last07days
2021/07/24 | 1139410 | fonts/aboensis/Aboensis.glyphs
2021/07/24 | 18907382 | fonts/aboensis/aboensis.pdf
2021/07/24 | 137860 | fonts/aboensis/Aboensis-Regular.otf
@@ -84306,12 +84306,12 @@
2019/09/10 | 4864 | fonts/newpx/afm/NewPXBMI_gnu.afm
2020/06/03 | 5651 | fonts/newpx/afm/NewPXMI.afm
2019/09/10 | 3575 | fonts/newpx/afm/NewPXMI_gnu.afm
-2023/09/06 | 15531 | fonts/newpx/afm/npxsups-Bold.afm
-2023/09/06 | 15658 | fonts/newpx/afm/npxsups-BoldItalic.afm
+2023/10/05 | 15531 | fonts/newpx/afm/npxsups-Bold.afm
+2023/10/05 | 15661 | fonts/newpx/afm/npxsups-BoldItalic.afm
2023/09/06 | 15592 | fonts/newpx/afm/npxsups-BoldSlanted.afm
-2023/09/06 | 15543 | fonts/newpx/afm/npxsups-Italic.afm
-2023/09/06 | 15612 | fonts/newpx/afm/npxsups-Regular.afm
-2023/09/06 | 15657 | fonts/newpx/afm/npxsups-Slanted.afm
+2023/10/05 | 15545 | fonts/newpx/afm/npxsups-Italic.afm
+2023/10/05 | 15614 | fonts/newpx/afm/npxsups-Regular.afm
+2023/10/05 | 15682 | fonts/newpx/afm/npxsups-Slanted.afm
2021/10/13 | 8278 | fonts/newpx/afm/pxbmiaX.afm
2006/01/09 | 6549 | fonts/newpx/afm/pxbsyb.afm
2021/03/21 | 10621 | fonts/newpx/afm/pxbsys.afm
@@ -84330,30 +84330,31 @@
2023/09/03 | 510444 | fonts/newpx/afm/zplri.afm
2023/09/03 | 382853 | fonts/newpx/afm/zplrsl.afm
2019/09/22 | 2226 | fonts/newpx/doc/ChangesInV1.4.txt
+2023/10/23 | 17296 | fonts/newpx/doc/footsnippet-crop.pdf
2015/04/20 | 635 | fonts/newpx/doc/MANIFEST-newpx.txt
-2023/09/27 | 424168 | fonts/newpx/doc/newpxdoc.pdf
-2023/09/27 | 67791 | fonts/newpx/doc/newpxdoc.tex
+2023/10/24 | 432735 | fonts/newpx/doc/newpxdoc.pdf
+2023/10/24 | 70266 | fonts/newpx/doc/newpxdoc.tex
2013/03/29 | 8118 | fonts/newpx/doc/newpxeg-crop.pdf
2013/03/27 | 8858 | fonts/newpx/doc/pxfontseg-crop.pdf
2023/08/02 | 83 | fonts/newpx/doc/TRK.fea
-2021/09/24 | 3050 | fonts/newpx/enc/npxdnom_LY1.enc
+2023/10/03 | 3047 | fonts/newpx/enc/npxdnom_LY1.enc
2021/09/24 | 2114 | fonts/newpx/enc/npxdnom_OT1.enc
-2021/09/24 | 2968 | fonts/newpx/enc/npxdnom_T1.enc
-2021/09/24 | 3050 | fonts/newpx/enc/npxnumr_LY1.enc
+2023/10/03 | 2968 | fonts/newpx/enc/npxdnom_T1.enc
+2023/10/03 | 3047 | fonts/newpx/enc/npxnumr_LY1.enc
2021/09/24 | 2114 | fonts/newpx/enc/npxnumr_OT1.enc
-2021/09/24 | 2968 | fonts/newpx/enc/npxnumr_T1.enc
-2021/09/24 | 3050 | fonts/newpx/enc/npxsubs_LY1.enc
+2023/10/03 | 2968 | fonts/newpx/enc/npxnumr_T1.enc
+2023/10/03 | 3047 | fonts/newpx/enc/npxsubs_LY1.enc
2021/09/24 | 2114 | fonts/newpx/enc/npxsubs_OT1.enc
-2021/09/24 | 2968 | fonts/newpx/enc/npxsubs_T1.enc
-2018/10/07 | 3713 | fonts/newpx/enc/npxsups_LY1.enc
-2018/10/07 | 2787 | fonts/newpx/enc/npxsups_OT1.enc
-2018/10/07 | 3661 | fonts/newpx/enc/npxsups_T1.enc
+2023/10/03 | 2968 | fonts/newpx/enc/npxsubs_T1.enc
+2023/10/05 | 3713 | fonts/newpx/enc/npxsups_LY1.enc
+2023/10/05 | 2787 | fonts/newpx/enc/npxsups_OT1.enc
+2023/10/05 | 3662 | fonts/newpx/enc/npxsups_T1.enc
2023/09/06 | 3934 | fonts/newpx/enc/npxsups_TS1.enc
2015/07/16 | 2578 | fonts/newpx/enc/tgpdiff.enc
2023/09/03 | 2657 | fonts/newpx/enc/zpl_OsF.enc
2023/09/05 | 4049 | fonts/newpx/enc/zplsups-ts1.enc
2023/09/03 | 2688 | fonts/newpx/enc/zpl_TOsF.enc
-2023/09/06 | 36325 | fonts/newpx/map/newpx.map
+2023/10/05 | 36325 | fonts/newpx/map/newpx.map
2023/09/06 | 20440 | fonts/newpx/opentype/npxsups-BoldItalic.otf
2023/09/06 | 19544 | fonts/newpx/opentype/npxsups-Bold.otf
2023/09/06 | 21064 | fonts/newpx/opentype/npxsups-BoldSlanted.otf
@@ -84366,65 +84367,67 @@
2023/09/06 | 234900 | fonts/newpx/opentype/TeXGyrePagellaX-Italic.otf
2023/09/06 | 212404 | fonts/newpx/opentype/TeXGyrePagellaX-Regular.otf
2023/09/06 | 220664 | fonts/newpx/opentype/TeXGyrePagellaX-Slanted.otf
-2023/09/27 | 23388 | fonts/newpx/README
+2023/10/24 | 24143 | fonts/newpx/README
2016/07/06 | 694 | fonts/newpx/tex/lmsnpxsy.fd
2016/07/06 | 690 | fonts/newpx/tex/lmxnpxexx.fd
-2023/08/04 | 2094 | fonts/newpx/tex/ly1minzpl.fd
+2023/10/06 | 2101 | fonts/newpx/tex/ly1minzpl.fd
2015/05/01 | 1510 | fonts/newpx/tex/ly1npxtt.fd
2021/11/22 | 1881 | fonts/newpx/tex/ly1zpldnom.fd
2021/11/22 | 1843 | fonts/newpx/tex/ly1zplinf.fd
-2021/11/15 | 2047 | fonts/newpx/tex/ly1zpllf.fd
-2021/11/15 | 2091 | fonts/newpx/tex/ly1zplosf.fd
+2023/10/06 | 2054 | fonts/newpx/tex/ly1zpllf.fd
+2023/10/06 | 2098 | fonts/newpx/tex/ly1zplosf.fd
2021/11/22 | 1881 | fonts/newpx/tex/ly1zplsubs.fd
2023/09/06 | 1909 | fonts/newpx/tex/ly1zplsups.fd
2021/05/20 | 1532 | fonts/newpx/tex/ly1zplth-lf.fd
2021/05/20 | 1570 | fonts/newpx/tex/ly1zplth-osf.fd
2021/05/20 | 1570 | fonts/newpx/tex/ly1zplth-tlf.fd
2021/05/20 | 1609 | fonts/newpx/tex/ly1zplth-tosf.fd
-2021/11/15 | 2091 | fonts/newpx/tex/ly1zpltlf.fd
-2021/11/15 | 2265 | fonts/newpx/tex/ly1zpltosf.fd
+2023/10/06 | 2098 | fonts/newpx/tex/ly1zpltlf.fd
+2023/10/06 | 2272 | fonts/newpx/tex/ly1zpltosf.fd
2023/08/07 | 114939 | fonts/newpx/tex/newpxmath.sty
2023/08/08 | 4031 | fonts/newpx/tex/newpx.sty
2019/09/06 | 151 | fonts/newpx/tex/newpx-subs.tex
-2023/09/27 | 23265 | fonts/newpx/tex/newpxtext.sty
+2023/10/03 | 23599 | fonts/newpx/tex/newpxtext1.sty
+2023/10/24 | 24308 | fonts/newpx/tex/newpxtext.sty
+2023/10/03 | 15424 | fonts/newpx/tex/newpxtextX.sty
2013/04/01 | 1021 | fonts/newpx/tex/omlnpxmi.fd
-2023/08/04 | 2094 | fonts/newpx/tex/ot1minzpl.fd
+2023/10/06 | 2101 | fonts/newpx/tex/ot1minzpl.fd
2015/05/01 | 1510 | fonts/newpx/tex/ot1npxtt.fd
2021/11/22 | 1881 | fonts/newpx/tex/ot1zpldnom.fd
2021/11/22 | 1843 | fonts/newpx/tex/ot1zplinf.fd
-2021/11/15 | 2047 | fonts/newpx/tex/ot1zpllf.fd
-2021/11/15 | 2091 | fonts/newpx/tex/ot1zplosf.fd
+2023/10/06 | 2054 | fonts/newpx/tex/ot1zpllf.fd
+2023/10/06 | 2098 | fonts/newpx/tex/ot1zplosf.fd
2015/05/01 | 1881 | fonts/newpx/tex/ot1zplsubs.fd
2023/09/06 | 1909 | fonts/newpx/tex/ot1zplsups.fd
2021/05/20 | 1532 | fonts/newpx/tex/ot1zplth-lf.fd
2021/05/20 | 1570 | fonts/newpx/tex/ot1zplth-osf.fd
2021/05/20 | 1570 | fonts/newpx/tex/ot1zplth-tlf.fd
2021/05/20 | 1608 | fonts/newpx/tex/ot1zplth-tosf.fd
-2021/11/15 | 2091 | fonts/newpx/tex/ot1zpltlf.fd
-2021/11/15 | 2265 | fonts/newpx/tex/ot1zpltosf.fd
-2023/08/04 | 2059 | fonts/newpx/tex/t1minzpl.fd
+2023/10/06 | 2098 | fonts/newpx/tex/ot1zpltlf.fd
+2023/10/06 | 2272 | fonts/newpx/tex/ot1zpltosf.fd
+2023/10/06 | 2066 | fonts/newpx/tex/t1minzpl.fd
2015/05/01 | 1516 | fonts/newpx/tex/t1npxtt.fd
-2021/11/24 | 1857 | fonts/newpx/tex/t1zpldnom.fd
-2021/11/22 | 1819 | fonts/newpx/tex/t1zplinf.fd
-2021/11/15 | 2011 | fonts/newpx/tex/t1zpllf.fd
+2023/10/05 | 1857 | fonts/newpx/tex/t1zpldnom.fd
+2023/10/05 | 1819 | fonts/newpx/tex/t1zplinf.fd
+2023/10/06 | 2016 | fonts/newpx/tex/t1zpllf.fd
2021/11/22 | 1857 | fonts/newpx/tex/t1zplnumr.fd
-2021/11/15 | 2057 | fonts/newpx/tex/t1zplosf.fd
+2023/10/06 | 2064 | fonts/newpx/tex/t1zplosf.fd
2021/11/22 | 1857 | fonts/newpx/tex/t1zplsubs.fd
2023/09/06 | 1881 | fonts/newpx/tex/t1zplsups.fd
2021/05/20 | 1510 | fonts/newpx/tex/t1zplth-lf.fd
2021/05/20 | 1549 | fonts/newpx/tex/t1zplth-osf.fd
2021/05/20 | 1540 | fonts/newpx/tex/t1zplth-tlf.fd
2021/05/20 | 1586 | fonts/newpx/tex/t1zplth-tosf.fd
-2021/11/15 | 2056 | fonts/newpx/tex/t1zpltlf.fd
-2021/11/15 | 2230 | fonts/newpx/tex/t1zpltosf.fd
+2023/10/06 | 2063 | fonts/newpx/tex/t1zpltlf.fd
+2023/10/06 | 2237 | fonts/newpx/tex/t1zpltosf.fd
2021/09/18 | 325 | fonts/newpx/tex/TeXGyrePagellaX.fontspec
2015/05/01 | 1501 | fonts/newpx/tex/ts1npxtt.fd
-2021/11/25 | 1273 | fonts/newpx/tex/ts1zpllf.fd
-2021/11/25 | 1306 | fonts/newpx/tex/ts1zplosf.fd
+2023/10/05 | 1273 | fonts/newpx/tex/ts1zpllf.fd
+2023/10/05 | 1306 | fonts/newpx/tex/ts1zplosf.fd
2023/09/06 | 1881 | fonts/newpx/tex/ts1zplsups1.fd
2023/08/18 | 1900 | fonts/newpx/tex/ts1zplsups.fd
-2021/11/25 | 1306 | fonts/newpx/tex/ts1zpltlf.fd
-2021/11/25 | 1339 | fonts/newpx/tex/ts1zpltosf.fd
+2023/10/05 | 1306 | fonts/newpx/tex/ts1zpltlf.fd
+2023/10/05 | 1339 | fonts/newpx/tex/ts1zpltosf.fd
2013/04/01 | 628 | fonts/newpx/tex/unpxexa.fd
2013/04/01 | 837 | fonts/newpx/tex/unpxmia.fd
2013/04/01 | 1501 | fonts/newpx/tex/unpxss.fd
@@ -84753,22 +84756,30 @@
2021/11/14 | 7904 | fonts/newpx/tfm/zplsubs-Slanted-ly1.tfm
2021/11/14 | 3512 | fonts/newpx/tfm/zplsubs-Slanted-ot1.tfm
2021/11/14 | 12428 | fonts/newpx/tfm/zplsubs-Slanted-t1.tfm
-2020/06/03 | 2624 | fonts/newpx/tfm/zplsups-BoldItalic-ly1.tfm
-2020/06/03 | 1288 | fonts/newpx/tfm/zplsups-BoldItalic-ot1.tfm
-2020/06/03 | 4384 | fonts/newpx/tfm/zplsups-BoldItalic-t1.tfm
-2023/08/18 | 1036 | fonts/newpx/tfm/zplsups-BoldItalic-ts1.tfm
-2020/06/03 | 2568 | fonts/newpx/tfm/zplsups-Bold-ly1.tfm
-2020/06/03 | 1108 | fonts/newpx/tfm/zplsups-Bold-ot1.tfm
-2020/06/03 | 4936 | fonts/newpx/tfm/zplsups-Bold-t1.tfm
-2023/08/18 | 960 | fonts/newpx/tfm/zplsups-Bold-ts1.tfm
-2020/06/03 | 2760 | fonts/newpx/tfm/zplsups-Italic-ly1.tfm
-2020/06/03 | 1276 | fonts/newpx/tfm/zplsups-Italic-ot1.tfm
-2020/06/03 | 5080 | fonts/newpx/tfm/zplsups-Italic-t1.tfm
-2023/08/18 | 1036 | fonts/newpx/tfm/zplsups-Italic-ts1.tfm
-2020/06/03 | 2696 | fonts/newpx/tfm/zplsups-Regular-ly1.tfm
-2020/06/03 | 1140 | fonts/newpx/tfm/zplsups-Regular-ot1.tfm
-2020/06/03 | 5108 | fonts/newpx/tfm/zplsups-Regular-t1.tfm
-2023/08/18 | 956 | fonts/newpx/tfm/zplsups-Regular-ts1.tfm
+2023/10/05 | 3844 | fonts/newpx/tfm/zplsups-BoldItalic-ly1.tfm
+2023/10/05 | 3312 | fonts/newpx/tfm/zplsups-BoldItalic-ot1.tfm
+2023/10/05 | 3784 | fonts/newpx/tfm/zplsups-BoldItalic-t1.tfm
+2023/10/05 | 808 | fonts/newpx/tfm/zplsups-BoldItalic-ts1.tfm
+2023/10/05 | 3688 | fonts/newpx/tfm/zplsups-Bold-ly1.tfm
+2023/10/05 | 3160 | fonts/newpx/tfm/zplsups-Bold-ot1.tfm
+2023/10/05 | 3928 | fonts/newpx/tfm/zplsups-BoldSlanted-ly1.tfm
+2023/10/05 | 3372 | fonts/newpx/tfm/zplsups-BoldSlanted-ot1.tfm
+2023/10/05 | 3860 | fonts/newpx/tfm/zplsups-BoldSlanted-t1.tfm
+2023/10/05 | 824 | fonts/newpx/tfm/zplsups-BoldSlanted-ts1.tfm
+2023/10/05 | 3624 | fonts/newpx/tfm/zplsups-Bold-t1.tfm
+2023/10/05 | 792 | fonts/newpx/tfm/zplsups-Bold-ts1.tfm
+2023/10/05 | 3836 | fonts/newpx/tfm/zplsups-Italic-ly1.tfm
+2023/10/05 | 3304 | fonts/newpx/tfm/zplsups-Italic-ot1.tfm
+2023/10/05 | 3772 | fonts/newpx/tfm/zplsups-Italic-t1.tfm
+2023/10/05 | 800 | fonts/newpx/tfm/zplsups-Italic-ts1.tfm
+2023/10/05 | 3772 | fonts/newpx/tfm/zplsups-Regular-ly1.tfm
+2023/10/05 | 3244 | fonts/newpx/tfm/zplsups-Regular-ot1.tfm
+2023/10/05 | 3708 | fonts/newpx/tfm/zplsups-Regular-t1.tfm
+2023/10/05 | 796 | fonts/newpx/tfm/zplsups-Regular-ts1.tfm
+2023/10/05 | 3968 | fonts/newpx/tfm/zplsups-Slanted-ly1.tfm
+2023/10/05 | 3420 | fonts/newpx/tfm/zplsups-Slanted-ot1.tfm
+2023/10/05 | 3904 | fonts/newpx/tfm/zplsups-Slanted-t1.tfm
+2023/10/05 | 828 | fonts/newpx/tfm/zplsups-Slanted-ts1.tfm
2020/05/18 | 1028 | fonts/newpx/tfm/zplsyc.tfm
2023/08/26 | 1572 | fonts/newpx/tfm/zplsym.tfm
2021/05/31 | 2004 | fonts/newpx/tfm/zplsy.tfm
@@ -84890,12 +84901,12 @@
2020/06/03 | 24085 | fonts/newpx/type1/NewPXBMI.pfb
2019/09/10 | 16003 | fonts/newpx/type1/NewPXMI_gnu.pfb
2020/06/03 | 25273 | fonts/newpx/type1/NewPXMI.pfb
-2023/09/06 | 32189 | fonts/newpx/type1/npxsups-BoldItalic.pfb
-2023/09/06 | 33407 | fonts/newpx/type1/npxsups-Bold.pfb
+2023/10/14 | 25723 | fonts/newpx/type1/npxsups-BoldItalic.pfb
+2023/10/14 | 25914 | fonts/newpx/type1/npxsups-Bold.pfb
2023/09/06 | 34470 | fonts/newpx/type1/npxsups-BoldSlanted.pfb
-2023/09/06 | 32378 | fonts/newpx/type1/npxsups-Italic.pfb
-2023/09/06 | 32525 | fonts/newpx/type1/npxsups-Regular.pfb
-2023/09/06 | 32822 | fonts/newpx/type1/npxsups-Slanted.pfb
+2023/10/14 | 25513 | fonts/newpx/type1/npxsups-Italic.pfb
+2023/10/14 | 24651 | fonts/newpx/type1/npxsups-Regular.pfb
+2023/10/05 | 32852 | fonts/newpx/type1/npxsups-Slanted.pfb
2021/10/13 | 43702 | fonts/newpx/type1/pxbmiaX.pfb
2021/05/31 | 38867 | fonts/newpx/type1/pxbsys.pfb
2021/10/13 | 55131 | fonts/newpx/type1/pxmiaX.pfb
@@ -84931,7 +84942,7 @@
2013/03/29 | 980 | fonts/newpx/vf/zplsyc.vf
2023/08/26 | 1668 | fonts/newpx/vf/zplsym.vf
2021/05/31 | 1792 | fonts/newpx/vf/zplsy.vf
-2023/09/28 | 7480224 | fonts/newpx.zip
+2023/10/24 | 7522180 | fonts/newpx.zip
2019/06/17 | 524 | fonts/newtx/afm/LibertineI-5nu.afm
2019/10/26 | 7516 | fonts/newtx/afm/LibertineMathBMI5.afm
2019/10/26 | 7506 | fonts/newtx/afm/LibertineMathBMI7.afm
@@ -161591,13 +161602,13 @@
2015/03/05 | 17082 | graphics/pgf/contrib/tikzorbital/tikzorbital.sty
2015/03/05 | 20955 | graphics/pgf/contrib/tikzorbital/tikzorbital.tex
2015/03/05 | 200915 | graphics/pgf/contrib/tikzorbital.zip
-2023/10/08 | 154401 | graphics/pgf/contrib/tikz-osci/doc/tikz-osci-doc.pdf
-2023/10/08 | 13388 | graphics/pgf/contrib/tikz-osci/doc/tikz-osci-doc.tex
-2023/10/08 | 137767 | graphics/pgf/contrib/tikz-osci/doc/tikz-osci-example.pdf
-2023/10/08 | 3504 | graphics/pgf/contrib/tikz-osci/doc/tikz-osci-example.tex
-2023/10/08 | 312 | graphics/pgf/contrib/tikz-osci/README.md
-2023/10/08 | 10688 | graphics/pgf/contrib/tikz-osci/tikz-osci.sty
-2023/10/09 | 267580 | graphics/pgf/contrib/tikz-osci.zip
+2023/10/24 | 178335 | graphics/pgf/contrib/tikz-osci/doc/tikz-osci-doc.pdf
+2023/10/24 | 16730 | graphics/pgf/contrib/tikz-osci/doc/tikz-osci-doc.tex
+2023/10/24 | 114395 | graphics/pgf/contrib/tikz-osci/doc/tikz-osci-example.pdf
+2023/10/24 | 4184 | graphics/pgf/contrib/tikz-osci/doc/tikz-osci-example.tex
+2023/10/07 | 312 | graphics/pgf/contrib/tikz-osci/README.md
+2023/10/24 | 18502 | graphics/pgf/contrib/tikz-osci/tikz-osci.sty
+2023/10/24 | 266629 | graphics/pgf/contrib/tikz-osci.zip
2020/07/13 | 656 | graphics/pgf/contrib/tikzpackets/README
2020/07/13 | 65270 | graphics/pgf/contrib/tikzpackets/tikzPackets.pdf
2020/07/13 | 4559 | graphics/pgf/contrib/tikzpackets/tikzPackets.sty
@@ -218550,13 +218561,13 @@
2008/08/25 | 8826 | macros/latex/contrib/custom-bib/suppjour.mbs
2008/08/25 | 7460 | macros/latex/contrib/custom-bib/svenska.mbs
2011/11/18 | 900708 | macros/latex/contrib/custom-bib.zip
-2023/10/22 | 95687 | macros/latex/contrib/customenvs/doc/customenvs-doc-en.pdf
-2023/10/22 | 10554 | macros/latex/contrib/customenvs/doc/customenvs-doc-en.tex
-2023/10/22 | 203410 | macros/latex/contrib/customenvs/doc/customenvs-doc-fr.pdf
-2023/10/22 | 17717 | macros/latex/contrib/customenvs/doc/customenvs-doc-fr.tex
+2023/10/24 | 96017 | macros/latex/contrib/customenvs/doc/customenvs-doc-en.pdf
+2023/10/24 | 10812 | macros/latex/contrib/customenvs/doc/customenvs-doc-en.tex
+2023/10/24 | 321239 | macros/latex/contrib/customenvs/doc/customenvs-doc-fr.pdf
+2023/10/24 | 24043 | macros/latex/contrib/customenvs/doc/customenvs-doc-fr.tex
2023/10/21 | 449 | macros/latex/contrib/customenvs/README.md
-2023/10/22 | 15240 | macros/latex/contrib/customenvs/tex/customenvs.sty
-2023/10/22 | 303446 | macros/latex/contrib/customenvs.zip
+2023/10/24 | 28072 | macros/latex/contrib/customenvs/tex/customenvs.sty
+2023/10/24 | 423179 | macros/latex/contrib/customenvs.zip
2021/10/30 | 33647 | macros/latex/contrib/cutwin/cutwin.dtx
2021/10/30 | 2844 | macros/latex/contrib/cutwin/cutwin.ins
2021/10/30 | 341874 | macros/latex/contrib/cutwin/cutwin.pdf
@@ -225323,19 +225334,19 @@
2020/04/10 | 1003 | macros/latex/contrib/hepunits/README
2020/04/10 | 101262 | macros/latex/contrib/hepunits.zip
2005/12/14 | 3617 | macros/latex/contrib/hep.zip
-2022/12/11 | 2717 | macros/latex/contrib/hereapplies/ChangeLog.md
-2022/12/11 | 34523 | macros/latex/contrib/hereapplies/COPYING
-2022/12/11 | 16345 | macros/latex/contrib/hereapplies/hereapplies-doc.lyx
-2022/12/11 | 366138 | macros/latex/contrib/hereapplies/hereapplies-doc.pdf
-2022/12/11 | 8039 | macros/latex/contrib/hereapplies/hereapplies-doc.tex
-2022/12/11 | 49410 | macros/latex/contrib/hereapplies/hereapplies-example.pdf
-2022/12/11 | 930 | macros/latex/contrib/hereapplies/hereapplies-example.tex
-2022/12/11 | 19930 | macros/latex/contrib/hereapplies/hereapplies.sty
-2022/12/11 | 5022 | macros/latex/contrib/hereapplies/lyx-module/hereapplies-example.lyx
-2022/12/11 | 2853 | macros/latex/contrib/hereapplies/lyx-module/hereapplies.module
-2022/12/11 | 743 | macros/latex/contrib/hereapplies/package.json
-2022/12/11 | 5851 | macros/latex/contrib/hereapplies/README.md
-2022/12/11 | 432320 | macros/latex/contrib/hereapplies.zip
+2023/10/24 | 2768 | macros/latex/contrib/hereapplies/ChangeLog.md
+2022/09/03 | 34523 | macros/latex/contrib/hereapplies/COPYING
+2023/03/27 | 16338 | macros/latex/contrib/hereapplies/hereapplies-doc.lyx
+2023/10/24 | 367285 | macros/latex/contrib/hereapplies/hereapplies-doc.pdf
+2023/10/24 | 8031 | macros/latex/contrib/hereapplies/hereapplies-doc.tex
+2023/10/24 | 49699 | macros/latex/contrib/hereapplies/hereapplies-example.pdf
+2022/09/03 | 930 | macros/latex/contrib/hereapplies/hereapplies-example.tex
+2023/10/24 | 19963 | macros/latex/contrib/hereapplies/hereapplies.sty
+2022/09/03 | 5022 | macros/latex/contrib/hereapplies/lyx-module/hereapplies-example.lyx
+2022/09/03 | 2853 | macros/latex/contrib/hereapplies/lyx-module/hereapplies.module
+2023/10/24 | 743 | macros/latex/contrib/hereapplies/package.json
+2023/03/27 | 5844 | macros/latex/contrib/hereapplies/README.md
+2023/10/24 | 434420 | macros/latex/contrib/hereapplies.zip
2009/11/22 | 439 | macros/latex/contrib/here/here.sty
2009/11/22 | 399 | macros/latex/contrib/here/README
2009/11/22 | 866 | macros/latex/contrib/here.zip
@@ -231701,15 +231712,15 @@
1996/03/22 | 18862 | macros/latex/contrib/niceframe/umrandb.mf
2015/01/17 | 1370 | macros/latex/contrib/niceframe/umrand.mf
2015/01/17 | 287910 | macros/latex/contrib/niceframe.zip
-2023/09/28 | 574708 | macros/latex/contrib/nicematrix/nicematrix-code.dtx
-2023/09/28 | 943866 | macros/latex/contrib/nicematrix/nicematrix-code.pdf
-2023/09/28 | 590286 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
-2023/09/28 | 245214 | macros/latex/contrib/nicematrix/nicematrix-french.tex
+2023/10/24 | 581937 | macros/latex/contrib/nicematrix/nicematrix-code.dtx
+2023/10/24 | 953487 | macros/latex/contrib/nicematrix/nicematrix-code.pdf
+2023/10/24 | 593655 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
+2023/10/11 | 247166 | macros/latex/contrib/nicematrix/nicematrix-french.tex
2023/08/14 | 1428 | macros/latex/contrib/nicematrix/nicematrix.ins
-2023/09/28 | 606674 | macros/latex/contrib/nicematrix/nicematrix.pdf
-2023/09/28 | 255242 | macros/latex/contrib/nicematrix/nicematrix.tex
+2023/10/24 | 610304 | macros/latex/contrib/nicematrix/nicematrix.pdf
+2023/10/24 | 257352 | macros/latex/contrib/nicematrix/nicematrix.tex
2023/05/15 | 1028 | macros/latex/contrib/nicematrix/README.md
-2023/09/28 | 2317398 | macros/latex/contrib/nicematrix.zip
+2023/10/24 | 2335913 | macros/latex/contrib/nicematrix.zip
2015/11/21 | 217 | macros/latex/contrib/nicetext/ANNOUNCE.txt
2012/03/18 | 254582 | macros/latex/contrib/nicetext/demo/arseneau.pdf
2011/09/14 | 10 | macros/latex/contrib/nicetext/demo/iso.txt
@@ -291032,9 +291043,9 @@
2022/11/26 | 880816 | systems/texlive/tlnet/archive/achemso.doc.r65103.tar.xz
2022/11/26 | 19300 | systems/texlive/tlnet/archive/achemso.r65103.tar.xz
2022/11/26 | 31496 | systems/texlive/tlnet/archive/achemso.source.r65103.tar.xz
-2023/10/16 | 4855488 | systems/texlive/tlnet/archive/acmart.doc.r68550.tar.xz
-2023/10/16 | 43084 | systems/texlive/tlnet/archive/acmart.r68550.tar.xz
-2023/10/16 | 62364 | systems/texlive/tlnet/archive/acmart.source.r68550.tar.xz
+2023/10/24 | 4855488 | systems/texlive/tlnet/archive/acmart.doc.r68624.tar.xz
+2023/10/24 | 43084 | systems/texlive/tlnet/archive/acmart.r68624.tar.xz
+2023/10/24 | 62368 | systems/texlive/tlnet/archive/acmart.source.r68624.tar.xz
2019/02/28 | 89944 | systems/texlive/tlnet/archive/acmconf.doc.r15878.tar.xz
2019/02/28 | 4192 | systems/texlive/tlnet/archive/acmconf.r15878.tar.xz
2019/02/28 | 18700 | systems/texlive/tlnet/archive/acmconf.source.r15878.tar.xz
@@ -291424,8 +291435,8 @@
2019/02/28 | 524172 | systems/texlive/tlnet/archive/arev.doc.r15878.tar.xz
2019/02/28 | 964648 | systems/texlive/tlnet/archive/arev.r15878.tar.xz
2019/02/28 | 10100 | systems/texlive/tlnet/archive/arev.source.r15878.tar.xz
-2022/09/30 | 29500 | systems/texlive/tlnet/archive/arimo.doc.r64548.tar.xz
-2022/09/30 | 2905268 | systems/texlive/tlnet/archive/arimo.r64548.tar.xz
+2023/10/24 | 29504 | systems/texlive/tlnet/archive/arimo.doc.r68624.tar.xz
+2023/10/24 | 2905292 | systems/texlive/tlnet/archive/arimo.r68624.tar.xz
2022/08/24 | 431480 | systems/texlive/tlnet/archive/armtex.doc.r64182.tar.xz
2022/08/24 | 527820 | systems/texlive/tlnet/archive/armtex.r64182.tar.xz
2019/02/28 | 450496 | systems/texlive/tlnet/archive/around-the-bend.doc.r15878.tar.xz
@@ -291482,8 +291493,8 @@
2020/10/23 | 3312 | systems/texlive/tlnet/archive/askmaps.r56730.tar.xz
2023/10/20 | 2836748 | systems/texlive/tlnet/archive/asmeconf.doc.r68593.tar.xz
2023/10/20 | 29484 | systems/texlive/tlnet/archive/asmeconf.r68593.tar.xz
-2022/12/31 | 1824200 | systems/texlive/tlnet/archive/asmejour.doc.r65405.tar.xz
-2022/12/31 | 22832 | systems/texlive/tlnet/archive/asmejour.r65405.tar.xz
+2023/10/24 | 1824200 | systems/texlive/tlnet/archive/asmejour.doc.r68624.tar.xz
+2023/10/24 | 22832 | systems/texlive/tlnet/archive/asmejour.r68624.tar.xz
2019/02/28 | 337268 | systems/texlive/tlnet/archive/aspectratio.doc.r25243.tar.xz
2019/02/28 | 65600 | systems/texlive/tlnet/archive/aspectratio.r25243.tar.xz
2019/02/28 | 81860 | systems/texlive/tlnet/archive/assignment.doc.r20431.tar.xz
@@ -292394,9 +292405,9 @@
2019/02/28 | 362388 | systems/texlive/tlnet/archive/bitelist.doc.r25779.tar.xz
2019/02/28 | 5352 | systems/texlive/tlnet/archive/bitelist.r25779.tar.xz
2019/02/28 | 6228 | systems/texlive/tlnet/archive/bitelist.source.r25779.tar.xz
-2023/10/02 | 556344 | systems/texlive/tlnet/archive/bithesis.doc.r68421.tar.xz
-2023/10/02 | 18960 | systems/texlive/tlnet/archive/bithesis.r68421.tar.xz
-2023/10/02 | 25640 | systems/texlive/tlnet/archive/bithesis.source.r68421.tar.xz
+2023/10/24 | 556348 | systems/texlive/tlnet/archive/bithesis.doc.r68624.tar.xz
+2023/10/24 | 18964 | systems/texlive/tlnet/archive/bithesis.r68624.tar.xz
+2023/10/24 | 25644 | systems/texlive/tlnet/archive/bithesis.source.r68624.tar.xz
2019/02/28 | 175700 | systems/texlive/tlnet/archive/bitpattern.doc.r39073.tar.xz
2019/02/28 | 2156 | systems/texlive/tlnet/archive/bitpattern.r39073.tar.xz
2019/02/28 | 6764 | systems/texlive/tlnet/archive/bitpattern.source.r39073.tar.xz
@@ -293405,8 +293416,8 @@
2023/05/07 | 805736 | systems/texlive/tlnet/archive/context.armhf-linux.r67034.tar.xz
2023/04/27 | 1904 | systems/texlive/tlnet/archive/context-calendar-examples.doc.r66947.tar.xz
2023/04/27 | 10056 | systems/texlive/tlnet/archive/context-calendar-examples.r66947.tar.xz
-2023/04/28 | 115224 | systems/texlive/tlnet/archive/context-collating-marks.doc.r66956.tar.xz
-2023/04/28 | 2652 | systems/texlive/tlnet/archive/context-collating-marks.r66956.tar.xz
+2023/10/24 | 115224 | systems/texlive/tlnet/archive/context-collating-marks.doc.r68624.tar.xz
+2023/10/24 | 2504 | systems/texlive/tlnet/archive/context-collating-marks.r68624.tar.xz
2019/02/28 | 180836 | systems/texlive/tlnet/archive/context-cyrillicnumbers.doc.r47085.tar.xz
2019/02/28 | 7820 | systems/texlive/tlnet/archive/context-cyrillicnumbers.r47085.tar.xz
2023/10/13 | 84859824 | systems/texlive/tlnet/archive/context.doc.r68525.tar.xz
@@ -296081,9 +296092,9 @@
2019/02/28 | 16340 | systems/texlive/tlnet/archive/gmverb.r24288.tar.xz
2019/02/28 | 96420 | systems/texlive/tlnet/archive/gmverse.doc.r29803.tar.xz
2019/02/28 | 10736 | systems/texlive/tlnet/archive/gmverse.r29803.tar.xz
-2019/02/28 | 161276 | systems/texlive/tlnet/archive/gnu-freefont.doc.r29349.tar.xz
-2019/02/28 | 7094080 | systems/texlive/tlnet/archive/gnu-freefont.r29349.tar.xz
-2019/02/28 | 4241780 | systems/texlive/tlnet/archive/gnu-freefont.source.r29349.tar.xz
+2023/10/24 | 161276 | systems/texlive/tlnet/archive/gnu-freefont.doc.r68624.tar.xz
+2023/10/24 | 7094068 | systems/texlive/tlnet/archive/gnu-freefont.r68624.tar.xz
+2023/10/24 | 4241780 | systems/texlive/tlnet/archive/gnu-freefont.source.r68624.tar.xz
2020/04/16 | 418476 | systems/texlive/tlnet/archive/gnuplottex.doc.r54758.tar.xz
2020/04/16 | 3288 | systems/texlive/tlnet/archive/gnuplottex.r54758.tar.xz
2020/04/16 | 9336 | systems/texlive/tlnet/archive/gnuplottex.source.r54758.tar.xz
@@ -296555,9 +296566,9 @@
2019/02/28 | 186676 | systems/texlive/tlnet/archive/hypernat.doc.r17358.tar.xz
2019/02/28 | 1916 | systems/texlive/tlnet/archive/hypernat.r17358.tar.xz
2019/02/28 | 15680 | systems/texlive/tlnet/archive/hyper.r17357.tar.xz
-2023/07/09 | 3675076 | systems/texlive/tlnet/archive/hyperref.doc.r67583.tar.xz
-2023/07/09 | 90484 | systems/texlive/tlnet/archive/hyperref.r67583.tar.xz
-2023/07/09 | 414292 | systems/texlive/tlnet/archive/hyperref.source.r67583.tar.xz
+2023/10/24 | 3675076 | systems/texlive/tlnet/archive/hyperref.doc.r68624.tar.xz
+2023/10/24 | 90484 | systems/texlive/tlnet/archive/hyperref.r68624.tar.xz
+2023/10/24 | 414292 | systems/texlive/tlnet/archive/hyperref.source.r68624.tar.xz
2019/02/28 | 32960 | systems/texlive/tlnet/archive/hyper.source.r17357.tar.xz
2020/11/23 | 356 | systems/texlive/tlnet/archive/hyperxmp.aarch64-linux.r56984.tar.xz
2020/11/23 | 356 | systems/texlive/tlnet/archive/hyperxmp.amd64-freebsd.r56984.tar.xz
@@ -297603,8 +297614,8 @@
2019/02/28 | 4112 | systems/texlive/tlnet/archive/latex-uni8.r49729.tar.xz
2020/05/22 | 521444 | systems/texlive/tlnet/archive/latex-veryshortguide.doc.r55228.tar.xz
2020/05/22 | 560 | systems/texlive/tlnet/archive/latex-veryshortguide.r55228.tar.xz
-2023/05/03 | 2348576 | systems/texlive/tlnet/archive/latex-via-exemplos.doc.r66989.tar.xz
-2023/05/03 | 400 | systems/texlive/tlnet/archive/latex-via-exemplos.r66989.tar.xz
+2023/10/24 | 2348576 | systems/texlive/tlnet/archive/latex-via-exemplos.doc.r68624.tar.xz
+2023/10/24 | 404 | systems/texlive/tlnet/archive/latex-via-exemplos.r68624.tar.xz
2019/02/28 | 272788 | systems/texlive/tlnet/archive/latex-web-companion.doc.r29349.tar.xz
2019/02/28 | 432 | systems/texlive/tlnet/archive/latex-web-companion.r29349.tar.xz
2020/01/22 | 3944 | systems/texlive/tlnet/archive/latino-sine-flexione.doc.r53485.tar.xz
@@ -299844,8 +299855,8 @@
2019/02/28 | 117072 | systems/texlive/tlnet/archive/parallel.doc.r15878.tar.xz
2019/02/28 | 3744 | systems/texlive/tlnet/archive/parallel.r15878.tar.xz
2019/02/28 | 11060 | systems/texlive/tlnet/archive/parallel.source.r15878.tar.xz
-2019/02/28 | 906420 | systems/texlive/tlnet/archive/paratype.doc.r32859.tar.xz
-2019/02/28 | 4164732 | systems/texlive/tlnet/archive/paratype.r32859.tar.xz
+2023/10/24 | 906420 | systems/texlive/tlnet/archive/paratype.doc.r68624.tar.xz
+2023/10/24 | 4164728 | systems/texlive/tlnet/archive/paratype.r68624.tar.xz
2021/05/17 | 1335464 | systems/texlive/tlnet/archive/paresse.doc.r59228.tar.xz
2021/05/17 | 3640 | systems/texlive/tlnet/archive/paresse.r59228.tar.xz
2021/05/17 | 14060 | systems/texlive/tlnet/archive/paresse.source.r59228.tar.xz
@@ -300635,8 +300646,8 @@
2023/10/16 | 1319080 | systems/texlive/tlnet/archive/profcollege.r68558.tar.xz
2022/04/27 | 134096 | systems/texlive/tlnet/archive/proflabo.doc.r63147.tar.xz
2022/04/27 | 2748 | systems/texlive/tlnet/archive/proflabo.r63147.tar.xz
-2023/10/20 | 1584296 | systems/texlive/tlnet/archive/proflycee.doc.r68594.tar.xz
-2023/10/20 | 41344 | systems/texlive/tlnet/archive/proflycee.r68594.tar.xz
+2023/10/24 | 1584296 | systems/texlive/tlnet/archive/proflycee.doc.r68624.tar.xz
+2023/10/24 | 41348 | systems/texlive/tlnet/archive/proflycee.r68624.tar.xz
2023/09/10 | 178328 | systems/texlive/tlnet/archive/profmaquette.doc.r68222.tar.xz
2023/09/10 | 13760 | systems/texlive/tlnet/archive/profmaquette.r68222.tar.xz
2023/09/30 | 344480 | systems/texlive/tlnet/archive/profsio.doc.r68397.tar.xz
@@ -302751,12 +302762,12 @@
2019/02/28 | 344 | systems/texlive/tlnet/archive/texfot.x86_64-linuxmusl.r46840.tar.xz
2019/02/28 | 336 | systems/texlive/tlnet/archive/texfot.x86_64-linux.r33155.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/texfot.x86_64-solaris.r33155.tar.xz
-2023/07/24 | 11141776 | systems/texlive/tlnet/archive/tex-gyre.doc.r67718.tar.xz
+2023/10/24 | 11141772 | systems/texlive/tlnet/archive/tex-gyre.doc.r68624.tar.xz
2019/02/28 | 436052 | systems/texlive/tlnet/archive/tex-gyre-math.doc.r41264.tar.xz
2019/02/28 | 1182712 | systems/texlive/tlnet/archive/tex-gyre-math.r41264.tar.xz
2019/02/28 | 474164 | systems/texlive/tlnet/archive/tex-gyre-math.source.r41264.tar.xz
-2023/07/24 | 7748408 | systems/texlive/tlnet/archive/tex-gyre.r67718.tar.xz
-2023/07/24 | 1016896 | systems/texlive/tlnet/archive/tex-gyre.source.r67718.tar.xz
+2023/10/24 | 7748428 | systems/texlive/tlnet/archive/tex-gyre.r68624.tar.xz
+2023/10/24 | 1016896 | systems/texlive/tlnet/archive/tex-gyre.source.r68624.tar.xz
2023/02/18 | 175760 | systems/texlive/tlnet/archive/tex.i386-freebsd.r65877.tar.xz
2023/02/18 | 171972 | systems/texlive/tlnet/archive/tex.i386-linux.r65877.tar.xz
2023/02/20 | 128772 | systems/texlive/tlnet/archive/tex.i386-netbsd.r65923.tar.xz
@@ -302828,7 +302839,7 @@
2022/09/13 | 600 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r64356.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r64356.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r64356.tar.xz
-2023/10/23 | 428184 | systems/texlive/tlnet/archive/texlive-scripts.doc.r68614.tar.xz
+2023/10/24 | 428296 | systems/texlive/tlnet/archive/texlive-scripts.doc.r68623.tar.xz
2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.aarch64-linux.r53577.tar.xz
2020/01/27 | 924 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-freebsd.r53577.tar.xz
2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-netbsd.r53577.tar.xz
@@ -302850,7 +302861,7 @@
2022/09/13 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r64356.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r64356.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r64356.tar.xz
-2023/10/23 | 114076 | systems/texlive/tlnet/archive/texlive-scripts.r68614.tar.xz
+2023/10/24 | 114072 | systems/texlive/tlnet/archive/texlive-scripts.r68623.tar.xz
2022/09/13 | 580 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r64356.tar.xz
2023/05/14 | 60312 | systems/texlive/tlnet/archive/texlive-scripts.windows.r67095.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r64356.tar.xz
@@ -304730,16 +304741,16 @@
2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz
2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz
2023/08/07 | 125713 | systems/texlive/tlnet/install-tl
-2023/10/23 | 5738408 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2023/10/23 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2023/10/23 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/10/24 | 5741969 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/10/24 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/10/24 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2023/05/13 | 5083 | systems/texlive/tlnet/install-tl-windows.bat
-2023/10/23 | 21040049 | systems/texlive/tlnet/install-tl-windows.exe
-2023/10/23 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2023/10/23 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2023/10/23 | 26029173 | systems/texlive/tlnet/install-tl.zip
-2023/10/23 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2023/10/23 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2023/10/24 | 21036284 | systems/texlive/tlnet/install-tl-windows.exe
+2023/10/24 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2023/10/24 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2023/10/24 | 26029180 | systems/texlive/tlnet/install-tl.zip
+2023/10/24 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2023/10/24 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2023/03/19 | 1229 | systems/texlive/tlnet/README.md
2023/03/19 | 0 | systems/texlive/tlnet/TEXLIVE_2023
2023/01/17 | 8401 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -304749,7 +304760,7 @@
2023/01/17 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2023/09/20 | 50622 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2023/10/22 | 7103 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2023/10/23 | 7152 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2023/08/23 | 221470 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt
2020/04/15 | 2606592 | systems/texlive/tlnet/tlpkg/installer/curl/curl.exe
2017/04/16 | 2629 | systems/texlive/tlnet/tlpkg/installer/installer-options.txt
@@ -304791,12 +304802,12 @@
2023/02/21 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2021/12/21 | 5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2023/04/08 | 28167 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2023/10/23 | 18287552 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2023/10/23 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2023/10/24 | 18287200 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2023/10/24 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2023/10/16 | 87924 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2023/10/23 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2023/10/23 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2023/10/23 | 2478488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/10/24 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/10/24 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2023/10/24 | 2480092 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2023/02/20 | 58928 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2023/06/11 | 42749 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2023/02/21 | 16138 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -315660,7 +315671,7 @@
2014/07/05 | 611 | systems/win32/yandy/README
2014/07/05 | 1004628 | systems/win32/yandy/yandy-src.tar.xz
2014/07/05 | 1012416 | systems/win32/yandy.zip
-2023/10/24 | 186 | timestamp
+2023/10/25 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2021/11/11 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index 03f6c04ea9..cf78211752 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index fa40e884f8..17dea1964b 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,3 +1,80 @@
+2023/10/24 | 96017 | macros/latex/contrib/customenvs/doc/customenvs-doc-en.pdf
+2023/10/24 | 953487 | macros/latex/contrib/nicematrix/nicematrix-code.pdf
+2023/10/24 | 906420 | systems/texlive/tlnet/archive/paratype.doc.r68624.tar.xz
+2023/10/24 | 90484 | systems/texlive/tlnet/archive/hyperref.r68624.tar.xz
+2023/10/24 | 8031 | macros/latex/contrib/hereapplies/hereapplies-doc.tex
+2023/10/24 | 7748428 | systems/texlive/tlnet/archive/tex-gyre.r68624.tar.xz
+2023/10/24 | 7522180 | fonts/newpx.zip
+2023/10/24 | 743 | macros/latex/contrib/hereapplies/package.json
+2023/10/24 | 7094068 | systems/texlive/tlnet/archive/gnu-freefont.r68624.tar.xz
+2023/10/24 | 70266 | fonts/newpx/doc/newpxdoc.tex
+2023/10/24 | 62368 | systems/texlive/tlnet/archive/acmart.source.r68624.tar.xz
+2023/10/24 | 610304 | macros/latex/contrib/nicematrix/nicematrix.pdf
+2023/10/24 | 593655 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
+2023/10/24 | 581937 | macros/latex/contrib/nicematrix/nicematrix-code.dtx
+2023/10/24 | 5741969 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/10/24 | 556348 | systems/texlive/tlnet/archive/bithesis.doc.r68624.tar.xz
+2023/10/24 | 49699 | macros/latex/contrib/hereapplies/hereapplies-example.pdf
+2023/10/24 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2023/10/24 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2023/10/24 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2023/10/24 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2023/10/24 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/10/24 | 4855488 | systems/texlive/tlnet/archive/acmart.doc.r68624.tar.xz
+2023/10/24 | 434420 | macros/latex/contrib/hereapplies.zip
+2023/10/24 | 432735 | fonts/newpx/doc/newpxdoc.pdf
+2023/10/24 | 43084 | systems/texlive/tlnet/archive/acmart.r68624.tar.xz
+2023/10/24 | 428296 | systems/texlive/tlnet/archive/texlive-scripts.doc.r68623.tar.xz
+2023/10/24 | 4241780 | systems/texlive/tlnet/archive/gnu-freefont.source.r68624.tar.xz
+2023/10/24 | 423179 | macros/latex/contrib/customenvs.zip
+2023/10/24 | 4184 | graphics/pgf/contrib/tikz-osci/doc/tikz-osci-example.tex
+2023/10/24 | 4164728 | systems/texlive/tlnet/archive/paratype.r68624.tar.xz
+2023/10/24 | 414292 | systems/texlive/tlnet/archive/hyperref.source.r68624.tar.xz
+2023/10/24 | 41348 | systems/texlive/tlnet/archive/proflycee.r68624.tar.xz
+2023/10/24 | 4124646 | biblio/ctan-bibdata.zip
+2023/10/24 | 404 | systems/texlive/tlnet/archive/latex-via-exemplos.r68624.tar.xz
+2023/10/24 | 3720417 | biblio/ctan-bibdata/ctan.pdf
+2023/10/24 | 3675076 | systems/texlive/tlnet/archive/hyperref.doc.r68624.tar.xz
+2023/10/24 | 367285 | macros/latex/contrib/hereapplies/hereapplies-doc.pdf
+2023/10/24 | 321239 | macros/latex/contrib/customenvs/doc/customenvs-doc-fr.pdf
+2023/10/24 | 29504 | systems/texlive/tlnet/archive/arimo.doc.r68624.tar.xz
+2023/10/24 | 2905292 | systems/texlive/tlnet/archive/arimo.r68624.tar.xz
+2023/10/24 | 2820450 | biblio/ctan-bibdata/ctan.bib
+2023/10/24 | 28072 | macros/latex/contrib/customenvs/tex/customenvs.sty
+2023/10/24 | 2768 | macros/latex/contrib/hereapplies/ChangeLog.md
+2023/10/24 | 266629 | graphics/pgf/contrib/tikz-osci.zip
+2023/10/24 | 26029180 | systems/texlive/tlnet/install-tl.zip
+2023/10/24 | 257352 | macros/latex/contrib/nicematrix/nicematrix.tex
+2023/10/24 | 25644 | systems/texlive/tlnet/archive/bithesis.source.r68624.tar.xz
+2023/10/24 | 2504 | systems/texlive/tlnet/archive/context-collating-marks.r68624.tar.xz
+2023/10/24 | 2480092 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/10/24 | 24308 | fonts/newpx/tex/newpxtext.sty
+2023/10/24 | 24143 | fonts/newpx/README
+2023/10/24 | 24043 | macros/latex/contrib/customenvs/doc/customenvs-doc-fr.tex
+2023/10/24 | 2348576 | systems/texlive/tlnet/archive/latex-via-exemplos.doc.r68624.tar.xz
+2023/10/24 | 2335913 | macros/latex/contrib/nicematrix.zip
+2023/10/24 | 22832 | systems/texlive/tlnet/archive/asmejour.r68624.tar.xz
+2023/10/24 | 21036284 | systems/texlive/tlnet/install-tl-windows.exe
+2023/10/24 | 19963 | macros/latex/contrib/hereapplies/hereapplies.sty
+2023/10/24 | 18964 | systems/texlive/tlnet/archive/bithesis.r68624.tar.xz
+2023/10/24 | 18502 | graphics/pgf/contrib/tikz-osci/tikz-osci.sty
+2023/10/24 | 18287200 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2023/10/24 | 1824200 | systems/texlive/tlnet/archive/asmejour.doc.r68624.tar.xz
+2023/10/24 | 178335 | graphics/pgf/contrib/tikz-osci/doc/tikz-osci-doc.pdf
+2023/10/24 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/10/24 | 16730 | graphics/pgf/contrib/tikz-osci/doc/tikz-osci-doc.tex
+2023/10/24 | 161276 | systems/texlive/tlnet/archive/gnu-freefont.doc.r68624.tar.xz
+2023/10/24 | 1584296 | systems/texlive/tlnet/archive/proflycee.doc.r68624.tar.xz
+2023/10/24 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2023/10/24 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/10/24 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2023/10/24 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/10/24 | 115224 | systems/texlive/tlnet/archive/context-collating-marks.doc.r68624.tar.xz
+2023/10/24 | 114395 | graphics/pgf/contrib/tikz-osci/doc/tikz-osci-example.pdf
+2023/10/24 | 114072 | systems/texlive/tlnet/archive/texlive-scripts.r68623.tar.xz
+2023/10/24 | 11141772 | systems/texlive/tlnet/archive/tex-gyre.doc.r68624.tar.xz
+2023/10/24 | 10812 | macros/latex/contrib/customenvs/doc/customenvs-doc-en.tex
+2023/10/24 | 1016896 | systems/texlive/tlnet/archive/tex-gyre.source.r68624.tar.xz
2023/10/23 | 9999 | macros/latex/contrib/l3kernel/l3news10.tex
2023/10/23 | 9916 | macros/latex/contrib/l3backend/l3backend-opacity.dtx
2023/10/23 | 9898 | macros/latex/contrib/l3backend/CHANGELOG.md
@@ -31,6 +108,7 @@
2023/10/23 | 73835 | macros/latex/contrib/l3kernel/l3fp-trig.dtx
2023/10/23 | 73552 | systems/texlive/tlnet/archive/cweb.doc.r68617.tar.xz
2023/10/23 | 731548 | macros/unicodetex/latex/bithesis/bithesis.pdf
+2023/10/23 | 7152 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2023/10/23 | 7079 | macros/latex/contrib/l3kernel/l3term-glossary.tex
2023/10/23 | 70511 | macros/latex/contrib/l3kernel/l3prg.dtx
2023/10/23 | 70468 | macros/latex/contrib/l3kernel/expl3.dtx
@@ -52,7 +130,6 @@
2023/10/23 | 611467 | info/latex-via-exemplos/latex-via-exemplos.tex
2023/10/23 | 607188 | macros/latex/contrib/acmart/samples/sample-acmlarge.pdf
2023/10/23 | 60385 | macros/latex/contrib/l3kernel/l3prop.dtx
-2023/10/23 | 5738408 | systems/texlive/tlnet/install-tl-unx.tar.gz
2023/10/23 | 564503 | macros/latex/contrib/acmart/samples/sample-acmtog.pdf
2023/10/23 | 557935 | macros/latex/contrib/l3kernel/l3doc.pdf
2023/10/23 | 55212 | macros/latex/contrib/acmart/samples/samples.dtx
@@ -67,12 +144,7 @@
2023/10/23 | 4922 | macros/latex/contrib/l3backend/l3backend.ins
2023/10/23 | 4912 | macros/latex/contrib/l3kernel/l3fp-types.dtx
2023/10/23 | 49038 | macros/latex/contrib/l3kernel/l3text.dtx
-2023/10/23 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2023/10/23 | 4890 | macros/latex/contrib/l3kernel/l3news.tex
-2023/10/23 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2023/10/23 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2023/10/23 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2023/10/23 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2023/10/23 | 47968 | macros/latex/contrib/l3kernel/l3prefixes.csv
2023/10/23 | 47216 | macros/latex/contrib/l3kernel/l3fp-aux.dtx
2023/10/23 | 4716 | macros/latex/contrib/l3kernel/l3news05.tex
@@ -80,13 +152,10 @@
2023/10/23 | 4396 | systems/texlive/tlnet/archive/crefthe.r68618.tar.xz
2023/10/23 | 434062 | macros/latex/contrib/acmart/acmguide.pdf
2023/10/23 | 43223 | macros/latex/contrib/l3kernel/l3debug.dtx
-2023/10/23 | 428184 | systems/texlive/tlnet/archive/texlive-scripts.doc.r68614.tar.xz
2023/10/23 | 41343 | macros/latex/contrib/l3backend/l3backend-color.dtx
-2023/10/23 | 4121707 | biblio/ctan-bibdata.zip
2023/10/23 | 40728 | macros/latex/contrib/l3kernel/l3sort.dtx
2023/10/23 | 396222 | macros/latex/contrib/l3kernel/l3news.pdf
2023/10/23 | 395888 | macros/latex/contrib/acmart/samples/sample-acmengage.pdf
-2023/10/23 | 3718031 | biblio/ctan-bibdata/ctan.pdf
2023/10/23 | 36266 | macros/latex/contrib/l3kernel/l3sys.dtx
2023/10/23 | 35675 | macros/latex/contrib/l3kernel/l3unicode.dtx
2023/10/23 | 35441 | macros/latex/contrib/l3kernel/l3quark.dtx
@@ -105,15 +174,12 @@
2023/10/23 | 288660 | macros/latex/contrib/acmart/acmart.dtx
2023/10/23 | 2854716 | info/latex-via-exemplos.zip
2023/10/23 | 2821 | macros/latex/contrib/l3kernel/l3prefixes.tex
-2023/10/23 | 2819854 | biblio/ctan-bibdata/ctan.bib
2023/10/23 | 27270 | macros/latex/contrib/l3kernel/l3kernel-functions.dtx
2023/10/23 | 2649 | macros/unicodetex/latex/bithesis/contributing-zh.md
-2023/10/23 | 26029173 | systems/texlive/tlnet/install-tl.zip
2023/10/23 | 25810 | macros/latex/contrib/l3kernel/l3deprecation.dtx
2023/10/23 | 25723 | macros/latex/contrib/proflycee/tex/proflycee-tools-graphiques.tex
2023/10/23 | 25069 | macros/latex/contrib/l3kernel/source3body.tex
2023/10/23 | 250159 | macros/latex/contrib/l3kernel/l3news09.pdf
-2023/10/23 | 2478488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2023/10/23 | 24752 | systems/texlive/tlnet/archive/cweb.r68617.tar.xz
2023/10/23 | 242903 | macros/latex/contrib/l3kernel/l3syntax-changes.pdf
2023/10/23 | 23866 | macros/latex/contrib/l3kernel/l3luatex.dtx
@@ -126,7 +192,6 @@
2023/10/23 | 2266 | macros/latex/contrib/l3kernel/source3.tex
2023/10/23 | 218059 | macros/latex/contrib/l3kernel/l3term-glossary.pdf
2023/10/23 | 215120 | macros/latex/contrib/acmart/samples/sample-acmcp.pdf
-2023/10/23 | 21040049 | systems/texlive/tlnet/install-tl-windows.exe
2023/10/23 | 2072 | macros/latex/contrib/l3kernel/interface3.tex
2023/10/23 | 205020 | macros/latex/contrib/l3kernel/l3news12.pdf
2023/10/23 | 20464 | macros/latex/contrib/l3kernel/l3text-purify.dtx
@@ -136,19 +201,16 @@
2023/10/23 | 1906 | info/latex-via-exemplos/changelog.txt
2023/10/23 | 19027 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
2023/10/23 | 18532 | macros/latex/contrib/l3kernel/l3fp-round.dtx
-2023/10/23 | 18287552 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
2023/10/23 | 17901 | macros/latex/contrib/l3kernel/l3pdf.dtx
2023/10/23 | 1732906 | macros/latex/contrib/l3kernel/interface3.pdf
+2023/10/23 | 17296 | fonts/newpx/doc/footsnippet-crop.pdf
2023/10/23 | 170102 | macros/latex/contrib/l3kernel/l3news11.pdf
2023/10/23 | 1701024 | macros/latex/contrib/proflycee.zip
-2023/10/23 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2023/10/23 | 16639 | macros/latex/contrib/l3kernel/l3candidates.dtx
2023/10/23 | 16631 | macros/latex/contrib/l3kernel/l3text-map.dtx
2023/10/23 | 163484 | macros/latex/contrib/l3kernel/l3news08.pdf
2023/10/23 | 16217 | macros/latex/contrib/l3backend/l3backend-basics.dtx
2023/10/23 | 157292 | macros/latex/contrib/l3kernel/l3doc.dtx
-2023/10/23 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2023/10/23 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
2023/10/23 | 151749 | macros/latex/contrib/l3kernel/l3docstrip.pdf
2023/10/23 | 151591 | macros/latex/contrib/l3kernel/l3news06.pdf
2023/10/23 | 150919 | macros/latex/contrib/l3kernel/l3news02.pdf
@@ -157,8 +219,6 @@
2023/10/23 | 148747 | macros/latex/contrib/l3kernel/l3news03.pdf
2023/10/23 | 148167 | macros/latex/contrib/l3kernel/l3tl.dtx
2023/10/23 | 14669 | macros/latex/contrib/l3backend/l3backend-header.dtx
-2023/10/23 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2023/10/23 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
2023/10/23 | 14431 | macros/latex/contrib/l3backend/l3backend-box.dtx
2023/10/23 | 144087 | macros/latex/contrib/l3kernel/l3file.dtx
2023/10/23 | 14136490 | install/macros/latex/contrib/l3kernel.tds.zip
@@ -180,7 +240,6 @@
2023/10/23 | 11884 | macros/latex/contrib/l3kernel/l3styleguide.tex
2023/10/23 | 11781 | macros/latex/contrib/l3kernel/l3fparray.dtx
2023/10/23 | 114754 | macros/latex/contrib/l3kernel/l3news04.pdf
-2023/10/23 | 114076 | systems/texlive/tlnet/archive/texlive-scripts.r68614.tar.xz
2023/10/23 | 113435 | macros/latex/contrib/l3kernel/l3str-convert.dtx
2023/10/23 | 112524 | macros/latex/contrib/l3kernel/l3news05.pdf
2023/10/23 | 112275 | macros/latex/contrib/l3kernel/l3color.dtx
@@ -194,7 +253,6 @@
2023/10/23 | 10328 | macros/latex/contrib/l3kernel/l3flag.dtx
2023/10/22 | 99356 | systems/texlive/tlnet/archive/minim-math.doc.r68612.tar.xz
2023/10/22 | 964 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsoneone.tfm
-2023/10/22 | 95687 | macros/latex/contrib/customenvs/doc/customenvs-doc-en.pdf
2023/10/22 | 9495 | macros/latex/contrib/asmejour/README.md
2023/10/22 | 928 | macros/latex/contrib/hyperref/doc/hyperref-doc2.html
2023/10/22 | 882 | macros/latex/contrib/hyperref/doc/hyperref-doc5.html
@@ -206,7 +264,6 @@
2023/10/22 | 793 | macros/latex/contrib/hyperref/doc/hyperref-doc6.html
2023/10/22 | 7536 | macros/latex/contrib/hyperref/hyperref-patches.dtx
2023/10/22 | 7176 | systems/texlive/tlnet/archive/fontsetup.r68602.tar.xz
-2023/10/22 | 7103 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2023/10/22 | 5766 | macros/latex/contrib/hyperref/xr-hyper.sty
2023/10/22 | 5730046 | fonts/simpleicons.zip
2023/10/22 | 553520 | systems/texlive/tlnet/archive/fontsetup.doc.r68602.tar.xz
@@ -230,7 +287,6 @@
2023/10/22 | 317664 | macros/latex/contrib/hyperref/doc/hyperref-doc.pdf
2023/10/22 | 3161 | macros/latex/contrib/hyperref/bmhydoc.sty
2023/10/22 | 3036 | macros/latex/contrib/isosafety/images/ISO-CV011.png
-2023/10/22 | 303446 | macros/latex/contrib/customenvs.zip
2023/10/22 | 3033 | macros/latex/contrib/isosafety/images/ISO-CV028.png
2023/10/22 | 2983939 | macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.pdf
2023/10/22 | 28789 | macros/latex/contrib/hyperref/nameref.dtx
@@ -276,7 +332,6 @@
2023/10/22 | 207712 | systems/texlive/tlnet/archive/pdfpc.doc.r68610.tar.xz
2023/10/22 | 206681 | macros/latex/contrib/hyperref/doc/backref.pdf
2023/10/22 | 2041136 | fonts/simpleicons/type1/SimpleIcons.pfb
-2023/10/22 | 203410 | macros/latex/contrib/customenvs/doc/customenvs-doc-fr.pdf
2023/10/22 | 2022 | macros/latex/contrib/isosafety/images/ISO-CV064.png
2023/10/22 | 19445 | macros/latex/contrib/hyperref/hyperref-linktarget.dtx
2023/10/22 | 193328 | systems/texlive/tlnet/archive/jwjournal.doc.r68608.tar.xz
@@ -284,7 +339,6 @@
2023/10/22 | 184798 | macros/latex/contrib/hyperref/doc/nameref.pdf
2023/10/22 | 1844 | fonts/simpleicons/doc/simpleicons.tex
2023/10/22 | 1781 | macros/latex/contrib/isosafety/images/ISO-CV003.png
-2023/10/22 | 17717 | macros/latex/contrib/customenvs/doc/customenvs-doc-fr.tex
2023/10/22 | 17612 | systems/texlive/tlnet/archive/minim-mp.r68612.tar.xz
2023/10/22 | 17520 | systems/texlive/tlnet/archive/unbtex.r68603.tar.xz
2023/10/22 | 171497 | macros/latex/contrib/hyperref/doc/hyperref-doc.tex
@@ -293,7 +347,6 @@
2023/10/22 | 15673 | macros/latex/contrib/hyperref/doc/hyperref-doc.css
2023/10/22 | 15588 | systems/texlive/tlnet/archive/minim-pdf.r68612.tar.xz
2023/10/22 | 1534 | macros/latex/contrib/isosafety/images/ISO-CV013.png
-2023/10/22 | 15240 | macros/latex/contrib/customenvs/tex/customenvs.sty
2023/10/22 | 1521 | fonts/simpleicons/tex/simpleicons.sty
2023/10/22 | 146836 | systems/texlive/tlnet/archive/longdivision.doc.r68609.tar.xz
2023/10/22 | 1405592 | systems/texlive/tlnet/archive/unbtex.doc.r68603.tar.xz
@@ -315,7 +368,6 @@
2023/10/22 | 113252 | systems/texlive/tlnet/archive/minim-pdf.doc.r68612.tar.xz
2023/10/22 | 10740 | systems/texlive/tlnet/archive/longdivision.r68609.tar.xz
2023/10/22 | 105860 | systems/texlive/tlnet/archive/minim-mp.doc.r68612.tar.xz
-2023/10/22 | 10554 | macros/latex/contrib/customenvs/doc/customenvs-doc-en.tex
2023/10/22 | 1030 | macros/latex/contrib/hyperref/doc/hyperref-doc4.html
2023/10/21 | 82773 | macros/latex/contrib/crefthe.zip
2023/10/21 | 80058 | macros/latex/contrib/jwjournal/jwjournal-demo-fr.pdf
@@ -373,7 +425,6 @@
2023/10/20 | 500152 | systems/texlive/tlnet/archive/outilsgeomtikz.doc.r68592.tar.xz
2023/10/20 | 4601 | macros/latex/contrib/tkz/tkz-euclide/latex/drawings/tkz-draw-eu-protractor.tex
2023/10/20 | 4375 | macros/latex/contrib/tkz/tkz-euclide/latex/libs/tkz-lib-eu-marks.tex
-2023/10/20 | 41344 | systems/texlive/tlnet/archive/proflycee.r68594.tar.xz
2023/10/20 | 4085 | macros/latex/contrib/tkz/tkz-euclide/latex/obj/tkz-obj-eu-polygons.tex
2023/10/20 | 40814 | macros/luatex/generic/minim-pdf/minim-pdf.lua
2023/10/20 | 3975 | macros/latex/contrib/tkz/tkz-euclide/latex/drawings/tkz-draw-eu-compass.tex
@@ -421,7 +472,6 @@
2023/10/20 | 17804 | macros/latex/contrib/tkz/tkz-euclide/latex/obj/tkz-obj-eu-triangles.tex
2023/10/20 | 17596 | macros/luatex/generic/minim-pdf/minim-pdf.tex
2023/10/20 | 159709 | macros/luatex/generic/minim-math.zip
-2023/10/20 | 1584296 | systems/texlive/tlnet/archive/proflycee.doc.r68594.tar.xz
2023/10/20 | 14765 | macros/luatex/generic/minim/minim-etex.tex
2023/10/20 | 1468545 | macros/latex/contrib/unbtex.zip
2023/10/20 | 14582 | macros/luatex/generic/minim-math/minim-math.lua
@@ -802,41 +852,3 @@
2023/10/18 | 10049 | macros/latex/contrib/isosafety/images/ISO-E042.png
2023/10/18 | 10047 | macros/latex/contrib/isosafety/images/ISO-W027.png
2023/10/18 | 10025 | macros/latex/contrib/isosafety/images/ISO-M042.png
-2023/10/17 | 9927 | macros/latex/contrib/isosafety/images/ISO-E008.png
-2023/10/17 | 91048 | systems/texlive/tlnet/archive/stex.r68569.tar.xz
-2023/10/17 | 900204 | systems/texlive/tlnet/archive/yet-another-guide-latex2e.doc.r68564.tar.xz
-2023/10/17 | 87316 | systems/texlive/tlnet/archive/hvlogos.doc.r68568.tar.xz
-2023/10/17 | 74452 | macros/latex/contrib/titlesec/titlesec.tex
-2023/10/17 | 7190 | macros/latex/contrib/isosafety/images/ISO-E009.png
-2023/10/17 | 711340 | macros/latex/contrib/titlesec.zip
-2023/10/17 | 6549 | macros/latex/contrib/isosafety/images/ISO-E012.png
-2023/10/17 | 6361456 | systems/texlive/tlnet/archive/stex.doc.r68569.tar.xz
-2023/10/17 | 6206 | macros/latex/contrib/isosafety/images/ISO-E007.png
-2023/10/17 | 6042 | macros/latex/contrib/isosafety/images/ISO-E001.png
-2023/10/17 | 5945 | macros/latex/contrib/isosafety/images/ISO-E002.png
-2023/10/17 | 572 | systems/texlive/tlnet/archive/yet-another-guide-latex2e.r68564.tar.xz
-2023/10/17 | 5675 | macros/latex/contrib/isosafety/images/ISO-E004.png
-2023/10/17 | 5652784 | systems/texlive/tlnet/archive/newcomputermodern.r68563.tar.xz
-2023/10/17 | 549231 | macros/latex/contrib/hecthese/hecthese-en.pdf
-2023/10/17 | 5418 | macros/latex/contrib/isosafety/images/ISO-E010.png
-2023/10/17 | 535488 | macros/latex/contrib/hecthese/hecthese.pdf
-2023/10/17 | 523399 | macros/latex/contrib/titlesec/titlesec.pdf
-2023/10/17 | 50020 | systems/texlive/tlnet/archive/stex.source.r68569.tar.xz
-2023/10/17 | 48997 | macros/latex/contrib/titlesec/titlesec.sty
-2023/10/17 | 4544 | macros/latex/contrib/hecthese/README.md
-2023/10/17 | 4132 | macros/latex/contrib/hecthese/hecthese-fr.ins
-2023/10/17 | 3975 | macros/latex/contrib/hecthese/hecthese-en.ins
-2023/10/17 | 31466 | macros/latex/contrib/titlesec/titleps.tex
-2023/10/17 | 2764 | systems/texlive/tlnet/archive/hvlogos.r68568.tar.xz
-2023/10/17 | 2561 | macros/latex/contrib/titlesec/README.md
-2023/10/17 | 25336 | macros/latex/contrib/titlesec/titleps.sty
-2023/10/17 | 1732944 | systems/texlive/tlnet/archive/csvsimple.doc.r68566.tar.xz
-2023/10/17 | 16869 | macros/latex/contrib/titlesec/titletoc.sty
-2023/10/17 | 143282 | macros/latex/contrib/titlesec/titleps.pdf
-2023/10/17 | 14220820 | systems/texlive/tlnet/archive/newcomputermodern.doc.r68563.tar.xz
-2023/10/17 | 13413 | macros/latex/contrib/titlesec/CHANGES.old
-2023/10/17 | 1192 | macros/latex/contrib/isosafety/images/ISO-E003.png
-2023/10/17 | 11692 | systems/texlive/tlnet/archive/csvsimple.r68566.tar.xz
-2023/10/17 | 1090979 | macros/latex/contrib/hecthese.zip
-2023/10/17 | 108218 | macros/latex/contrib/hecthese/hecthese.dtx
-2023/10/17 | 10680 | macros/latex/contrib/isosafety/images/ISO-E011.png
diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib
index aa91b254a8..c2612f97ba 100644
--- a/biblio/ctan-bibdata/ctan.bib
+++ b/biblio/ctan-bibdata/ctan.bib
@@ -1,7 +1,7 @@
%% bib file of all CTAN packages
%% (C) Herbert VoĂź
%%
-%% created at 24-10-2023, 02:00:46
+%% created at 25-10-2023, 02:01:49
%%
%% This file is provided under the terms of the LPPL v1.3 or
@@ -16789,8 +16789,8 @@
title = {The \texttt{customenvs} package},
subtitle = {Custom environments (MCQ, list with picked items, ...)},
author = {CĂ©dric Pierquet},
- date = {2023-10-23},
- version = {0.1.0},
+ date = {2023-10-24},
+ version = {0.1.1},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/customenvs},
url = {https://ctan.org/pkg/customenvs},
@@ -31545,8 +31545,8 @@
title = {The \texttt{hereapplies} package},
subtitle = {A \LaTeX{} package for referencing groups of pages that share something in common},
author = {{Unknown}},
- date = {2022-12-11},
- version = {1.0.1},
+ date = {2023-10-24},
+ version = {1.0.2},
license = {gpl3+},
mirror = {https://mirror.ctan.org/macros/latex/contrib/hereapplies},
url = {https://ctan.org/pkg/hereapplies},
@@ -48437,8 +48437,8 @@
title = {The \texttt{newpx} package},
subtitle = {Alternative uses of the PX fonts, with improved metrics},
author = {Michael Sharpe},
- date = {2023-09-28},
- version = {1.522},
+ date = {2023-10-24},
+ version = {1.53},
license = {lppl,ofl},
mirror = {https://mirror.ctan.org/fonts/newpx},
url = {https://ctan.org/pkg/newpx},
@@ -48669,8 +48669,8 @@
title = {The \texttt{nicematrix} package},
subtitle = {Improve the typesetting of mathematical matrices with PGF},
author = {François Pantigny},
- date = {2023-09-28},
- version = {6.24},
+ date = {2023-10-24},
+ version = {6.25},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/nicematrix},
url = {https://ctan.org/pkg/nicematrix},
@@ -70047,9 +70047,9 @@
title = {The \texttt{tikz-osci} package},
subtitle = {Produce oscilloscope “screen shots”},
author = {Thibault Giauffret},
- date = {2023-10-09},
- version = {0.3.0},
- license = {lppl1.3},
+ date = {2023-10-24},
+ version = {0.4.0},
+ license = {lppl1.3c},
mirror = {https://mirror.ctan.org/graphics/pgf/contrib/tikz-osci},
url = {https://ctan.org/pkg/tikz-osci},
}
diff --git a/biblio/ctan-bibdata/ctan.pdf b/biblio/ctan-bibdata/ctan.pdf
index 0f01f3a476..07c700d739 100644
--- a/biblio/ctan-bibdata/ctan.pdf
+++ b/biblio/ctan-bibdata/ctan.pdf
Binary files differ
diff --git a/fonts/newpx/README b/fonts/newpx/README
index 364aa04457..15233d06c2 100644
--- a/fonts/newpx/README
+++ b/fonts/newpx/README
@@ -1,12 +1,25 @@
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.522 2023-09-27
+Current version: 1.53 2023-10-23
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.522
-Corrections to documentation.
+Changes in version 1.53
+1. Addition of superior letters and figures distinct from and taller
+than numerators.
+2. Added superior versions of \textsection, \textparagraph, \textdagger,
+\textdaggerdbl, \textbardbl, \textasteriskcentered, mainly for use as symbolic footnote
+markers.
+3. Addition of options to newpxtext: supsraised, supscale, supsLspaced, \supsRspaced and supscolor---all affecting how superiors are rendered.
+4. Added modifications of some code from realscripts.sty for use in
+legacy latex.
+5. Corrections to documentation.
+6. Added \textsfrac macro for stacked fractions.
+7. Option scosf, which specifies oldstyle figure within small caps, has
+been extended and now works in all LaTeX engines with both the \scshape
+ switch and the macro \textsc{}.
+8. Some correction to encoding and fd files.
Changes in version 1.521
Small change to newpxtext.sty so that option scosf works as expected under lualatex.
diff --git a/fonts/newpx/afm/npxsups-Bold.afm b/fonts/newpx/afm/npxsups-Bold.afm
index 3bc502ef79..92ef3d10a0 100644
--- a/fonts/newpx/afm/npxsups-Bold.afm
+++ b/fonts/newpx/afm/npxsups-Bold.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20230101
-Comment Creation Date: Tue Sep 5 17:47:47 2023
+Comment Creation Date: Wed Oct 4 17:28:22 2023
FontName npxsups-Bold
FullName npxsups Bold
FamilyName npxsups
@@ -15,116 +15,116 @@ UnderlinePosition -100
UnderlineThickness 50
Version 1.06
EncodingScheme FontSpecific
-FontBBox -10 102 815 827
-CapHeight 676
-XHeight 542
-Descender 107
+FontBBox -10 179 815 904
+CapHeight 744
+XHeight 619
+Descender 184
StartCharMetrics 105
C 0 ; WX 0 ; N .notdef ; B 0 0 0 0 ;
C 32 ; WX 250 ; N space ; B 0 0 0 0 ;
-C 33 ; WX 222 ; N exclam.sup ; B 50 254 177 705 ;
-C 34 ; WX 322 ; N quotedbl.sup ; B 16 450 306 708 ;
-C 35 ; WX 401 ; N numbersign.sup ; B 2 261 399 665 ;
-C 36 ; WX 410 ; N dollar.sup ; B 22 193 389 692 ;
-C 37 ; WX 712 ; N percent.sup ; B 48 256 664 686 ;
-C 38 ; WX 667 ; N ampersand.sup ; B 41 251 653 669 ;
-C 39 ; WX 182 ; N quoteright.sup ; B 35 450 146 708 ;
-C 40 ; WX 233 ; N parenleft.sup ; B 43 209 214 760 ;
-C 41 ; WX 233 ; N parenright.sup ; B 19 209 190 760 ;
-C 42 ; WX 355 ; N asterisk.sup ; B 34 457 320 675 ;
-C 43 ; WX 485 ; N plus.sup ; B 36 257 449 567 ;
-C 44 ; WX 199 ; N comma.sup ; B -6 128 182 377 ;
-C 45 ; WX 266 ; N hyphen.sup ; B 12 363 255 454 ;
-C 46 ; WX 200 ; N period.sup ; B 37 254 164 381 ;
-C 47 ; WX 246 ; N slash.sup ; B -8 251 255 699 ;
-C 48 ; WX 400 ; N zero.sup ; B 26 251 376 654 ;
-C 49 ; WX 300 ; N one.sup ; B 18 259 277 663 ;
-C 50 ; WX 300 ; N two.sup ; B 12 259 287 657 ;
-C 51 ; WX 300 ; N three.sup ; B 9 251 278 657 ;
-C 52 ; WX 400 ; N four.sup ; B 9 259 380 672 ;
-C 53 ; WX 405 ; N five.sup ; B 33 251 384 653 ;
-C 54 ; WX 399 ; N six.sup ; B 29 251 376 654 ;
-C 55 ; WX 430 ; N seven.sup ; B 36 259 426 653 ;
-C 56 ; WX 406 ; N eight.sup ; B 26 251 380 654 ;
-C 57 ; WX 400 ; N nine.sup ; B 24 240 372 660 ;
-C 58 ; WX 200 ; N colon.sup ; B 37 254 164 532 ;
-C 59 ; WX 200 ; N semicolon.sup ; B -6 144 183 548 ;
-C 60 ; WX 484 ; N less.sup ; B 58 259 412 578 ;
-C 61 ; WX 485 ; N equal.sup ; B 36 322 449 496 ;
-C 62 ; WX 484 ; N greater.sup ; B 57 251 412 578 ;
-C 63 ; WX 355 ; N question.sup ; B 33 254 330 670 ;
-C 64 ; WX 599 ; N at.sup ; B 33 254 566 667 ;
-C 65 ; WX 653 ; N A.sup ; B 18 259 638 679 ;
-C 66 ; WX 538 ; N B.sup ; B 30 259 494 667 ;
-C 67 ; WX 558 ; N C.sup ; B 34 251 537 675 ;
-C 68 ; WX 647 ; N D.sup ; B 27 259 610 667 ;
-C 69 ; WX 500 ; N E.sup ; B 30 259 474 667 ;
-C 70 ; WX 451 ; N F.sup ; B 22 259 439 667 ;
-C 71 ; WX 667 ; N G.sup ; B 37 251 623 675 ;
-C 72 ; WX 667 ; N H.sup ; B 28 259 639 667 ;
-C 73 ; WX 311 ; N I.sup ; B 30 259 281 667 ;
-C 74 ; WX 311 ; N J.sup ; B -10 125 281 675 ;
-C 75 ; WX 663 ; N K.sup ; B 30 259 652 668 ;
-C 76 ; WX 496 ; N L.sup ; B 30 259 470 667 ;
-C 77 ; WX 836 ; N M.sup ; B 25 255 812 667 ;
-C 78 ; WX 691 ; N N.sup ; B 27 246 664 667 ;
-C 79 ; WX 666 ; N O.sup ; B 37 251 631 675 ;
-C 80 ; WX 489 ; N P.sup ; B 30 259 476 667 ;
-C 81 ; WX 666 ; N Q.sup ; B 37 150 631 675 ;
-C 82 ; WX 587 ; N R.sup ; B 30 259 577 667 ;
-C 83 ; WX 489 ; N S.sup ; B 45 251 449 675 ;
-C 84 ; WX 548 ; N T.sup ; B 13 259 536 667 ;
-C 85 ; WX 623 ; N U.sup ; B 20 251 610 667 ;
-C 86 ; WX 649 ; N V.sup ; B 15 259 638 667 ;
-C 87 ; WX 824 ; N W.sup ; B 13 259 815 670 ;
-C 88 ; WX 565 ; N X.sup ; B 13 258 553 680 ;
-C 89 ; WX 534 ; N Y.sup ; B 11 259 529 676 ;
-C 90 ; WX 573 ; N Z.sup ; B 18 259 543 667 ;
-C 91 ; WX 267 ; N bracketleft.sup ; B 58 189 235 698 ;
-C 92 ; WX 509 ; N backslash.sup ; B 56 261 454 699 ;
-C 93 ; WX 267 ; N bracketright.sup ; B 33 189 210 698 ;
-C 94 ; WX 533 ; N asciicircum.sup ; B 40 411 493 677 ;
-C 95 ; WX 400 ; N underscore.sup ; B -1 179 401 222 ;
-C 96 ; WX 266 ; N quoteleft.sup ; B 13 541 206 692 ;
-C 97 ; WX 386 ; N a.sup ; B 31 251 369 542 ;
-C 98 ; WX 490 ; N b.sup ; B 7 251 447 695 ;
-C 99 ; WX 355 ; N c.sup ; B 29 251 333 542 ;
-C 100 ; WX 490 ; N d.sup ; B 33 251 464 698 ;
-C 101 ; WX 401 ; N e.sup ; B 33 251 371 542 ;
-C 102 ; WX 312 ; N f.sup ; B 26 259 306 690 ;
-C 103 ; WX 446 ; N g.sup ; B 20 102 430 542 ;
-C 104 ; WX 490 ; N h.sup ; B 18 259 472 695 ;
-C 105 ; WX 267 ; N i.sup ; B 26 259 240 658 ;
-C 106 ; WX 267 ; N j.sup ; B 2 102 188 658 ;
-C 107 ; WX 519 ; N k.sup ; B 16 258 510 695 ;
-C 108 ; WX 267 ; N l.sup ; B 18 259 238 705 ;
-C 109 ; WX 713 ; N m.sup ; B 18 259 694 542 ;
-C 110 ; WX 490 ; N n.sup ; B 18 259 472 542 ;
-C 111 ; WX 445 ; N o.sup ; B 31 251 415 542 ;
-C 112 ; WX 490 ; N p.sup ; B 22 107 456 542 ;
-C 113 ; WX 490 ; N q.sup ; B 41 107 474 542 ;
-C 114 ; WX 312 ; N r.sup ; B 23 259 313 542 ;
-C 115 ; WX 356 ; N s.sup ; B 30 251 326 542 ;
-C 116 ; WX 267 ; N t.sup ; B 17 251 261 644 ;
-C 117 ; WX 490 ; N u.sup ; B 19 251 469 562 ;
-C 118 ; WX 470 ; N v.sup ; B 8 259 463 535 ;
-C 119 ; WX 694 ; N w.sup ; B 10 259 685 542 ;
-C 120 ; WX 443 ; N x.sup ; B 19 258 430 549 ;
-C 121 ; WX 462 ; N y.sup ; B 7 102 455 535 ;
-C 122 ; WX 437 ; N z.sup ; B 12 259 410 535 ;
-C 123 ; WX 249 ; N braceleft.sup ; B 3 188 232 694 ;
-C 124 ; WX 485 ; N bar.sup ; B 207 198 278 690 ;
-C 125 ; WX 248 ; N braceright.sup ; B 17 188 246 694 ;
-C 126 ; WX 484 ; N asciitilde.sup ; B 40 339 445 466 ;
-C 161 ; WX 223 ; N exclamdown.sup ; B 46 103 173 555 ;
-C 232 ; WX 401 ; N egrave.sup ; B 33 251 371 678 ;
-C 233 ; WX 401 ; N eacute.sup ; B 33 251 371 678 ;
-C 250 ; WX 360 ; N uni00A7.sups ; B 20 203 341 810 ;
-C 251 ; WX 453 ; N uni00B6.sups ; B 13 240 426 802 ;
-C 252 ; WX 419 ; N uni2016.sups ; B 116 271 303 827 ;
-C 253 ; WX 349 ; N uni2020.sups ; B 19 343 330 802 ;
-C 254 ; WX 343 ; N uni2021.sups ; B 21 177 322 802 ;
-C 255 ; WX 345 ; N uni2217.sups ; B 31 482 315 779 ;
+C 33 ; WX 222 ; N exclam.sup ; B 50 331 177 782 ;
+C 34 ; WX 322 ; N quotedbl.sup ; B 16 527 306 785 ;
+C 35 ; WX 401 ; N numbersign.sup ; B 2 338 399 742 ;
+C 36 ; WX 410 ; N dollar.sup ; B 22 270 389 769 ;
+C 37 ; WX 712 ; N percent.sup ; B 48 333 664 763 ;
+C 38 ; WX 667 ; N ampersand.sup ; B 41 328 653 746 ;
+C 39 ; WX 182 ; N quoteright.sup ; B 35 527 146 785 ;
+C 40 ; WX 233 ; N parenleft.sup ; B 43 286 214 837 ;
+C 41 ; WX 233 ; N parenright.sup ; B 19 286 190 837 ;
+C 42 ; WX 355 ; N asterisk.sup ; B 34 534 320 752 ;
+C 43 ; WX 485 ; N plus.sup ; B 36 334 449 644 ;
+C 44 ; WX 199 ; N comma.sup ; B -6 205 182 454 ;
+C 45 ; WX 266 ; N hyphen.sup ; B 12 440 255 531 ;
+C 46 ; WX 200 ; N period.sup ; B 37 331 164 458 ;
+C 47 ; WX 246 ; N slash.sup ; B -8 328 255 776 ;
+C 48 ; WX 400 ; N zero.sup ; B 26 328 376 731 ;
+C 49 ; WX 300 ; N one.sup ; B 18 336 277 740 ;
+C 50 ; WX 300 ; N two.sup ; B 12 336 287 734 ;
+C 51 ; WX 300 ; N three.sup ; B 9 328 278 734 ;
+C 52 ; WX 400 ; N four.sup ; B 9 336 380 749 ;
+C 53 ; WX 405 ; N five.sup ; B 33 328 384 730 ;
+C 54 ; WX 399 ; N six.sup ; B 29 328 376 731 ;
+C 55 ; WX 430 ; N seven.sup ; B 36 336 426 730 ;
+C 56 ; WX 406 ; N eight.sup ; B 26 328 380 731 ;
+C 57 ; WX 400 ; N nine.sup ; B 24 317 372 737 ;
+C 58 ; WX 200 ; N colon.sup ; B 37 331 164 609 ;
+C 59 ; WX 200 ; N semicolon.sup ; B -6 221 183 625 ;
+C 60 ; WX 484 ; N less.sup ; B 58 336 412 655 ;
+C 61 ; WX 485 ; N equal.sup ; B 36 399 449 573 ;
+C 62 ; WX 484 ; N greater.sup ; B 57 328 412 655 ;
+C 63 ; WX 355 ; N question.sup ; B 33 331 330 747 ;
+C 64 ; WX 599 ; N at.sup ; B 33 331 566 744 ;
+C 65 ; WX 653 ; N A.sup ; B 18 336 638 756 ;
+C 66 ; WX 538 ; N B.sup ; B 30 336 494 744 ;
+C 67 ; WX 558 ; N C.sup ; B 34 328 537 752 ;
+C 68 ; WX 647 ; N D.sup ; B 27 336 610 744 ;
+C 69 ; WX 500 ; N E.sup ; B 30 336 474 744 ;
+C 70 ; WX 451 ; N F.sup ; B 22 336 439 744 ;
+C 71 ; WX 667 ; N G.sup ; B 37 328 623 752 ;
+C 72 ; WX 667 ; N H.sup ; B 28 336 639 744 ;
+C 73 ; WX 311 ; N I.sup ; B 30 336 281 744 ;
+C 74 ; WX 311 ; N J.sup ; B -10 202 281 752 ;
+C 75 ; WX 663 ; N K.sup ; B 30 336 652 745 ;
+C 76 ; WX 496 ; N L.sup ; B 30 336 470 744 ;
+C 77 ; WX 836 ; N M.sup ; B 25 332 812 744 ;
+C 78 ; WX 691 ; N N.sup ; B 27 323 664 744 ;
+C 79 ; WX 666 ; N O.sup ; B 37 328 631 752 ;
+C 80 ; WX 489 ; N P.sup ; B 30 336 476 744 ;
+C 81 ; WX 666 ; N Q.sup ; B 37 227 631 752 ;
+C 82 ; WX 587 ; N R.sup ; B 30 336 577 744 ;
+C 83 ; WX 489 ; N S.sup ; B 45 328 449 752 ;
+C 84 ; WX 548 ; N T.sup ; B 13 336 536 744 ;
+C 85 ; WX 623 ; N U.sup ; B 20 328 610 744 ;
+C 86 ; WX 649 ; N V.sup ; B 15 336 638 744 ;
+C 87 ; WX 824 ; N W.sup ; B 13 336 815 747 ;
+C 88 ; WX 565 ; N X.sup ; B 13 335 553 757 ;
+C 89 ; WX 534 ; N Y.sup ; B 11 336 529 753 ;
+C 90 ; WX 573 ; N Z.sup ; B 18 336 543 744 ;
+C 91 ; WX 267 ; N bracketleft.sup ; B 58 266 235 775 ;
+C 92 ; WX 509 ; N backslash.sup ; B 56 338 454 776 ;
+C 93 ; WX 267 ; N bracketright.sup ; B 33 266 210 775 ;
+C 94 ; WX 533 ; N asciicircum.sup ; B 40 488 493 754 ;
+C 95 ; WX 400 ; N underscore.sup ; B -1 256 401 299 ;
+C 96 ; WX 266 ; N quoteleft.sup ; B 13 618 206 769 ;
+C 97 ; WX 386 ; N a.sup ; B 31 328 369 619 ;
+C 98 ; WX 490 ; N b.sup ; B 7 328 447 772 ;
+C 99 ; WX 355 ; N c.sup ; B 29 328 333 619 ;
+C 100 ; WX 490 ; N d.sup ; B 33 328 464 775 ;
+C 101 ; WX 401 ; N e.sup ; B 33 328 371 619 ;
+C 102 ; WX 312 ; N f.sup ; B 26 336 306 767 ;
+C 103 ; WX 446 ; N g.sup ; B 20 179 430 619 ;
+C 104 ; WX 490 ; N h.sup ; B 18 336 472 772 ;
+C 105 ; WX 267 ; N i.sup ; B 26 336 240 735 ;
+C 106 ; WX 267 ; N j.sup ; B 2 179 188 735 ;
+C 107 ; WX 519 ; N k.sup ; B 16 335 510 772 ;
+C 108 ; WX 267 ; N l.sup ; B 18 336 238 782 ;
+C 109 ; WX 713 ; N m.sup ; B 18 336 694 619 ;
+C 110 ; WX 490 ; N n.sup ; B 18 336 472 619 ;
+C 111 ; WX 445 ; N o.sup ; B 31 328 415 619 ;
+C 112 ; WX 490 ; N p.sup ; B 22 184 456 619 ;
+C 113 ; WX 490 ; N q.sup ; B 41 184 474 619 ;
+C 114 ; WX 312 ; N r.sup ; B 23 336 313 619 ;
+C 115 ; WX 356 ; N s.sup ; B 30 328 326 619 ;
+C 116 ; WX 267 ; N t.sup ; B 17 328 261 721 ;
+C 117 ; WX 490 ; N u.sup ; B 19 328 469 639 ;
+C 118 ; WX 470 ; N v.sup ; B 8 336 463 612 ;
+C 119 ; WX 694 ; N w.sup ; B 10 336 685 619 ;
+C 120 ; WX 443 ; N x.sup ; B 19 335 430 626 ;
+C 121 ; WX 462 ; N y.sup ; B 7 179 455 612 ;
+C 122 ; WX 437 ; N z.sup ; B 12 336 410 612 ;
+C 123 ; WX 249 ; N braceleft.sup ; B 3 265 232 771 ;
+C 124 ; WX 485 ; N bar.sup ; B 207 275 278 767 ;
+C 125 ; WX 248 ; N braceright.sup ; B 17 265 246 771 ;
+C 126 ; WX 484 ; N asciitilde.sup ; B 40 416 445 543 ;
+C 161 ; WX 223 ; N exclamdown.sup ; B 46 180 173 632 ;
+C 232 ; WX 401 ; N egrave.sup ; B 33 328 371 755 ;
+C 233 ; WX 401 ; N eacute.sup ; B 33 328 371 755 ;
+C 250 ; WX 360 ; N uni00A7.sups ; B 20 280 341 887 ;
+C 251 ; WX 453 ; N uni00B6.sups ; B 13 317 426 879 ;
+C 252 ; WX 419 ; N uni2016.sups ; B 116 348 303 904 ;
+C 253 ; WX 349 ; N uni2020.sups ; B 19 420 330 879 ;
+C 254 ; WX 343 ; N uni2021.sups ; B 21 254 322 879 ;
+C 255 ; WX 345 ; N uni2217.sups ; B 31 559 315 856 ;
EndCharMetrics
StartKernData
StartKernPairs 444
diff --git a/fonts/newpx/afm/npxsups-BoldItalic.afm b/fonts/newpx/afm/npxsups-BoldItalic.afm
index 15e5fe25b8..7d2c83b3a8 100644
--- a/fonts/newpx/afm/npxsups-BoldItalic.afm
+++ b/fonts/newpx/afm/npxsups-BoldItalic.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20230101
-Comment Creation Date: Tue Sep 5 17:59:18 2023
+Comment Creation Date: Wed Oct 4 17:29:37 2023
FontName npxsups-BoldItalic
FullName npxsups Bold Italic
FamilyName npxsups
@@ -15,116 +15,116 @@ UnderlinePosition -100
UnderlineThickness 50
Version 1.06
EncodingScheme FontSpecific
-FontBBox -92 102 837 829
-CapHeight 669
-XHeight 548
-Descender 114
+FontBBox -77 179 852 906
+CapHeight 749
+XHeight 625
+Descender 191
StartCharMetrics 105
-C 0 ; WX 0 ; N .notdef ; B 0 0 0 0 ;
-C 32 ; WX 250 ; N space ; B 0 0 0 0 ;
-C 33 ; WX 247 ; N exclam.sup ; B 40 263 241 715 ;
-C 34 ; WX 350 ; N quotedbl.sup ; B 95 517 346 722 ;
-C 35 ; WX 387 ; N numbersign.sup ; B 2 273 385 671 ;
-C 36 ; WX 388 ; N dollar.sup ; B 13 228 364 700 ;
-C 37 ; WX 695 ; N percent.sup ; B 38 263 626 682 ;
-C 38 ; WX 654 ; N ampersand.sup ; B 51 263 640 680 ;
-C 39 ; WX 175 ; N quoteright.sup ; B 88 517 206 722 ;
-C 40 ; WX 231 ; N parenleft.sup ; B 39 192 255 760 ;
-C 41 ; WX 231 ; N parenright.sup ; B -8 192 208 760 ;
-C 42 ; WX 310 ; N asterisk.sup ; B 58 467 308 680 ;
-C 43 ; WX 434 ; N plus.sup ; B 35 269 406 574 ;
-C 44 ; WX 178 ; N comma.sup ; B -24 141 150 393 ;
-C 45 ; WX 272 ; N hyphen.sup ; B 25 376 254 460 ;
-C 46 ; WX 189 ; N period.sup ; B 33 263 146 387 ;
-C 47 ; WX 255 ; N slash.sup ; B 0 263 257 704 ;
-C 48 ; WX 374 ; N zero.sup ; B 29 263 370 681 ;
-C 49 ; WX 337 ; N one.sup ; B 84 270 366 680 ;
-C 50 ; WX 300 ; N two.sup ; B 26 271 321 683 ;
-C 51 ; WX 300 ; N three.sup ; B 23 263 310 683 ;
-C 52 ; WX 369 ; N four.sup ; B 1 271 361 679 ;
-C 53 ; WX 363 ; N five.sup ; B 9 263 351 678 ;
-C 54 ; WX 382 ; N six.sup ; B 34 263 376 681 ;
-C 55 ; WX 412 ; N seven.sup ; B 47 271 444 680 ;
-C 56 ; WX 388 ; N eight.sup ; B 18 263 378 681 ;
-C 57 ; WX 383 ; N nine.sup ; B 18 263 378 682 ;
-C 58 ; WX 195 ; N colon.sup ; B 26 263 186 538 ;
-C 59 ; WX 208 ; N semicolon.sup ; B -24 158 207 555 ;
-C 60 ; WX 436 ; N less.sup ; B 54 270 376 590 ;
-C 61 ; WX 424 ; N equal.sup ; B 35 333 396 504 ;
-C 62 ; WX 436 ; N greater.sup ; B 54 270 376 586 ;
-C 63 ; WX 345 ; N question.sup ; B 63 263 350 680 ;
-C 64 ; WX 624 ; N at.sup ; B 57 266 563 672 ;
-C 65 ; WX 549 ; N A.sup ; B -25 271 525 682 ;
-C 66 ; WX 512 ; N B.sup ; B 5 270 486 673 ;
-C 67 ; WX 503 ; N C.sup ; B 48 262 512 680 ;
-C 68 ; WX 569 ; N D.sup ; B -1 270 548 673 ;
-C 69 ; WX 466 ; N E.sup ; B 7 271 464 672 ;
-C 70 ; WX 430 ; N F.sup ; B -5 270 457 672 ;
-C 71 ; WX 581 ; N G.sup ; B 50 262 562 680 ;
-C 72 ; WX 576 ; N H.sup ; B -9 271 611 672 ;
-C 73 ; WX 272 ; N I.sup ; B -1 270 290 672 ;
-C 74 ; WX 272 ; N J.sup ; B -21 143 293 679 ;
-C 75 ; WX 557 ; N K.sup ; B -8 271 575 673 ;
-C 76 ; WX 456 ; N L.sup ; B 17 271 434 672 ;
-C 77 ; WX 724 ; N M.sup ; B -17 263 754 672 ;
-C 78 ; WX 579 ; N N.sup ; B -2 270 616 672 ;
-C 79 ; WX 611 ; N O.sup ; B 52 263 584 680 ;
-C 80 ; WX 512 ; N P.sup ; B 7 270 517 672 ;
-C 81 ; WX 611 ; N Q.sup ; B 52 143 584 680 ;
-C 82 ; WX 571 ; N R.sup ; B 2 270 554 672 ;
-C 83 ; WX 419 ; N S.sup ; B 34 263 393 680 ;
-C 84 ; WX 480 ; N T.sup ; B 38 271 490 672 ;
-C 85 ; WX 573 ; N U.sup ; B 57 262 607 672 ;
-C 86 ; WX 519 ; N V.sup ; B 46 271 575 672 ;
-C 87 ; WX 784 ; N W.sup ; B 46 271 837 677 ;
-C 88 ; WX 572 ; N X.sup ; B -7 270 608 672 ;
-C 89 ; WX 438 ; N Y.sup ; B 37 267 484 680 ;
-C 90 ; WX 581 ; N Z.sup ; B 0 270 588 673 ;
-C 91 ; WX 231 ; N bracketleft.sup ; B 31 204 266 704 ;
-C 92 ; WX 461 ; N backslash.sup ; B 49 273 413 704 ;
-C 93 ; WX 252 ; N bracketright.sup ; B -16 204 220 705 ;
-C 94 ; WX 494 ; N asciicircum.sup ; B 43 418 452 684 ;
-C 95 ; WX 349 ; N underscore.sup ; B -1 188 350 240 ;
-C 96 ; WX 236 ; N quoteleft.sup ; B 105 555 247 702 ;
-C 97 ; WX 407 ; N a.sup ; B 30 263 382 549 ;
-C 98 ; WX 415 ; N b.sup ; B 30 263 386 702 ;
-C 99 ; WX 322 ; N c.sup ; B 22 263 318 548 ;
-C 100 ; WX 411 ; N d.sup ; B 26 263 408 701 ;
-C 101 ; WX 332 ; N e.sup ; B 19 263 315 548 ;
-C 102 ; WX 261 ; N f.sup ; B -92 104 343 707 ;
-C 103 ; WX 388 ; N g.sup ; B -36 105 409 557 ;
-C 104 ; WX 425 ; N h.sup ; B 15 263 403 705 ;
-C 105 ; WX 264 ; N i.sup ; B 17 263 242 677 ;
-C 106 ; WX 275 ; N j.sup ; B -46 102 260 683 ;
-C 107 ; WX 406 ; N k.sup ; B 23 263 388 705 ;
-C 108 ; WX 265 ; N l.sup ; B 44 263 256 717 ;
-C 109 ; WX 632 ; N m.sup ; B 12 261 612 557 ;
-C 110 ; WX 431 ; N n.sup ; B 11 263 408 562 ;
-C 111 ; WX 413 ; N o.sup ; B 33 263 376 548 ;
-C 112 ; WX 419 ; N p.sup ; B -16 114 386 548 ;
-C 113 ; WX 414 ; N q.sup ; B 22 114 398 548 ;
-C 114 ; WX 295 ; N r.sup ; B 13 247 312 562 ;
-C 115 ; WX 330 ; N s.sup ; B 17 263 305 548 ;
-C 116 ; WX 290 ; N t.sup ; B 28 263 305 652 ;
-C 117 ; WX 419 ; N u.sup ; B 15 263 396 555 ;
-C 118 ; WX 426 ; N v.sup ; B 12 263 397 548 ;
-C 119 ; WX 631 ; N w.sup ; B 18 263 611 548 ;
-C 120 ; WX 363 ; N x.sup ; B -6 263 364 548 ;
-C 121 ; WX 421 ; N y.sup ; B 8 114 412 560 ;
-C 122 ; WX 464 ; N z.sup ; B 21 263 444 548 ;
-C 123 ; WX 239 ; N braceleft.sup ; B 12 209 241 696 ;
-C 124 ; WX 433 ; N bar.sup ; B 185 213 256 697 ;
-C 125 ; WX 241 ; N braceright.sup ; B -1 209 227 696 ;
-C 126 ; WX 424 ; N asciitilde.sup ; B 35 349 389 476 ;
-C 161 ; WX 247 ; N exclamdown.sup ; B 63 112 264 565 ;
-C 232 ; WX 332 ; N egrave.sup ; B 19 263 319 688 ;
-C 233 ; WX 332 ; N eacute.sup ; B 19 263 315 688 ;
-C 244 ; WX 398 ; N uni00A7.sups ; B 31 246 359 810 ;
-C 245 ; WX 399 ; N uni00B6.sups ; B 9 211 448 801 ;
-C 246 ; WX 419 ; N uni2016.sups ; B 119 272 306 829 ;
-C 247 ; WX 378 ; N uni2020.sups ; B 45 341 341 804 ;
-C 248 ; WX 376 ; N uni2021.sups ; B 22 243 364 809 ;
-C 249 ; WX 360 ; N uni2217.sups ; B 140 472 424 769 ;
+C 0 ; WX 15 ; N .notdef ; B 0 0 0 0 ;
+C 32 ; WX 265 ; N space ; B 0 0 0 0 ;
+C 33 ; WX 262 ; N exclam.sup ; B 55 340 256 792 ;
+C 34 ; WX 365 ; N quotedbl.sup ; B 110 594 361 799 ;
+C 35 ; WX 402 ; N numbersign.sup ; B 17 350 400 748 ;
+C 36 ; WX 403 ; N dollar.sup ; B 28 305 379 777 ;
+C 37 ; WX 710 ; N percent.sup ; B 53 340 641 759 ;
+C 38 ; WX 669 ; N ampersand.sup ; B 66 340 655 757 ;
+C 39 ; WX 190 ; N quoteright.sup ; B 103 594 221 799 ;
+C 40 ; WX 246 ; N parenleft.sup ; B 54 269 270 837 ;
+C 41 ; WX 246 ; N parenright.sup ; B 7 269 223 837 ;
+C 42 ; WX 325 ; N asterisk.sup ; B 73 544 323 757 ;
+C 43 ; WX 449 ; N plus.sup ; B 50 346 421 651 ;
+C 44 ; WX 193 ; N comma.sup ; B -9 218 165 470 ;
+C 45 ; WX 287 ; N hyphen.sup ; B 40 453 269 537 ;
+C 46 ; WX 204 ; N period.sup ; B 48 340 161 464 ;
+C 47 ; WX 270 ; N slash.sup ; B 15 340 272 781 ;
+C 48 ; WX 389 ; N zero.sup ; B 44 340 385 758 ;
+C 49 ; WX 352 ; N one.sup ; B 99 347 381 757 ;
+C 50 ; WX 315 ; N two.sup ; B 41 348 336 760 ;
+C 51 ; WX 315 ; N three.sup ; B 38 340 325 760 ;
+C 52 ; WX 384 ; N four.sup ; B 16 348 376 756 ;
+C 53 ; WX 378 ; N five.sup ; B 24 340 366 755 ;
+C 54 ; WX 397 ; N six.sup ; B 49 340 391 758 ;
+C 55 ; WX 427 ; N seven.sup ; B 62 348 459 757 ;
+C 56 ; WX 403 ; N eight.sup ; B 33 340 393 758 ;
+C 57 ; WX 398 ; N nine.sup ; B 33 340 393 759 ;
+C 58 ; WX 210 ; N colon.sup ; B 41 340 201 615 ;
+C 59 ; WX 223 ; N semicolon.sup ; B -9 235 222 632 ;
+C 60 ; WX 451 ; N less.sup ; B 69 347 391 667 ;
+C 61 ; WX 439 ; N equal.sup ; B 50 410 411 581 ;
+C 62 ; WX 451 ; N greater.sup ; B 69 347 391 663 ;
+C 63 ; WX 360 ; N question.sup ; B 78 340 365 757 ;
+C 64 ; WX 639 ; N at.sup ; B 72 343 578 749 ;
+C 65 ; WX 564 ; N A.sup ; B -10 348 540 759 ;
+C 66 ; WX 527 ; N B.sup ; B 20 347 501 750 ;
+C 67 ; WX 518 ; N C.sup ; B 63 339 527 757 ;
+C 68 ; WX 584 ; N D.sup ; B 14 347 563 750 ;
+C 69 ; WX 481 ; N E.sup ; B 22 348 479 749 ;
+C 70 ; WX 445 ; N F.sup ; B 10 347 472 749 ;
+C 71 ; WX 596 ; N G.sup ; B 65 339 577 757 ;
+C 72 ; WX 591 ; N H.sup ; B 6 348 626 749 ;
+C 73 ; WX 287 ; N I.sup ; B 14 347 305 749 ;
+C 74 ; WX 287 ; N J.sup ; B -6 220 308 756 ;
+C 75 ; WX 572 ; N K.sup ; B 7 348 590 750 ;
+C 76 ; WX 471 ; N L.sup ; B 32 348 449 749 ;
+C 77 ; WX 739 ; N M.sup ; B -2 340 769 749 ;
+C 78 ; WX 594 ; N N.sup ; B 13 347 631 749 ;
+C 79 ; WX 626 ; N O.sup ; B 67 340 599 757 ;
+C 80 ; WX 527 ; N P.sup ; B 22 347 532 749 ;
+C 81 ; WX 626 ; N Q.sup ; B 67 220 599 757 ;
+C 82 ; WX 586 ; N R.sup ; B 17 347 569 749 ;
+C 83 ; WX 434 ; N S.sup ; B 49 340 408 757 ;
+C 84 ; WX 495 ; N T.sup ; B 53 348 505 749 ;
+C 85 ; WX 588 ; N U.sup ; B 72 339 622 749 ;
+C 86 ; WX 534 ; N V.sup ; B 61 348 590 749 ;
+C 87 ; WX 799 ; N W.sup ; B 61 348 852 754 ;
+C 88 ; WX 587 ; N X.sup ; B 8 347 623 749 ;
+C 89 ; WX 453 ; N Y.sup ; B 52 344 499 757 ;
+C 90 ; WX 596 ; N Z.sup ; B 15 347 603 750 ;
+C 91 ; WX 246 ; N bracketleft.sup ; B 46 281 281 781 ;
+C 92 ; WX 476 ; N backslash.sup ; B 64 350 428 781 ;
+C 93 ; WX 267 ; N bracketright.sup ; B -1 281 235 782 ;
+C 94 ; WX 509 ; N asciicircum.sup ; B 58 495 467 761 ;
+C 95 ; WX 364 ; N underscore.sup ; B 14 265 365 317 ;
+C 96 ; WX 251 ; N quoteleft.sup ; B 120 632 262 779 ;
+C 97 ; WX 422 ; N a.sup ; B 45 340 397 626 ;
+C 98 ; WX 430 ; N b.sup ; B 45 340 401 779 ;
+C 99 ; WX 337 ; N c.sup ; B 37 340 333 625 ;
+C 100 ; WX 426 ; N d.sup ; B 41 340 423 778 ;
+C 101 ; WX 347 ; N e.sup ; B 34 340 330 625 ;
+C 102 ; WX 276 ; N f.sup ; B -77 181 358 784 ;
+C 103 ; WX 403 ; N g.sup ; B -21 182 424 634 ;
+C 104 ; WX 440 ; N h.sup ; B 30 340 418 782 ;
+C 105 ; WX 279 ; N i.sup ; B 32 340 257 754 ;
+C 106 ; WX 290 ; N j.sup ; B -31 179 275 760 ;
+C 107 ; WX 421 ; N k.sup ; B 38 340 403 782 ;
+C 108 ; WX 280 ; N l.sup ; B 59 340 271 794 ;
+C 109 ; WX 647 ; N m.sup ; B 27 338 627 634 ;
+C 110 ; WX 446 ; N n.sup ; B 26 340 423 639 ;
+C 111 ; WX 428 ; N o.sup ; B 48 340 391 625 ;
+C 112 ; WX 434 ; N p.sup ; B -1 191 401 625 ;
+C 113 ; WX 429 ; N q.sup ; B 37 191 413 625 ;
+C 114 ; WX 310 ; N r.sup ; B 28 324 327 639 ;
+C 115 ; WX 345 ; N s.sup ; B 32 340 320 625 ;
+C 116 ; WX 305 ; N t.sup ; B 43 340 320 729 ;
+C 117 ; WX 434 ; N u.sup ; B 30 340 411 632 ;
+C 118 ; WX 441 ; N v.sup ; B 27 340 412 625 ;
+C 119 ; WX 646 ; N w.sup ; B 33 340 626 625 ;
+C 120 ; WX 378 ; N x.sup ; B 9 340 379 625 ;
+C 121 ; WX 436 ; N y.sup ; B 23 191 427 637 ;
+C 122 ; WX 479 ; N z.sup ; B 36 340 459 625 ;
+C 123 ; WX 254 ; N braceleft.sup ; B 27 286 256 773 ;
+C 124 ; WX 448 ; N bar.sup ; B 200 290 271 774 ;
+C 125 ; WX 256 ; N braceright.sup ; B 14 286 242 773 ;
+C 126 ; WX 439 ; N asciitilde.sup ; B 50 426 404 553 ;
+C 161 ; WX 262 ; N exclamdown.sup ; B 78 189 279 642 ;
+C 232 ; WX 347 ; N egrave.sup ; B 34 340 334 765 ;
+C 233 ; WX 347 ; N eacute.sup ; B 34 340 330 765 ;
+C 244 ; WX 413 ; N uni00A7.sups ; B 46 323 374 887 ;
+C 245 ; WX 414 ; N uni00B6.sups ; B 24 288 463 878 ;
+C 246 ; WX 434 ; N uni2016.sups ; B 134 349 321 906 ;
+C 247 ; WX 393 ; N uni2020.sups ; B 60 418 356 881 ;
+C 248 ; WX 391 ; N uni2021.sups ; B 37 320 379 886 ;
+C 249 ; WX 375 ; N uni2217.sups ; B 155 549 439 846 ;
EndCharMetrics
StartKernData
StartKernPairs 449
diff --git a/fonts/newpx/afm/npxsups-Italic.afm b/fonts/newpx/afm/npxsups-Italic.afm
index 15c08cfe16..1660d30e93 100644
--- a/fonts/newpx/afm/npxsups-Italic.afm
+++ b/fonts/newpx/afm/npxsups-Italic.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20230101
-Comment Creation Date: Tue Sep 5 18:01:22 2023
+Comment Creation Date: Wed Oct 4 17:25:59 2023
FontName npxsups-Italic
FullName npxsups Italic
FamilyName npxsups
@@ -15,116 +15,116 @@ UnderlinePosition -100
UnderlineThickness 50
Version 1.06
EncodingScheme FontSpecific
-FontBBox -106 92 701 836
-CapHeight 695
-XHeight 569
-Descender 114
+FontBBox -106 169 701 913
+CapHeight 772
+XHeight 653
+Descender 191
StartCharMetrics 105
C 0 ; WX 0 ; N .notdef ; B 0 0 0 0 ;
C 32 ; WX 250 ; N space ; B 0 0 0 0 ;
-C 33 ; WX 232 ; N exclam.sup ; B 49 275 207 745 ;
-C 34 ; WX 352 ; N quotedbl.sup ; B 90 560 324 743 ;
-C 35 ; WX 372 ; N numbersign.sup ; B 2 280 370 695 ;
-C 36 ; WX 301 ; N dollar.sup ; B 22 212 257 580 ;
-C 37 ; WX 653 ; N percent.sup ; B 47 276 602 706 ;
-C 38 ; WX 569 ; N ampersand.sup ; B 30 269 562 695 ;
-C 39 ; WX 230 ; N quoteright.sup ; B 90 560 202 743 ;
-C 40 ; WX 228 ; N parenleft.sup ; B 36 207 227 767 ;
-C 41 ; WX 228 ; N parenright.sup ; B 1 207 192 767 ;
-C 42 ; WX 254 ; N asterisk.sup ; B 49 491 262 703 ;
-C 43 ; WX 403 ; N plus.sup ; B 25 272 378 592 ;
-C 44 ; WX 177 ; N comma.sup ; B 4 165 147 381 ;
-C 45 ; WX 216 ; N hyphen.sup ; B 11 406 198 455 ;
-C 46 ; WX 178 ; N period.sup ; B 34 277 120 373 ;
-C 47 ; WX 217 ; N slash.sup ; B -27 208 281 720 ;
-C 48 ; WX 350 ; N zero.sup ; B 23 273 338 699 ;
-C 49 ; WX 300 ; N one.sup ; B 61 278 285 699 ;
-C 50 ; WX 300 ; N two.sup ; B 13 278 290 699 ;
-C 51 ; WX 300 ; N three.sup ; B 28 273 304 699 ;
-C 52 ; WX 354 ; N four.sup ; B 9 278 341 696 ;
-C 53 ; WX 327 ; N five.sup ; B 8 273 322 695 ;
-C 54 ; WX 349 ; N six.sup ; B 31 273 330 699 ;
-C 55 ; WX 384 ; N seven.sup ; B 37 278 386 695 ;
-C 56 ; WX 365 ; N eight.sup ; B 23 273 346 699 ;
-C 57 ; WX 350 ; N nine.sup ; B 20 273 330 699 ;
-C 58 ; WX 188 ; N colon.sup ; B 28 277 161 555 ;
-C 59 ; WX 186 ; N semicolon.sup ; B -7 179 167 566 ;
-C 60 ; WX 406 ; N less.sup ; B 44 272 356 588 ;
-C 61 ; WX 393 ; N equal.sup ; B 25 354 368 505 ;
-C 62 ; WX 406 ; N greater.sup ; B 44 277 356 583 ;
-C 63 ; WX 358 ; N question.sup ; B 73 275 311 703 ;
-C 64 ; WX 527 ; N at.sup ; B 17 269 509 703 ;
-C 65 ; WX 493 ; N A.sup ; B -13 278 465 703 ;
-C 66 ; WX 435 ; N B.sup ; B 16 278 402 695 ;
-C 67 ; WX 447 ; N C.sup ; B 29 269 438 703 ;
-C 68 ; WX 504 ; N D.sup ; B 17 277 481 695 ;
-C 69 ; WX 427 ; N E.sup ; B 19 278 401 695 ;
-C 70 ; WX 393 ; N F.sup ; B -1 278 390 695 ;
-C 71 ; WX 493 ; N G.sup ; B 32 269 476 703 ;
-C 72 ; WX 536 ; N H.sup ; B -3 278 551 695 ;
-C 73 ; WX 224 ; N I.sup ; B 4 278 239 695 ;
-C 74 ; WX 236 ; N J.sup ; B -24 156 253 695 ;
-C 75 ; WX 467 ; N K.sup ; B 8 277 479 695 ;
-C 76 ; WX 393 ; N L.sup ; B 10 278 373 695 ;
-C 77 ; WX 650 ; N M.sup ; B -13 269 649 695 ;
-C 78 ; WX 569 ; N N.sup ; B 1 273 588 695 ;
-C 79 ; WX 532 ; N O.sup ; B 34 269 514 703 ;
-C 80 ; WX 410 ; N P.sup ; B 5 278 400 695 ;
-C 81 ; WX 535 ; N Q.sup ; B 34 159 517 703 ;
-C 82 ; WX 491 ; N R.sup ; B 5 278 473 695 ;
-C 83 ; WX 386 ; N S.sup ; B 27 269 355 703 ;
-C 84 ; WX 439 ; N T.sup ; B 34 278 456 695 ;
-C 85 ; WX 542 ; N U.sup ; B 56 270 556 696 ;
-C 86 ; WX 514 ; N V.sup ; B 48 275 536 695 ;
-C 87 ; WX 677 ; N W.sup ; B 46 275 701 700 ;
-C 88 ; WX 527 ; N X.sup ; B 12 278 536 695 ;
-C 89 ; WX 448 ; N Y.sup ; B 33 278 455 703 ;
-C 90 ; WX 501 ; N Z.sup ; B 12 277 483 696 ;
-C 91 ; WX 247 ; N bracketleft.sup ; B 10 212 244 726 ;
-C 92 ; WX 424 ; N backslash.sup ; B 52 280 365 729 ;
-C 93 ; WX 236 ; N bracketright.sup ; B 4 215 230 727 ;
-C 94 ; WX 441 ; N asciicircum.sup ; B 32 440 408 693 ;
-C 95 ; WX 324 ; N underscore.sup ; B -1 198 325 241 ;
-C 96 ; WX 218 ; N quoteleft.sup ; B 88 563 208 700 ;
-C 97 ; WX 330 ; N a.sup ; B 2 273 307 569 ;
-C 98 ; WX 344 ; N b.sup ; B 23 273 325 720 ;
-C 99 ; WX 276 ; N c.sup ; B 16 273 266 569 ;
-C 100 ; WX 363 ; N d.sup ; B 10 273 353 720 ;
-C 101 ; WX 277 ; N e.sup ; B 9 273 268 569 ;
-C 102 ; WX 200 ; N f.sup ; B -106 106 289 727 ;
-C 103 ; WX 376 ; N g.sup ; B -25 114 376 569 ;
-C 104 ; WX 346 ; N h.sup ; B 6 275 329 720 ;
-C 105 ; WX 241 ; N i.sup ; B 27 275 245 682 ;
-C 106 ; WX 207 ; N j.sup ; B -36 114 205 682 ;
-C 107 ; WX 294 ; N k.sup ; B 4 275 299 720 ;
-C 108 ; WX 214 ; N l.sup ; B 23 275 197 735 ;
-C 109 ; WX 576 ; N m.sup ; B 15 275 553 569 ;
-C 110 ; WX 408 ; N n.sup ; B 15 275 382 569 ;
-C 111 ; WX 313 ; N o.sup ; B 10 273 292 569 ;
-C 112 ; WX 374 ; N p.sup ; B -5 114 342 571 ;
-C 113 ; WX 316 ; N q.sup ; B 15 114 298 569 ;
-C 114 ; WX 272 ; N r.sup ; B 16 274 270 569 ;
-C 115 ; WX 272 ; N s.sup ; B 5 273 245 569 ;
-C 116 ; WX 225 ; N t.sup ; B 26 275 211 673 ;
-C 117 ; WX 422 ; N u.sup ; B 40 273 394 569 ;
-C 118 ; WX 347 ; N v.sup ; B 13 272 333 569 ;
-C 119 ; WX 501 ; N w.sup ; B 13 273 487 569 ;
-C 120 ; WX 360 ; N x.sup ; B 5 273 351 569 ;
-C 121 ; WX 352 ; N y.sup ; B -6 114 347 569 ;
-C 122 ; WX 359 ; N z.sup ; B -1 273 342 569 ;
-C 123 ; WX 226 ; N braceleft.sup ; B 8 218 222 721 ;
-C 124 ; WX 403 ; N bar.sup ; B 178 219 225 720 ;
-C 125 ; WX 227 ; N braceright.sup ; B 4 218 219 721 ;
-C 126 ; WX 423 ; N asciitilde.sup ; B 32 366 391 484 ;
-C 161 ; WX 232 ; N exclamdown.sup ; B 79 92 237 562 ;
-C 232 ; WX 276 ; N egrave.sup ; B 9 273 273 700 ;
-C 233 ; WX 277 ; N eacute.sup ; B 9 273 268 700 ;
-C 250 ; WX 354 ; N uni00A7.sups ; B 9 200 329 817 ;
-C 251 ; WX 361 ; N uni00B6.sups ; B 22 197 436 808 ;
-C 252 ; WX 413 ; N uni2016.sups ; B 146 280 267 836 ;
-C 253 ; WX 339 ; N uni2020.sups ; B 32 332 319 808 ;
-C 254 ; WX 335 ; N uni2021.sups ; B 7 238 331 808 ;
-C 255 ; WX 326 ; N uni2217.sups ; B 136 518 395 789 ;
+C 33 ; WX 232 ; N exclam.sup ; B 49 352 207 822 ;
+C 34 ; WX 352 ; N quotedbl.sup ; B 90 637 324 820 ;
+C 35 ; WX 372 ; N numbersign.sup ; B 2 357 370 772 ;
+C 36 ; WX 301 ; N dollar.sup ; B 22 289 257 657 ;
+C 37 ; WX 653 ; N percent.sup ; B 47 353 602 783 ;
+C 38 ; WX 569 ; N ampersand.sup ; B 30 346 562 772 ;
+C 39 ; WX 230 ; N quoteright.sup ; B 90 637 202 820 ;
+C 40 ; WX 228 ; N parenleft.sup ; B 36 284 227 844 ;
+C 41 ; WX 228 ; N parenright.sup ; B 1 284 192 844 ;
+C 42 ; WX 254 ; N asterisk.sup ; B 49 568 262 780 ;
+C 43 ; WX 403 ; N plus.sup ; B 25 349 378 669 ;
+C 44 ; WX 177 ; N comma.sup ; B 4 242 147 458 ;
+C 45 ; WX 216 ; N hyphen.sup ; B 11 483 198 532 ;
+C 46 ; WX 178 ; N period.sup ; B 34 354 120 450 ;
+C 47 ; WX 217 ; N slash.sup ; B -27 285 281 797 ;
+C 48 ; WX 350 ; N zero.sup ; B 23 350 338 776 ;
+C 49 ; WX 300 ; N one.sup ; B 61 355 285 776 ;
+C 50 ; WX 300 ; N two.sup ; B 13 355 290 776 ;
+C 51 ; WX 300 ; N three.sup ; B 28 350 304 776 ;
+C 52 ; WX 354 ; N four.sup ; B 9 355 341 773 ;
+C 53 ; WX 327 ; N five.sup ; B 8 350 322 772 ;
+C 54 ; WX 349 ; N six.sup ; B 31 350 330 776 ;
+C 55 ; WX 384 ; N seven.sup ; B 37 355 386 772 ;
+C 56 ; WX 365 ; N eight.sup ; B 23 350 346 776 ;
+C 57 ; WX 350 ; N nine.sup ; B 20 350 330 776 ;
+C 58 ; WX 188 ; N colon.sup ; B 28 354 161 632 ;
+C 59 ; WX 186 ; N semicolon.sup ; B -7 256 167 643 ;
+C 60 ; WX 406 ; N less.sup ; B 44 349 356 665 ;
+C 61 ; WX 393 ; N equal.sup ; B 25 431 368 582 ;
+C 62 ; WX 406 ; N greater.sup ; B 44 354 356 660 ;
+C 63 ; WX 358 ; N question.sup ; B 73 352 311 780 ;
+C 64 ; WX 527 ; N at.sup ; B 17 346 509 780 ;
+C 65 ; WX 493 ; N A.sup ; B -13 355 465 780 ;
+C 66 ; WX 435 ; N B.sup ; B 16 355 402 772 ;
+C 67 ; WX 447 ; N C.sup ; B 29 346 438 780 ;
+C 68 ; WX 504 ; N D.sup ; B 17 354 481 772 ;
+C 69 ; WX 427 ; N E.sup ; B 19 355 401 772 ;
+C 70 ; WX 393 ; N F.sup ; B -1 355 390 772 ;
+C 71 ; WX 493 ; N G.sup ; B 32 346 476 780 ;
+C 72 ; WX 536 ; N H.sup ; B -3 355 551 772 ;
+C 73 ; WX 224 ; N I.sup ; B 4 355 239 772 ;
+C 74 ; WX 236 ; N J.sup ; B -24 233 253 772 ;
+C 75 ; WX 467 ; N K.sup ; B 8 354 479 772 ;
+C 76 ; WX 393 ; N L.sup ; B 10 355 373 772 ;
+C 77 ; WX 650 ; N M.sup ; B -13 346 649 772 ;
+C 78 ; WX 569 ; N N.sup ; B 1 350 588 772 ;
+C 79 ; WX 532 ; N O.sup ; B 34 346 514 780 ;
+C 80 ; WX 410 ; N P.sup ; B 5 355 400 772 ;
+C 81 ; WX 535 ; N Q.sup ; B 34 236 517 780 ;
+C 82 ; WX 491 ; N R.sup ; B 5 355 473 772 ;
+C 83 ; WX 386 ; N S.sup ; B 27 346 355 780 ;
+C 84 ; WX 439 ; N T.sup ; B 34 355 456 772 ;
+C 85 ; WX 542 ; N U.sup ; B 56 347 556 773 ;
+C 86 ; WX 514 ; N V.sup ; B 48 352 536 772 ;
+C 87 ; WX 677 ; N W.sup ; B 46 352 701 777 ;
+C 88 ; WX 527 ; N X.sup ; B 12 355 536 772 ;
+C 89 ; WX 448 ; N Y.sup ; B 33 355 455 780 ;
+C 90 ; WX 501 ; N Z.sup ; B 12 354 483 773 ;
+C 91 ; WX 247 ; N bracketleft.sup ; B 10 289 244 803 ;
+C 92 ; WX 424 ; N backslash.sup ; B 52 357 365 806 ;
+C 93 ; WX 236 ; N bracketright.sup ; B 4 292 230 804 ;
+C 94 ; WX 441 ; N asciicircum.sup ; B 32 517 408 770 ;
+C 95 ; WX 324 ; N underscore.sup ; B -1 275 325 318 ;
+C 96 ; WX 218 ; N quoteleft.sup ; B 88 640 208 777 ;
+C 97 ; WX 330 ; N a.sup ; B 2 350 307 646 ;
+C 98 ; WX 344 ; N b.sup ; B 23 350 325 797 ;
+C 99 ; WX 276 ; N c.sup ; B 16 350 266 646 ;
+C 100 ; WX 363 ; N d.sup ; B 10 350 353 797 ;
+C 101 ; WX 277 ; N e.sup ; B 9 350 268 646 ;
+C 102 ; WX 200 ; N f.sup ; B -106 183 289 804 ;
+C 103 ; WX 376 ; N g.sup ; B -25 191 376 646 ;
+C 104 ; WX 346 ; N h.sup ; B 6 352 329 797 ;
+C 105 ; WX 241 ; N i.sup ; B 27 352 245 759 ;
+C 106 ; WX 207 ; N j.sup ; B -36 191 205 759 ;
+C 107 ; WX 294 ; N k.sup ; B 4 352 299 797 ;
+C 108 ; WX 214 ; N l.sup ; B 23 352 197 812 ;
+C 109 ; WX 576 ; N m.sup ; B 15 352 553 646 ;
+C 110 ; WX 408 ; N n.sup ; B 15 352 382 646 ;
+C 111 ; WX 313 ; N o.sup ; B 10 350 292 646 ;
+C 112 ; WX 374 ; N p.sup ; B -5 191 342 648 ;
+C 113 ; WX 316 ; N q.sup ; B 15 191 298 646 ;
+C 114 ; WX 272 ; N r.sup ; B 16 351 270 646 ;
+C 115 ; WX 272 ; N s.sup ; B 5 350 245 646 ;
+C 116 ; WX 225 ; N t.sup ; B 26 352 211 750 ;
+C 117 ; WX 422 ; N u.sup ; B 40 350 394 646 ;
+C 118 ; WX 347 ; N v.sup ; B 13 349 333 646 ;
+C 119 ; WX 501 ; N w.sup ; B 13 350 487 646 ;
+C 120 ; WX 360 ; N x.sup ; B 5 350 351 646 ;
+C 121 ; WX 352 ; N y.sup ; B -6 191 347 646 ;
+C 122 ; WX 359 ; N z.sup ; B -1 350 342 646 ;
+C 123 ; WX 226 ; N braceleft.sup ; B 8 295 222 798 ;
+C 124 ; WX 403 ; N bar.sup ; B 178 296 225 797 ;
+C 125 ; WX 227 ; N braceright.sup ; B 4 295 219 798 ;
+C 126 ; WX 423 ; N asciitilde.sup ; B 32 443 391 561 ;
+C 161 ; WX 232 ; N exclamdown.sup ; B 79 169 237 639 ;
+C 232 ; WX 276 ; N egrave.sup ; B 9 350 273 777 ;
+C 233 ; WX 277 ; N eacute.sup ; B 9 350 268 777 ;
+C 250 ; WX 354 ; N uni00A7.sups ; B 9 277 329 894 ;
+C 251 ; WX 361 ; N uni00B6.sups ; B 22 274 436 885 ;
+C 252 ; WX 413 ; N uni2016.sups ; B 146 357 267 913 ;
+C 253 ; WX 339 ; N uni2020.sups ; B 32 409 319 885 ;
+C 254 ; WX 335 ; N uni2021.sups ; B 7 315 331 885 ;
+C 255 ; WX 326 ; N uni2217.sups ; B 136 595 395 866 ;
EndCharMetrics
StartKernData
StartKernPairs 445
diff --git a/fonts/newpx/afm/npxsups-Regular.afm b/fonts/newpx/afm/npxsups-Regular.afm
index c6665157b9..8a5803babf 100644
--- a/fonts/newpx/afm/npxsups-Regular.afm
+++ b/fonts/newpx/afm/npxsups-Regular.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20230101
-Comment Creation Date: Tue Sep 5 17:57:07 2023
+Comment Creation Date: Wed Oct 4 17:23:52 2023
FontName npxsups-Regular
FullName npxsups Regular
FamilyName npxsups
@@ -15,116 +15,116 @@ UnderlinePosition -100
UnderlineThickness 50
Version 1.06
EncodingScheme FontSpecific
-FontBBox -25 92 688 765
-CapHeight 682
-XHeight 550
-Descender 107
+FontBBox -25 169 688 842
+CapHeight 759
+XHeight 627
+Descender 184
StartCharMetrics 105
C 0 ; WX 0 ; N .notdef ; B 0 0 0 0 ;
C 32 ; WX 250 ; N space ; B 0 0 0 0 ;
-C 33 ; WX 193 ; N exclam.sup ; B 48 270 145 683 ;
-C 34 ; WX 261 ; N quotedbl.sup ; B 31 493 231 692 ;
-C 35 ; WX 375 ; N numbersign.sup ; B 2 273 373 679 ;
-C 36 ; WX 354 ; N dollar.sup ; B 17 204 337 707 ;
-C 37 ; WX 570 ; N percent.sup ; B 23 261 549 692 ;
-C 38 ; WX 533 ; N ampersand.sup ; B 25 261 519 680 ;
-C 39 ; WX 144 ; N quoteright.sup ; B 36 493 108 692 ;
-C 40 ; WX 219 ; N parenleft.sup ; B 35 136 201 701 ;
-C 41 ; WX 219 ; N parenright.sup ; B 18 136 184 701 ;
-C 42 ; WX 233 ; N asterisk.sup ; B 18 466 216 680 ;
-C 43 ; WX 376 ; N plus.sup ; B 23 265 353 580 ;
-C 44 ; WX 150 ; N comma.sup ; B 9 147 132 378 ;
-C 45 ; WX 199 ; N hyphen.sup ; B 9 389 187 451 ;
-C 46 ; WX 176 ; N period.sup ; B 40 270 137 367 ;
-C 47 ; WX 399 ; N slash.sup ; B 51 193 348 701 ;
-C 48 ; WX 300 ; N zero.sup ; B 17 265 279 691 ;
-C 49 ; WX 300 ; N one.sup ; B 32 271 254 689 ;
-C 50 ; WX 300 ; N two.sup ; B 6 271 284 686 ;
-C 51 ; WX 300 ; N three.sup ; B 5 261 281 686 ;
-C 52 ; WX 300 ; N four.sup ; B 0 270 288 689 ;
-C 53 ; WX 300 ; N five.sup ; B 4 265 281 691 ;
-C 54 ; WX 300 ; N six.sup ; B 19 264 281 691 ;
-C 55 ; WX 300 ; N seven.sup ; B 23 275 299 691 ;
-C 56 ; WX 300 ; N eight.sup ; B 18 265 279 691 ;
-C 57 ; WX 300 ; N nine.sup ; B 12 265 275 691 ;
-C 58 ; WX 176 ; N colon.sup ; B 39 270 136 542 ;
-C 59 ; WX 175 ; N semicolon.sup ; B 9 167 157 556 ;
-C 60 ; WX 382 ; N less.sup ; B 41 269 335 571 ;
-C 61 ; WX 363 ; N equal.sup ; B 23 345 340 495 ;
-C 62 ; WX 382 ; N greater.sup ; B 41 277 335 564 ;
-C 63 ; WX 328 ; N question.sup ; B 25 270 300 683 ;
-C 64 ; WX 493 ; N at.sup ; B 14 261 481 683 ;
-C 65 ; WX 526 ; N A.sup ; B 8 271 514 687 ;
-C 66 ; WX 414 ; N B.sup ; B 15 270 393 682 ;
-C 67 ; WX 462 ; N C.sup ; B 13 261 440 692 ;
-C 68 ; WX 490 ; N D.sup ; B 13 271 478 682 ;
-C 69 ; WX 418 ; N E.sup ; B 13 271 396 682 ;
-C 70 ; WX 379 ; N F.sup ; B 13 271 369 682 ;
-C 71 ; WX 502 ; N G.sup ; B 13 260 483 692 ;
-C 72 ; WX 542 ; N H.sup ; B 13 271 530 682 ;
-C 73 ; WX 223 ; N I.sup ; B 13 271 211 682 ;
-C 74 ; WX 220 ; N J.sup ; B -10 144 208 682 ;
-C 75 ; WX 493 ; N K.sup ; B 13 271 490 682 ;
-C 76 ; WX 387 ; N L.sup ; B 13 271 374 682 ;
-C 77 ; WX 658 ; N M.sup ; B 9 265 647 682 ;
-C 78 ; WX 575 ; N N.sup ; B 10 269 566 682 ;
-C 79 ; WX 521 ; N O.sup ; B 13 261 509 692 ;
-C 80 ; WX 406 ; N P.sup ; B 13 271 393 682 ;
-C 81 ; WX 521 ; N Q.sup ; B 13 152 509 692 ;
-C 82 ; WX 470 ; N R.sup ; B 13 271 472 682 ;
-C 83 ; WX 355 ; N S.sup ; B 14 261 343 692 ;
-C 84 ; WX 414 ; N T.sup ; B 10 271 404 683 ;
-C 85 ; WX 506 ; N U.sup ; B 7 261 496 682 ;
-C 86 ; WX 483 ; N V.sup ; B 4 268 474 682 ;
-C 87 ; WX 697 ; N W.sup ; B 4 268 688 687 ;
-C 88 ; WX 443 ; N X.sup ; B 8 271 433 687 ;
-C 89 ; WX 456 ; N Y.sup ; B 5 270 444 695 ;
-C 90 ; WX 493 ; N Z.sup ; B 8 271 476 682 ;
-C 91 ; WX 218 ; N bracketleft.sup ; B 48 157 191 707 ;
-C 92 ; WX 406 ; N backslash.sup ; B 48 273 351 701 ;
-C 93 ; WX 219 ; N bracketright.sup ; B 26 155 172 709 ;
-C 94 ; WX 423 ; N asciicircum.sup ; B 30 431 394 680 ;
-C 95 ; WX 299 ; N underscore.sup ; B -1 191 300 235 ;
-C 96 ; WX 199 ; N quoteleft.sup ; B 18 550 154 693 ;
-C 97 ; WX 338 ; N a.sup ; B 19 266 322 550 ;
-C 98 ; WX 370 ; N b.sup ; B -10 266 344 701 ;
-C 99 ; WX 297 ; N c.sup ; B 15 261 280 550 ;
-C 100 ; WX 399 ; N d.sup ; B 20 265 381 709 ;
-C 101 ; WX 329 ; N e.sup ; B 15 260 311 550 ;
-C 102 ; WX 219 ; N f.sup ; B 13 271 225 702 ;
-C 103 ; WX 406 ; N g.sup ; B 19 106 400 550 ;
-C 104 ; WX 388 ; N h.sup ; B 3 271 383 701 ;
-C 105 ; WX 198 ; N i.sup ; B 12 271 187 652 ;
-C 106 ; WX 163 ; N j.sup ; B -25 92 124 664 ;
-C 107 ; WX 384 ; N k.sup ; B 12 266 380 706 ;
-C 108 ; WX 194 ; N l.sup ; B 12 271 183 701 ;
-C 109 ; WX 587 ; N m.sup ; B 9 271 580 550 ;
-C 110 ; WX 388 ; N n.sup ; B 3 271 383 550 ;
-C 111 ; WX 369 ; N o.sup ; B 19 261 351 550 ;
-C 112 ; WX 399 ; N p.sup ; B 4 107 367 550 ;
-C 113 ; WX 374 ; N q.sup ; B 20 107 375 550 ;
-C 114 ; WX 256 ; N r.sup ; B 12 271 245 550 ;
-C 115 ; WX 287 ; N s.sup ; B 17 261 266 550 ;
-C 116 ; WX 215 ; N t.sup ; B 13 266 212 645 ;
-C 117 ; WX 393 ; N u.sup ; B 10 266 381 566 ;
-C 118 ; WX 387 ; N v.sup ; B 3 269 372 544 ;
-C 119 ; WX 587 ; N w.sup ; B 3 269 573 550 ;
-C 120 ; WX 357 ; N x.sup ; B 11 270 346 549 ;
-C 121 ; WX 377 ; N y.sup ; B 7 106 371 544 ;
-C 122 ; WX 373 ; N z.sup ; B 9 270 354 547 ;
-C 123 ; WX 216 ; N braceleft.sup ; B 33 169 195 701 ;
-C 124 ; WX 376 ; N bar.sup ; B 164 155 212 701 ;
-C 125 ; WX 216 ; N braceright.sup ; B 22 169 184 701 ;
-C 126 ; WX 397 ; N asciitilde.sup ; B 29 373 367 490 ;
-C 161 ; WX 193 ; N exclamdown.sup ; B 48 113 145 555 ;
-C 232 ; WX 329 ; N egrave.sup ; B 15 260 311 673 ;
-C 233 ; WX 329 ; N eacute.sup ; B 15 261 311 673 ;
-C 244 ; WX 351 ; N uni00A7.sups ; B 17 209 329 753 ;
-C 245 ; WX 436 ; N uni00B6.sups ; B 25 269 412 765 ;
-C 246 ; WX 409 ; N uni2016.sups ; B 142 220 267 763 ;
-C 247 ; WX 336 ; N uni2020.sups ; B 22 335 315 744 ;
-C 248 ; WX 338 ; N uni2021.sups ; B 22 188 317 744 ;
-C 249 ; WX 310 ; N uni2217.sups ; B 26 483 285 737 ;
+C 33 ; WX 193 ; N exclam.sup ; B 48 347 145 760 ;
+C 34 ; WX 261 ; N quotedbl.sup ; B 31 570 231 769 ;
+C 35 ; WX 375 ; N numbersign.sup ; B 2 350 373 756 ;
+C 36 ; WX 354 ; N dollar.sup ; B 17 281 337 784 ;
+C 37 ; WX 570 ; N percent.sup ; B 23 338 549 769 ;
+C 38 ; WX 533 ; N ampersand.sup ; B 25 338 519 757 ;
+C 39 ; WX 144 ; N quoteright.sup ; B 36 570 108 769 ;
+C 40 ; WX 219 ; N parenleft.sup ; B 35 213 201 778 ;
+C 41 ; WX 219 ; N parenright.sup ; B 18 213 184 778 ;
+C 42 ; WX 233 ; N asterisk.sup ; B 18 543 216 757 ;
+C 43 ; WX 376 ; N plus.sup ; B 23 342 353 657 ;
+C 44 ; WX 150 ; N comma.sup ; B 9 224 132 455 ;
+C 45 ; WX 199 ; N hyphen.sup ; B 9 466 187 528 ;
+C 46 ; WX 176 ; N period.sup ; B 40 347 137 444 ;
+C 47 ; WX 399 ; N slash.sup ; B 51 270 348 778 ;
+C 48 ; WX 300 ; N zero.sup ; B 17 342 279 768 ;
+C 49 ; WX 300 ; N one.sup ; B 32 348 254 766 ;
+C 50 ; WX 300 ; N two.sup ; B 6 348 284 763 ;
+C 51 ; WX 300 ; N three.sup ; B 5 338 281 763 ;
+C 52 ; WX 300 ; N four.sup ; B 0 347 288 766 ;
+C 53 ; WX 300 ; N five.sup ; B 4 342 281 768 ;
+C 54 ; WX 300 ; N six.sup ; B 19 341 281 768 ;
+C 55 ; WX 300 ; N seven.sup ; B 23 352 299 768 ;
+C 56 ; WX 300 ; N eight.sup ; B 18 342 279 768 ;
+C 57 ; WX 300 ; N nine.sup ; B 12 342 275 768 ;
+C 58 ; WX 176 ; N colon.sup ; B 39 347 136 619 ;
+C 59 ; WX 175 ; N semicolon.sup ; B 9 244 157 633 ;
+C 60 ; WX 382 ; N less.sup ; B 41 346 335 648 ;
+C 61 ; WX 363 ; N equal.sup ; B 23 422 340 572 ;
+C 62 ; WX 382 ; N greater.sup ; B 41 354 335 641 ;
+C 63 ; WX 328 ; N question.sup ; B 25 347 300 760 ;
+C 64 ; WX 493 ; N at.sup ; B 14 338 481 760 ;
+C 65 ; WX 526 ; N A.sup ; B 8 348 514 764 ;
+C 66 ; WX 414 ; N B.sup ; B 15 347 393 759 ;
+C 67 ; WX 462 ; N C.sup ; B 13 338 440 769 ;
+C 68 ; WX 490 ; N D.sup ; B 13 348 478 759 ;
+C 69 ; WX 418 ; N E.sup ; B 13 348 396 759 ;
+C 70 ; WX 379 ; N F.sup ; B 13 348 369 759 ;
+C 71 ; WX 502 ; N G.sup ; B 13 337 483 769 ;
+C 72 ; WX 542 ; N H.sup ; B 13 348 530 759 ;
+C 73 ; WX 223 ; N I.sup ; B 13 348 211 759 ;
+C 74 ; WX 220 ; N J.sup ; B -10 221 208 759 ;
+C 75 ; WX 493 ; N K.sup ; B 13 348 490 759 ;
+C 76 ; WX 387 ; N L.sup ; B 13 348 374 759 ;
+C 77 ; WX 658 ; N M.sup ; B 9 342 647 759 ;
+C 78 ; WX 575 ; N N.sup ; B 10 346 566 759 ;
+C 79 ; WX 521 ; N O.sup ; B 13 338 509 769 ;
+C 80 ; WX 406 ; N P.sup ; B 13 348 393 759 ;
+C 81 ; WX 521 ; N Q.sup ; B 13 229 509 769 ;
+C 82 ; WX 470 ; N R.sup ; B 13 348 472 759 ;
+C 83 ; WX 355 ; N S.sup ; B 14 338 343 769 ;
+C 84 ; WX 414 ; N T.sup ; B 10 348 404 760 ;
+C 85 ; WX 506 ; N U.sup ; B 7 338 496 759 ;
+C 86 ; WX 483 ; N V.sup ; B 4 345 474 759 ;
+C 87 ; WX 697 ; N W.sup ; B 4 345 688 764 ;
+C 88 ; WX 443 ; N X.sup ; B 8 348 433 764 ;
+C 89 ; WX 456 ; N Y.sup ; B 5 347 444 772 ;
+C 90 ; WX 493 ; N Z.sup ; B 8 348 476 759 ;
+C 91 ; WX 218 ; N bracketleft.sup ; B 48 234 191 784 ;
+C 92 ; WX 406 ; N backslash.sup ; B 48 350 351 778 ;
+C 93 ; WX 219 ; N bracketright.sup ; B 26 232 172 786 ;
+C 94 ; WX 423 ; N asciicircum.sup ; B 30 508 394 757 ;
+C 95 ; WX 299 ; N underscore.sup ; B -1 268 300 312 ;
+C 96 ; WX 199 ; N quoteleft.sup ; B 18 627 154 770 ;
+C 97 ; WX 338 ; N a.sup ; B 19 343 322 627 ;
+C 98 ; WX 370 ; N b.sup ; B -10 343 344 778 ;
+C 99 ; WX 297 ; N c.sup ; B 15 338 280 627 ;
+C 100 ; WX 399 ; N d.sup ; B 20 342 381 786 ;
+C 101 ; WX 329 ; N e.sup ; B 15 337 311 627 ;
+C 102 ; WX 219 ; N f.sup ; B 13 348 225 779 ;
+C 103 ; WX 406 ; N g.sup ; B 19 183 400 627 ;
+C 104 ; WX 388 ; N h.sup ; B 3 348 383 778 ;
+C 105 ; WX 198 ; N i.sup ; B 12 348 187 729 ;
+C 106 ; WX 163 ; N j.sup ; B -25 169 124 741 ;
+C 107 ; WX 384 ; N k.sup ; B 12 343 380 783 ;
+C 108 ; WX 194 ; N l.sup ; B 12 348 183 778 ;
+C 109 ; WX 587 ; N m.sup ; B 9 348 580 627 ;
+C 110 ; WX 388 ; N n.sup ; B 3 348 383 627 ;
+C 111 ; WX 369 ; N o.sup ; B 19 338 351 627 ;
+C 112 ; WX 399 ; N p.sup ; B 4 184 367 627 ;
+C 113 ; WX 374 ; N q.sup ; B 20 184 375 627 ;
+C 114 ; WX 256 ; N r.sup ; B 12 348 245 627 ;
+C 115 ; WX 287 ; N s.sup ; B 17 338 266 627 ;
+C 116 ; WX 215 ; N t.sup ; B 13 343 212 722 ;
+C 117 ; WX 393 ; N u.sup ; B 10 343 381 643 ;
+C 118 ; WX 387 ; N v.sup ; B 3 346 372 621 ;
+C 119 ; WX 587 ; N w.sup ; B 3 346 573 627 ;
+C 120 ; WX 357 ; N x.sup ; B 11 347 346 626 ;
+C 121 ; WX 377 ; N y.sup ; B 7 183 371 621 ;
+C 122 ; WX 373 ; N z.sup ; B 9 347 354 624 ;
+C 123 ; WX 216 ; N braceleft.sup ; B 33 246 195 778 ;
+C 124 ; WX 376 ; N bar.sup ; B 164 232 212 778 ;
+C 125 ; WX 216 ; N braceright.sup ; B 22 246 184 778 ;
+C 126 ; WX 397 ; N asciitilde.sup ; B 29 450 367 567 ;
+C 161 ; WX 193 ; N exclamdown.sup ; B 48 190 145 632 ;
+C 232 ; WX 329 ; N egrave.sup ; B 15 337 311 750 ;
+C 233 ; WX 329 ; N eacute.sup ; B 15 338 311 750 ;
+C 244 ; WX 351 ; N uni00A7.sups ; B 17 286 329 830 ;
+C 245 ; WX 436 ; N uni00B6.sups ; B 25 346 412 842 ;
+C 246 ; WX 409 ; N uni2016.sups ; B 142 297 267 840 ;
+C 247 ; WX 336 ; N uni2020.sups ; B 22 412 315 821 ;
+C 248 ; WX 338 ; N uni2021.sups ; B 22 265 317 821 ;
+C 249 ; WX 310 ; N uni2217.sups ; B 26 560 285 814 ;
EndCharMetrics
StartKernData
StartKernPairs 446
diff --git a/fonts/newpx/afm/npxsups-Slanted.afm b/fonts/newpx/afm/npxsups-Slanted.afm
index a4e3b7323a..2ec09cd2ab 100644
--- a/fonts/newpx/afm/npxsups-Slanted.afm
+++ b/fonts/newpx/afm/npxsups-Slanted.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20230101
-Comment Creation Date: Tue Sep 5 18:03:06 2023
+Comment Creation Date: Wed Oct 4 17:30:36 2023
FontName npxsups-Slanted
FullName npxsups Slanted
FamilyName npxsups
@@ -15,116 +15,116 @@ UnderlinePosition -100
UnderlineThickness 50
Version 1.06
EncodingScheme FontSpecific
-FontBBox -5 92 808 765
-CapHeight 682
-XHeight 550
-Descender 107
+FontBBox 10 169 823 842
+CapHeight 759
+XHeight 627
+Descender 184
StartCharMetrics 105
-C 0 ; WX 0 ; N .notdef ; B 0 0 0 0 ;
-C 32 ; WX 250 ; N space ; B 0 0 0 0 ;
-C 33 ; WX 193 ; N exclam.sup ; B 103 270 263 683 ;
-C 34 ; WX 261 ; N quotedbl.sup ; B 142 493 348 692 ;
-C 35 ; WX 375 ; N numbersign.sup ; B 72 273 471 679 ;
-C 36 ; WX 354 ; N dollar.sup ; B 70 204 414 707 ;
-C 37 ; WX 570 ; N percent.sup ; B 123 261 617 692 ;
-C 38 ; WX 533 ; N ampersand.sup ; B 90 261 603 680 ;
-C 39 ; WX 144 ; N quoteright.sup ; B 147 493 225 692 ;
-C 40 ; WX 219 ; N parenleft.sup ; B 104 136 320 701 ;
-C 41 ; WX 219 ; N parenright.sup ; B 44 136 265 701 ;
-C 42 ; WX 233 ; N asterisk.sup ; B 112 466 320 680 ;
-C 43 ; WX 376 ; N plus.sup ; B 92 265 431 580 ;
-C 44 ; WX 150 ; N comma.sup ; B 37 147 197 378 ;
-C 45 ; WX 199 ; N hyphen.sup ; B 78 389 266 451 ;
-C 46 ; WX 176 ; N period.sup ; B 95 270 194 367 ;
-C 47 ; WX 399 ; N slash.sup ; B 85 193 472 701 ;
-C 48 ; WX 300 ; N zero.sup ; B 92 265 375 690 ;
-C 49 ; WX 300 ; N one.sup ; B 102 271 306 689 ;
-C 50 ; WX 300 ; N two.sup ; B 54 271 366 686 ;
-C 51 ; WX 300 ; N three.sup ; B 70 261 361 686 ;
-C 52 ; WX 300 ; N four.sup ; B 70 270 363 689 ;
-C 53 ; WX 300 ; N five.sup ; B 68 265 383 690 ;
-C 54 ; WX 300 ; N six.sup ; B 89 265 370 690 ;
-C 55 ; WX 300 ; N seven.sup ; B 82 275 420 690 ;
-C 56 ; WX 300 ; N eight.sup ; B 82 265 370 690 ;
-C 57 ; WX 300 ; N nine.sup ; B 86 265 372 690 ;
-C 58 ; WX 176 ; N colon.sup ; B 94 270 224 542 ;
-C 59 ; WX 175 ; N semicolon.sup ; B 40 167 242 556 ;
-C 60 ; WX 382 ; N less.sup ; B 111 269 436 571 ;
-C 61 ; WX 363 ; N equal.sup ; B 84 345 427 495 ;
-C 62 ; WX 382 ; N greater.sup ; B 90 277 412 564 ;
-C 63 ; WX 328 ; N question.sup ; B 128 270 406 683 ;
-C 64 ; WX 493 ; N at.sup ; B 94 261 575 683 ;
-C 65 ; WX 526 ; N A.sup ; B 56 271 567 687 ;
-C 66 ; WX 414 ; N B.sup ; B 86 270 478 682 ;
-C 67 ; WX 462 ; N C.sup ; B 93 261 551 692 ;
-C 68 ; WX 490 ; N D.sup ; B 82 271 570 682 ;
-C 69 ; WX 418 ; N E.sup ; B 68 271 504 682 ;
-C 70 ; WX 379 ; N F.sup ; B 61 271 489 682 ;
-C 71 ; WX 502 ; N G.sup ; B 94 260 576 692 ;
-C 72 ; WX 542 ; N H.sup ; B 61 271 650 682 ;
-C 73 ; WX 223 ; N I.sup ; B 61 271 331 682 ;
-C 74 ; WX 220 ; N J.sup ; B 19 144 328 682 ;
-C 75 ; WX 493 ; N K.sup ; B 61 271 565 682 ;
-C 76 ; WX 387 ; N L.sup ; B 86 271 442 682 ;
-C 77 ; WX 658 ; N M.sup ; B 57 265 763 682 ;
-C 78 ; WX 575 ; N N.sup ; B 58 269 686 682 ;
-C 79 ; WX 521 ; N O.sup ; B 93 261 599 692 ;
-C 80 ; WX 406 ; N P.sup ; B 61 271 498 682 ;
-C 81 ; WX 521 ; N Q.sup ; B 91 152 598 692 ;
-C 82 ; WX 470 ; N R.sup ; B 61 271 525 682 ;
-C 83 ; WX 355 ; N S.sup ; B 72 261 426 692 ;
-C 84 ; WX 414 ; N T.sup ; B 115 271 524 683 ;
-C 85 ; WX 506 ; N U.sup ; B 122 261 616 682 ;
-C 86 ; WX 483 ; N V.sup ; B 119 268 594 682 ;
-C 87 ; WX 697 ; N W.sup ; B 119 268 808 687 ;
-C 88 ; WX 443 ; N X.sup ; B 66 271 553 687 ;
-C 89 ; WX 456 ; N Y.sup ; B 117 271 564 695 ;
-C 90 ; WX 493 ; N Z.sup ; B 56 271 592 682 ;
-C 91 ; WX 218 ; N bracketleft.sup ; B 78 157 315 707 ;
-C 92 ; WX 406 ; N backslash.sup ; B 172 273 399 701 ;
-C 93 ; WX 219 ; N bracketright.sup ; B 55 155 295 709 ;
-C 94 ; WX 423 ; N asciicircum.sup ; B 106 431 470 680 ;
-C 95 ; WX 299 ; N underscore.sup ; B 33 191 341 235 ;
-C 96 ; WX 199 ; N quoteleft.sup ; B 133 550 251 693 ;
-C 97 ; WX 338 ; N a.sup ; B 76 266 375 550 ;
-C 98 ; WX 370 ; N b.sup ; B 83 266 423 701 ;
-C 99 ; WX 297 ; N c.sup ; B 82 261 372 550 ;
-C 100 ; WX 399 ; N d.sup ; B 90 266 462 709 ;
-C 101 ; WX 329 ; N e.sup ; B 82 260 390 550 ;
-C 102 ; WX 219 ; N f.sup ; B 61 271 347 702 ;
-C 103 ; WX 406 ; N g.sup ; B 52 106 490 550 ;
-C 104 ; WX 388 ; N h.sup ; B 51 271 436 701 ;
-C 105 ; WX 198 ; N i.sup ; B 60 271 251 652 ;
-C 106 ; WX 163 ; N j.sup ; B -5 92 234 664 ;
-C 107 ; WX 384 ; N k.sup ; B 60 266 447 706 ;
-C 108 ; WX 194 ; N l.sup ; B 60 271 255 701 ;
-C 109 ; WX 587 ; N m.sup ; B 57 271 633 550 ;
-C 110 ; WX 388 ; N n.sup ; B 51 271 436 550 ;
-C 111 ; WX 369 ; N o.sup ; B 87 261 427 550 ;
-C 112 ; WX 399 ; N p.sup ; B 23 107 446 550 ;
-C 113 ; WX 374 ; N q.sup ; B 86 107 434 550 ;
-C 114 ; WX 256 ; N r.sup ; B 60 271 340 550 ;
-C 115 ; WX 287 ; N s.sup ; B 67 261 335 550 ;
-C 116 ; WX 215 ; N t.sup ; B 99 266 307 645 ;
-C 117 ; WX 393 ; N u.sup ; B 102 266 440 566 ;
-C 118 ; WX 387 ; N v.sup ; B 94 269 468 544 ;
-C 119 ; WX 587 ; N w.sup ; B 93 269 668 550 ;
-C 120 ; WX 357 ; N x.sup ; B 66 270 423 549 ;
-C 121 ; WX 377 ; N y.sup ; B 39 106 467 544 ;
-C 122 ; WX 373 ; N z.sup ; B 60 270 450 547 ;
-C 123 ; WX 216 ; N braceleft.sup ; B 110 169 318 701 ;
-C 124 ; WX 376 ; N bar.sup ; B 191 155 336 701 ;
-C 125 ; WX 216 ; N braceright.sup ; B 52 169 261 701 ;
-C 126 ; WX 397 ; N asciitilde.sup ; B 100 373 450 490 ;
-C 161 ; WX 193 ; N exclamdown.sup ; B 70 113 235 555 ;
-C 232 ; WX 329 ; N egrave.sup ; B 82 260 390 673 ;
-C 233 ; WX 329 ; N eacute.sup ; B 82 261 390 673 ;
-C 244 ; WX 351 ; N uni00A7.sups ; B 74 209 420 753 ;
-C 245 ; WX 436 ; N uni00B6.sups ; B 141 269 547 765 ;
-C 246 ; WX 409 ; N uni2016.sups ; B 181 220 402 763 ;
-C 247 ; WX 336 ; N uni2020.sups ; B 120 335 422 744 ;
-C 248 ; WX 338 ; N uni2021.sups ; B 77 188 427 744 ;
-C 249 ; WX 310 ; N uni2217.sups ; B 122 481 393 735 ;
+C 0 ; WX 15 ; N .notdef ; B 0 0 0 0 ;
+C 32 ; WX 265 ; N space ; B 0 0 0 0 ;
+C 33 ; WX 208 ; N exclam.sup ; B 118 347 278 760 ;
+C 34 ; WX 276 ; N quotedbl.sup ; B 157 570 363 769 ;
+C 35 ; WX 390 ; N numbersign.sup ; B 87 350 486 756 ;
+C 36 ; WX 369 ; N dollar.sup ; B 85 281 429 784 ;
+C 37 ; WX 585 ; N percent.sup ; B 138 338 632 769 ;
+C 38 ; WX 548 ; N ampersand.sup ; B 105 338 618 757 ;
+C 39 ; WX 159 ; N quoteright.sup ; B 162 570 240 769 ;
+C 40 ; WX 234 ; N parenleft.sup ; B 119 213 335 778 ;
+C 41 ; WX 234 ; N parenright.sup ; B 59 213 280 778 ;
+C 42 ; WX 248 ; N asterisk.sup ; B 127 543 335 757 ;
+C 43 ; WX 391 ; N plus.sup ; B 107 342 446 657 ;
+C 44 ; WX 165 ; N comma.sup ; B 52 224 212 455 ;
+C 45 ; WX 214 ; N hyphen.sup ; B 93 466 281 528 ;
+C 46 ; WX 191 ; N period.sup ; B 110 347 209 444 ;
+C 47 ; WX 414 ; N slash.sup ; B 100 270 487 778 ;
+C 48 ; WX 315 ; N zero.sup ; B 107 342 390 767 ;
+C 49 ; WX 315 ; N one.sup ; B 117 348 321 766 ;
+C 50 ; WX 315 ; N two.sup ; B 69 348 381 763 ;
+C 51 ; WX 315 ; N three.sup ; B 85 338 376 763 ;
+C 52 ; WX 315 ; N four.sup ; B 85 347 378 766 ;
+C 53 ; WX 315 ; N five.sup ; B 83 342 398 767 ;
+C 54 ; WX 315 ; N six.sup ; B 104 342 385 767 ;
+C 55 ; WX 315 ; N seven.sup ; B 97 352 435 767 ;
+C 56 ; WX 315 ; N eight.sup ; B 97 342 385 767 ;
+C 57 ; WX 315 ; N nine.sup ; B 101 342 387 767 ;
+C 58 ; WX 191 ; N colon.sup ; B 109 347 239 619 ;
+C 59 ; WX 190 ; N semicolon.sup ; B 55 244 257 633 ;
+C 60 ; WX 397 ; N less.sup ; B 126 346 451 648 ;
+C 61 ; WX 378 ; N equal.sup ; B 99 422 442 572 ;
+C 62 ; WX 397 ; N greater.sup ; B 105 354 427 641 ;
+C 63 ; WX 343 ; N question.sup ; B 143 347 421 760 ;
+C 64 ; WX 508 ; N at.sup ; B 109 338 590 760 ;
+C 65 ; WX 541 ; N A.sup ; B 71 348 582 764 ;
+C 66 ; WX 429 ; N B.sup ; B 101 347 493 759 ;
+C 67 ; WX 477 ; N C.sup ; B 108 338 566 769 ;
+C 68 ; WX 505 ; N D.sup ; B 97 348 585 759 ;
+C 69 ; WX 433 ; N E.sup ; B 83 348 519 759 ;
+C 70 ; WX 394 ; N F.sup ; B 76 348 504 759 ;
+C 71 ; WX 517 ; N G.sup ; B 109 337 591 769 ;
+C 72 ; WX 557 ; N H.sup ; B 76 348 665 759 ;
+C 73 ; WX 238 ; N I.sup ; B 76 348 346 759 ;
+C 74 ; WX 235 ; N J.sup ; B 34 221 343 759 ;
+C 75 ; WX 508 ; N K.sup ; B 76 348 580 759 ;
+C 76 ; WX 402 ; N L.sup ; B 101 348 457 759 ;
+C 77 ; WX 673 ; N M.sup ; B 72 342 778 759 ;
+C 78 ; WX 590 ; N N.sup ; B 73 346 701 759 ;
+C 79 ; WX 536 ; N O.sup ; B 108 338 614 769 ;
+C 80 ; WX 421 ; N P.sup ; B 76 348 513 759 ;
+C 81 ; WX 536 ; N Q.sup ; B 106 229 613 769 ;
+C 82 ; WX 485 ; N R.sup ; B 76 348 540 759 ;
+C 83 ; WX 370 ; N S.sup ; B 87 338 441 769 ;
+C 84 ; WX 429 ; N T.sup ; B 130 348 539 760 ;
+C 85 ; WX 521 ; N U.sup ; B 137 338 631 759 ;
+C 86 ; WX 498 ; N V.sup ; B 134 345 609 759 ;
+C 87 ; WX 712 ; N W.sup ; B 134 345 823 764 ;
+C 88 ; WX 458 ; N X.sup ; B 81 348 568 764 ;
+C 89 ; WX 471 ; N Y.sup ; B 132 348 579 772 ;
+C 90 ; WX 508 ; N Z.sup ; B 71 348 607 759 ;
+C 91 ; WX 233 ; N bracketleft.sup ; B 93 234 330 784 ;
+C 92 ; WX 421 ; N backslash.sup ; B 187 350 414 778 ;
+C 93 ; WX 234 ; N bracketright.sup ; B 70 232 310 786 ;
+C 94 ; WX 438 ; N asciicircum.sup ; B 121 508 485 757 ;
+C 95 ; WX 314 ; N underscore.sup ; B 48 268 356 312 ;
+C 96 ; WX 214 ; N quoteleft.sup ; B 148 627 266 770 ;
+C 97 ; WX 353 ; N a.sup ; B 91 343 390 627 ;
+C 98 ; WX 385 ; N b.sup ; B 98 343 438 778 ;
+C 99 ; WX 312 ; N c.sup ; B 97 338 387 627 ;
+C 100 ; WX 414 ; N d.sup ; B 105 343 477 786 ;
+C 101 ; WX 344 ; N e.sup ; B 97 337 405 627 ;
+C 102 ; WX 234 ; N f.sup ; B 76 348 362 779 ;
+C 103 ; WX 421 ; N g.sup ; B 67 183 505 627 ;
+C 104 ; WX 403 ; N h.sup ; B 66 348 451 778 ;
+C 105 ; WX 213 ; N i.sup ; B 75 348 266 729 ;
+C 106 ; WX 178 ; N j.sup ; B 10 169 249 741 ;
+C 107 ; WX 399 ; N k.sup ; B 75 343 462 783 ;
+C 108 ; WX 209 ; N l.sup ; B 75 348 270 778 ;
+C 109 ; WX 602 ; N m.sup ; B 72 348 648 627 ;
+C 110 ; WX 403 ; N n.sup ; B 66 348 451 627 ;
+C 111 ; WX 384 ; N o.sup ; B 102 338 442 627 ;
+C 112 ; WX 414 ; N p.sup ; B 38 184 461 627 ;
+C 113 ; WX 389 ; N q.sup ; B 101 184 449 627 ;
+C 114 ; WX 271 ; N r.sup ; B 75 348 355 627 ;
+C 115 ; WX 302 ; N s.sup ; B 82 338 350 627 ;
+C 116 ; WX 230 ; N t.sup ; B 114 343 322 722 ;
+C 117 ; WX 408 ; N u.sup ; B 117 343 455 643 ;
+C 118 ; WX 402 ; N v.sup ; B 109 346 483 621 ;
+C 119 ; WX 602 ; N w.sup ; B 108 346 683 627 ;
+C 120 ; WX 372 ; N x.sup ; B 81 347 438 626 ;
+C 121 ; WX 392 ; N y.sup ; B 54 183 482 621 ;
+C 122 ; WX 388 ; N z.sup ; B 75 347 465 624 ;
+C 123 ; WX 231 ; N braceleft.sup ; B 125 246 333 778 ;
+C 124 ; WX 391 ; N bar.sup ; B 206 232 351 778 ;
+C 125 ; WX 231 ; N braceright.sup ; B 67 246 276 778 ;
+C 126 ; WX 412 ; N asciitilde.sup ; B 115 450 465 567 ;
+C 161 ; WX 208 ; N exclamdown.sup ; B 85 190 250 632 ;
+C 232 ; WX 344 ; N egrave.sup ; B 97 337 405 750 ;
+C 233 ; WX 344 ; N eacute.sup ; B 97 338 405 750 ;
+C 244 ; WX 366 ; N uni00A7.sups ; B 89 286 435 830 ;
+C 245 ; WX 451 ; N uni00B6.sups ; B 156 346 562 842 ;
+C 246 ; WX 424 ; N uni2016.sups ; B 196 297 417 840 ;
+C 247 ; WX 351 ; N uni2020.sups ; B 135 412 437 821 ;
+C 248 ; WX 353 ; N uni2021.sups ; B 92 265 442 821 ;
+C 249 ; WX 325 ; N uni2217.sups ; B 137 558 408 812 ;
EndCharMetrics
StartKernData
StartKernPairs 446
diff --git a/fonts/newpx/doc/footsnippet-crop.pdf b/fonts/newpx/doc/footsnippet-crop.pdf
new file mode 100644
index 0000000000..45ff60b27d
--- /dev/null
+++ b/fonts/newpx/doc/footsnippet-crop.pdf
Binary files differ
diff --git a/fonts/newpx/doc/newpxdoc.pdf b/fonts/newpx/doc/newpxdoc.pdf
index 6ac152c71b..3f5e835991 100644
--- a/fonts/newpx/doc/newpxdoc.pdf
+++ b/fonts/newpx/doc/newpxdoc.pdf
Binary files differ
diff --git a/fonts/newpx/doc/newpxdoc.tex b/fonts/newpx/doc/newpxdoc.tex
index d4e9e978fe..df34eebde1 100644
--- a/fonts/newpx/doc/newpxdoc.tex
+++ b/fonts/newpx/doc/newpxdoc.tex
@@ -2,6 +2,7 @@
\documentclass[11pt]{article}
\usepackage[margin=1in]{geometry}
\usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent
+\usepackage{graphicx}
%\pdfmapfile{=newtx.map}
%\pdfcompresslevel=0
%\pdfgentounicode=1
@@ -57,6 +58,7 @@
\makeatletter
\ifzpl@otf
\def\pcf{\addfontfeatures{Letters=PetiteCaps}}
+ \def\pcf{\addfontfeatures{Letters=SmallCaps}}
\else
\font\pcf=zpl-Regular-osf-sc-t1 at 10.95pt
\font\scf=zpl-Regular-osf-scl-t1 at 10.95pt
@@ -106,14 +108,29 @@
%\scalefont{5}{\vrule width.04pt\char"2044\vrule width.04pt}%\addfontfeatures{RawFeature=+ss20;+dnom}\color{red}\char"2044\vrule width.04pt{}4}
-%\textsu{23} \textde{45} \textnu{78} \textinf{90}
+%{23\textsu} \textde{45} \textnu{78} \textinf{90}
%X{\sufigures 8Abc}
%\end{document}
%\show\slshape
\section{Introduction}
This package is meant to be a replacement for Young Ryu's {\tt pxfonts}---a complete text and math package with roman text font provided by a Palatino clone, sans serif based on a \textsf{Helvetica} clone, typewriter faces, plus math symbol fonts whose math italic letters are from a Palatino Italic clone. As with the related {\tt txfonts} (though not as severe) the math metrics in {\tt pxfonts} seem overly tight.
-\textsc{Changes as of version 1.51}\\
+\textsc{Changes as of version 1.53}
+\begin{itemize}
+\item
+Superior letters and figures distinct from numerators have been added along with some special features. The text switch \verb|\sustyle| (or \verb|\sufigures|) or the commands \verb|\textsu|, \verb|\textsup|, \verb|\textsups| may be used to invoke ordinary superiors. The command \verb|\textsuperior| is reserved for a form of superiors that respond to adjustments you may specify in the package options, and which are used for footnote marker placement: \verb|supscale| rescales them, \verb|supsraised| specifies an amount to move them vertically, and \verb|supLspaced|, \verb|supRspaced| specify additional kerning to be applied at the left and right. These changes are applied in the order: scaling, raising, kerning. All except \verb|supscale| should be dimensions with units like {\tt em} which will scale properly. Their relative vertical positions stack up like this: X\textinf{12}X\textde{345}X\textnu{678}X\textsu{90}.
+\item
+Unless you specify the option {\tt defaultsups}, the package will use the superior letters and numbers for footnote markers. These will work in all LaTeX engines, and with all standard LaTeX classes, as well a the KOMA classes. With {\tt defaultsups}, you get scaled-down glyphs which may not match the color of other text and may be more difficult to find on a page.
+\item
+There are now characters in the superiors which may be useful in displaying symbolic footnote markers: \textsu{\textsection, \textparagraph, \textdagger, \textdaggerdbl, \textbardbl, \textasteriskcentered}. See the documentation to the {\tt footmisc} package for more details of their usage. A usage example is appended as the last page of this document.
+\item Option {\tt scosf}, which specifies oldstyle figure within small caps, has been extended and now works in all LaTeX engines with both the \verb|\scshape| switch and the macro \verb|\textsc{}|.
+\item
+The stacked fraction macro is now available: see the documentation in the {\tt newtx} package.
+\item
+Version 1.53 brings {\tt newpxtext} essentially up to parity with {\tt newtxtext}, version 1.73.
+\end{itemize}
+
+\textsc{Changes as of version 1.51}
\begin{itemize}
\item
There is a new {\tt newpx.sty} that offers simplifications in the use of {\tt newpxtext} and {\tt newpxmath} under [pdf]latex, xelatex and lualatex. With {\tt newpx}, you can pass options to {\tt newpxtext} and {\tt newpxmath} as appropriate. For example
@@ -122,7 +139,7 @@ There is a new {\tt newpx.sty} that offers simplifications in the use of {\tt n
\end{verbatim}
would send {\tt scale=.98} to both text and math packages, {\tt varbb} to {\tt newpxmath} and the rest to {\tt newpxtext}. Later sections have more usage examples.
\item
-{Newpxtext.sty} now has a stacked fraction macro: \verb|\textsfrac[2]{17}{32}| produces \textsfrac[2]{17}{32}.
+{Newpxtext.sty} now has a stacked fraction macro: \verb|\textsfrac[2]{17}{32}| produces \textsfrac[2]{17}{32}.
\item
Version 1.51 brings {\tt newpxmath} essentially up to parity with {\tt newtxmath}, version 1.723.
\end{itemize}
@@ -170,22 +187,23 @@ braces and other delimiters are now larger and, I believe, more pleasing to olde
\section{Text mode options and macros}
+
\textsc{Important changes as of version 1.5}
\begin{itemize}
\item
- 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 5.33\%, approximating the size of Linotype Palatino Small Caps. IMO, this is a better match in terms of weight and size: {\pcf Petite Caps}, \textsc{Small Caps}. The two sizes of small caps are now implemented in the Opentype fonts as Petite Caps and Small Caps ({\tt pcap} and {\tt smcp}). The option {\tt largesc} changes the default rendering of \verb|\scshape| and \verb|\textsc| to Small Caps instead of the default Petite Caps.
+ Small caps are available in all weights and styles, and are offered in two sizes. The default small caps supplied by TeXGyrePagella are really {\pcf Petite Caps}, having xheights approximately the same x-heights (sometimes smaller) as lowercase letters. Option \texttt{largesc} increases the size of small caps by 5.33\%, approximating the size of Linotype Palatino Small Caps. IMO, this is a better match in terms of weight and size: {\pcf Petite Caps}, \textsc{Small Caps}. The two sizes of small caps are now implemented in the Opentype fonts as Petite Caps and Small Caps ({\tt pcap} and {\tt smcp}). The option {\tt largesc} changes the default rendering of \verb|\scshape| and \verb|\textsc| to Small Caps instead of the default Petite Caps.
-\item The last versions were missing the switches \verb|\tlfstyle|, \verb|\lfstyle|, \verb|\tosfstyle| and \verb|\osfstyle| as well as their command forms \verb|\texttlf|, \verb|\textlf|, \verb|\texttosf| and \verb|\textosf|, which allowed you to get any figure alignment and style, no matter what the default figure style. For example, though we the main text is proportional oldstyle, \verb|\texttlf{123}| gives the tabular lining form \texttlf{123}, as does \verb|{\tlfstyle123}|.
+\item The last versions were missing the switches \verb|\tlfstyle|, \verb|\lfstyle|, \verb|\tosfstyle| and \verb|\osfstyle| as well as their command forms \verb|\texttlf|, \verb|\textlf|, \verb|\texttosf| and \verb|\textosf|, which allowed you to get any figure alignment and style, no matter what the default figure style. For example, though the main text is proportional oldstyle, \verb|\texttlf{123}| gives the tabular lining form \texttlf{123}, as does \verb|{\tlfstyle123}|.
\item There are also the commands \verb|\oldstylenums|, \verb|\liningnums|, \verb|\tabularnums| and \verb|\proportionalnums|, which change only the alignment and the style.
-\item Two additional figure styles have been added---denominators and subscripts (inferiors), each the same size as superiors, with denominators having the same baseline as text and subscripts below the text baseline. These may be specified respectively by the text switches \verb|\defigures| (\textsc{aka} \verb|\destyle|) and \verb|\infigures| (\textsc{aka} \verb|\instyle|) or the corresponding macros \verb|\textde| and \verb|\textinf|. For example, \verb|{\defigures 123}| gives {\defigures 123}, as would \verb|\textde{123}|, and \verb|{\infigures 123}| gives {\infigures 123}, as would \verb|\textinf{123}|.
+\item Two additional figure styles have been added---denominators and subscripts (inferiors), each the same size as superiors, with denominators having the same baseline as text and subscripts below the text baseline. These may be specified respectively by the text switches \verb|\defigures| (\textsc{aka} \verb|\destyle|) and \verb|\infigures| (\textsc{aka} \verb|\instyle|) or the corresponding macros \verb|\textde| and \verb|\textinf|. For example, \verb|{\defigures 123}| gives {\defigures 123}, as would \verb|\textde{123}|, and \verb|{\infigures 123}| gives {\infigures 123}, as would \verb|\textinf{123}| or \verb|\textsub{123}|.
\item There is a numerators figure style normally used only in the construction of fractions. It may be called by any one of \verb|{\nustyle 123}|, \verb|{\nufigures 123}|, \verb|\textnum{123}|, \verb|\textnumerator{123}|. There is also an equivalent named \verb|\textnu{123}|, but this is problematic since it conflicts with a command in the Greek variant of the {\tt babel} package. If you use the latter, there is an option {\tt notextnu} to {\tt newtxtext} that will prevent the redefinition of \verb|\textnu|.
\item There is a new version of \verb|\textfrac| that provides better kerning around the division solidus than the default command. The integer part may be specified as an optional argument. E.g., \verb|\textfrac{7}{8}| gives \textfrac{7}{8}, while \verb|\textfrac[2]{31}{32}| gives \textfrac[2]{31}{32}.
\item There is a new \verb|\textcircled| which works with both letters and numbers.\\
E.g., \verb|\textcircled{X}\textcircled{2}| gives \textcircled{X}\textcircled{2}.
-\item A new option {\tt slashedzero} is provided for XeLaTeX and LaLaTeX only. It replaces the zero in lining style only to a zero with a reverse slash.
+\item A new option {\tt slashedzero} is provided for XeLaTeX and LuaLaTeX only. It replaces the zero in lining style only to a zero with a reverse slash.
\end{itemize}
\textsc{Important changes as of version 1.42}\\
@@ -205,7 +223,7 @@ has several options: you may write
\begin{verbatim}
\usepackage[scaled=.95]{newpxtext}
\end{verbatim}
-to load the roman and typewriter text fonts at 95\% of normal size, and the sans serif (\textsf{Helvetica} clone) at scale $0.95*0.94$. This is not of much utility if the package is used with the math package {\tt newpxmath} to which it is already matched, but may be with other math packages. The options
+to load the roman and typewriter text fonts at 95\% of normal size, and the sans serif (\textsf{Helvetica} clone) at scale 0.95\textasteriskcentered0.94. This is not of much utility if the package is used with the math package {\tt newpxmath} to which it is already matched, but may be with other math packages. The options
\begin{verbatim}
\usepackage[scaled=.95,helvratio=.96]{newpxtext}
\end{verbatim}
@@ -454,11 +472,10 @@ With {\tt newpx}, there is a little simplification:
\begin{itemize}
\item The {\tt no-math} option to {\tt newpxtext} causes {\tt fontspec} to load with option {\tt no-math}, preventing the package from loading any unicode math font.
\item
-You do not need to load {\tt amsmath}: it is loaded by {\tt newpxmath} Option {\tt amsthm} will cause {\tt amsmath} to load before {\tt amsthm}.
+You do not need to load {\tt amsmath}: it is loaded by {\tt newpxmath}. Option {\tt amsthm} will cause {\tt amsmath} to load before {\tt amsthm}.
\item Babel, if used, must be specified before {\tt newpxtext}.
\item Polyglossia, if used, must be specified after loading {\tt newpxtext}.
-\item The {\tt type1} option to {\tt cabin} is important, preventing it from loading {\tt fontspec}, which would lead to an {\tt option clash} error. (This does seem to work properly in the version of {\tt cabin.sty} dated 12/25/2022.)
-\end{itemize}
+\item The {\tt type1} option to {\tt cabin} is important, preventing it from loading {\tt fontspec}, which would lead to an {\tt option clash} error. \end{itemize}
With {\tt newpx}, the above is equivalent to:
\begin{verbatim}
%\renewcommand{\rmdefault}{zplTLF}% Roman and Bold PagellaX for math mode
@@ -578,14 +595,14 @@ Previous to version 1.5, the preceding pages of this document were processed usi
\item
\verb|\textfrac| works more precisely under unicode tex because it is possible to adjust kerning between all characters. The effect should not be very noticeable, at least in regular style.
\item {\tt sups}: the package treats this differently in unicode LaTeX and pdflatex, with handling in the unicode case passed off to the {\tt realscripts} package where the footnote marker font is set to \verb|\normalfont|, meaning that superiors from the current (TeXGyrePagellaX) text font are employed.
-\item The \verb|\footnote| macro has been changed and appears to function correctly in KOMA based packages, though for proper handling of multiple footnote markers it may be necessary to add the following line to your preamble:
+%\item The \verb|\footnote| macro has been changed and appears to function correctly in KOMA based packages, though for proper handling of multiple footnote markers it may be necessary to add the following line to your preamble:
\begin{verbatim}
\usepackage[multiple]{fontmisc}
\end{verbatim}
\item {\tt theoremfont}, {\tt thmtabular}, {\tt thmlining} all function in a manner similar to that in {\tt pdflatex}.
\item {\tt swashQ} operates as before.
\item {\tt foresolidus, aftsolidus} are not used in unicode tex.
-\item {\tt scosf} operates more effectively than in [pdf]latex---in the latter, it seems now very difficult to modify the definition of \verb|\scshape|, and this option works only for \verb|\textsc|.
+%\item {\tt scosf} operates more effectively than in [pdf]latex---in the latter, it seems now very difficult to modify the definition of \verb|\scshape|, and this option works only for \verb|\textsc|.
%you have the choice of font to render footnote markers. The differences are as follows.
%\begin{itemize}
%\item
@@ -741,7 +758,7 @@ causes no error, unlike the same combination with {\tt pxfonts}, but does nothin
\section{Some recent additions to \texttt{newpxmath}}
Because a number of the standard math accents appeared to be too close to the symbols they accented, a number of the problem accents have been reworked as additions to the {\tt symbols} font, along with a number of vertically doubled symbols. (The doubled symbols are described in the documentation to newtx.) The new accents are flatter and stand higher above their accentees than the old versions.
-Another addition to {\tt symbols} may be used to signify matrix \emph{transpose}. In fact, the glyph is just the {\tt intercal} glyph (from the txfonts rendition of the AMS symbols) raised and narrowed considerable. Here is an example comparing its use to a number of other common constructions:
+Another addition to {\tt symbols} may be used to signify matrix \emph{transpose}. In fact, the glyph is just the {\tt intercal} glyph (from the txfonts rendition of the AMS symbols) raised and narrowed considerably. Here is an example comparing its use to a number of other common constructions:
\[\mathbf{M}^{\transp}, \mathbf{M}^{\mathsf{T}}, \mathbf{M}^{\mathrm{T}}, \mathbf{M}^{\intercal},\]
are produced respectively by
\begin{verbatim}
@@ -944,6 +961,8 @@ The AMS fonts replacement, {\tt zplsym} corrects the former misplacement of \ver
\section{Changed Font Tables}
\subsection{letters}
\fonttable{zplmi}
+
+Note that either of the script P glyphs in the above table would be suitable for rendering \verb|\powerset|, though this is not a standard math macro.
\newpage
\subsection{lettersA}
\fonttable{zplmia}
@@ -976,4 +995,9 @@ and pasting it into the top of your document before the \verb|\documentclass...|
{\mu}{-1}
\end{filecontents*}
\end{verbatim}
+
+\section{Footnote markers}
+The following page displays some of the ways that footnote markers may be modified.
+\newpage
+\includegraphics{footsnippet-crop}
\end{document}
diff --git a/fonts/newpx/enc/npxdnom_LY1.enc b/fonts/newpx/enc/npxdnom_LY1.enc
index 96b5a4302a..be74735fc3 100644
--- a/fonts/newpx/enc/npxdnom_LY1.enc
+++ b/fonts/newpx/enc/npxdnom_LY1.enc
@@ -134,8 +134,8 @@
/florin
/quotedblbase
/ellipsis
-/dagger
-/daggerdbl
+/uni2020
+/uni2021
/circumflex.dup
/perthousand
/Scaron
@@ -167,7 +167,7 @@
/currency
/yen
/brokenbar
-/section
+/uni00A7
/dieresis.dup
/copyright
/ordfeminine
@@ -182,7 +182,7 @@
/three.superior
/acute.dup
/mu
-/paragraph
+/uni00B6
/periodcentered
/cedilla.dup
/one.superior
diff --git a/fonts/newpx/enc/npxdnom_T1.enc b/fonts/newpx/enc/npxdnom_T1.enc
index ca674d3385..ee34e1b3c8 100644
--- a/fonts/newpx/enc/npxdnom_T1.enc
+++ b/fonts/newpx/enc/npxdnom_T1.enc
@@ -160,7 +160,7 @@
/IJ
/Idotaccent
/dcroat
-/section
+/uni00A7
/abreve
/aogonek
/cacute
diff --git a/fonts/newpx/enc/npxnumr_LY1.enc b/fonts/newpx/enc/npxnumr_LY1.enc
index bc9a342585..cab87dce11 100644
--- a/fonts/newpx/enc/npxnumr_LY1.enc
+++ b/fonts/newpx/enc/npxnumr_LY1.enc
@@ -134,8 +134,8 @@
/florin
/quotedblbase
/ellipsis
-/dagger
-/daggerdbl
+/uni2020
+/uni2021
/circumflex.dup
/perthousand
/Scaron
@@ -167,7 +167,7 @@
/currency
/yen
/brokenbar
-/section
+/uni00A7
/dieresis.dup
/copyright
/ordfeminine
@@ -182,7 +182,7 @@
/three.superior
/acute.dup
/mu
-/paragraph
+/uni00B6
/periodcentered
/cedilla.dup
/one.superior
diff --git a/fonts/newpx/enc/npxnumr_T1.enc b/fonts/newpx/enc/npxnumr_T1.enc
index accd662364..b38c82a0b5 100644
--- a/fonts/newpx/enc/npxnumr_T1.enc
+++ b/fonts/newpx/enc/npxnumr_T1.enc
@@ -160,7 +160,7 @@
/IJ
/Idotaccent
/dcroat
-/section
+/uni00A7
/abreve
/aogonek
/cacute
diff --git a/fonts/newpx/enc/npxsubs_LY1.enc b/fonts/newpx/enc/npxsubs_LY1.enc
index d3000c0fb2..6cf94e8a14 100644
--- a/fonts/newpx/enc/npxsubs_LY1.enc
+++ b/fonts/newpx/enc/npxsubs_LY1.enc
@@ -134,8 +134,8 @@
/florin
/quotedblbase
/ellipsis
-/dagger
-/daggerdbl
+/uni2020
+/uni2021
/circumflex.dup
/perthousand
/Scaron
@@ -167,7 +167,7 @@
/currency
/yen
/brokenbar
-/section
+/uni00A7
/dieresis.dup
/copyright
/ordfeminine
@@ -182,7 +182,7 @@
/three.superior
/acute.dup
/mu
-/paragraph
+/uni00B6
/periodcentered
/cedilla.dup
/one.superior
diff --git a/fonts/newpx/enc/npxsubs_T1.enc b/fonts/newpx/enc/npxsubs_T1.enc
index 45239e8b87..00c2fa13ce 100644
--- a/fonts/newpx/enc/npxsubs_T1.enc
+++ b/fonts/newpx/enc/npxsubs_T1.enc
@@ -160,7 +160,7 @@
/IJ
/Idotaccent
/dcroat
-/section
+/uni00A7
/abreve
/aogonek
/cacute
diff --git a/fonts/newpx/enc/npxsups_LY1.enc b/fonts/newpx/enc/npxsups_LY1.enc
index 724aae13dd..9291acae39 100644
--- a/fonts/newpx/enc/npxsups_LY1.enc
+++ b/fonts/newpx/enc/npxsups_LY1.enc
@@ -1,6 +1,6 @@
% A version of the LY1 encoding, intended for use with otftotfm.
% CODINGSCHEME TEX TYPEWRITER AND WINDOWS ANSI
-/ntxsupsLY1Encoding [
+/npxsupsLY1Encoding [
% 0x00
/.notdef.sup
/Euro.sup
@@ -152,8 +152,8 @@
/florin.sup
/quotedblbase.sup
/ellipsis.sup
-/dagger.sup
-/daggerdbl.sup
+/uni2020.sups
+/uni2021.sups
% 0x88.sup
/circumflex.sup
/perthousand.sup
@@ -189,7 +189,7 @@
/currency.sup
/yen.sup
/brokenbar.sup
-/section.sup
+/uni00A7.sups
% 0xA8.sup
/dieresis.sup
/copyright.sup
@@ -206,7 +206,7 @@
/threesuperior.sup
/acute.sup
/mu.sup
-/paragraph.sup
+/uni00B6.sup
/periodcentered.sup
% 0xB8.sup
/cedilla.sup
diff --git a/fonts/newpx/enc/npxsups_OT1.enc b/fonts/newpx/enc/npxsups_OT1.enc
index 8982fb1310..985117eb2c 100644
--- a/fonts/newpx/enc/npxsups_OT1.enc
+++ b/fonts/newpx/enc/npxsups_OT1.enc
@@ -1,6 +1,6 @@
% A version of the OT1 encoding specific to ntxsups
% CODINGSCHEME TEX TEXT
-/ntxsupsOT1Encoding [
+/npxsupsOT1Encoding [
% 0x00
/Gamma
/Delta
diff --git a/fonts/newpx/enc/npxsups_T1.enc b/fonts/newpx/enc/npxsups_T1.enc
index 2582fdc35d..280510dd71 100644
--- a/fonts/newpx/enc/npxsups_T1.enc
+++ b/fonts/newpx/enc/npxsups_T1.enc
@@ -1,6 +1,6 @@
% A version of the T1 encoding specific to ntxsups.
% CODINGSCHEME EXTENDED TEX FONT ENCODING - LATIN
-/ntxsupsT1Encoding [
+/npxsupsT1Encoding [
% 0x00
/grave.sup
/acute.sup
@@ -180,7 +180,7 @@
/IJ.sup
/Idotaccent.sup
/dbar.sup
-/section.sup
+/uni00A7.sups
% 0xA0.sup
/abreve.sup
/aogonek.sup
diff --git a/fonts/newpx/map/newpx.map b/fonts/newpx/map/newpx.map
index b2d40cc151..4f78532b20 100644
--- a/fonts/newpx/map/newpx.map
+++ b/fonts/newpx/map/newpx.map
@@ -58,24 +58,24 @@ zpl-Italic-lf-ot1 TeXGyrePagellaX-Italic " encntx-ot1-lf ReEncodeFont " <[ntx-ot
zpl-Italic-tosf-ot1 TeXGyrePagellaX-Italic " encntx-ot1-tosf ReEncodeFont " <[ntx-ot1-tosf.enc <zplri.pfb
pxsys pxsys <pxsys.pfb
pxbsys pxbsys <pxbsys.pfb
-zplsups-Regular-ot1 npxsups-Regular " ntxsupsOT1Encoding ReEncodeFont " <npxsups_OT1.enc <npxsups-Regular.pfb
-zplsups-Regular-t1 npxsups-Regular " ntxsupsT1Encoding ReEncodeFont " <npxsups_T1.enc <npxsups-Regular.pfb
-zplsups-Regular-ly1 npxsups-Regular " ntxsupsLY1Encoding ReEncodeFont " <npxsups_LY1.enc <npxsups-Regular.pfb
-zplsups-Italic-ot1 npxsups-Italic " ntxsupsOT1Encoding ReEncodeFont " <npxsups_OT1.enc <npxsups-Italic.pfb
-zplsups-Italic-t1 npxsups-Italic " ntxsupsT1Encoding ReEncodeFont " <npxsups_T1.enc <npxsups-Italic.pfb
-zplsups-Italic-ly1 npxsups-Italic " ntxsupsLY1Encoding ReEncodeFont " <npxsups_LY1.enc <npxsups-Italic.pfb
-zplsups-Bold-ot1 npxsups-Bold " ntxsupsOT1Encoding ReEncodeFont " <npxsups_OT1.enc <npxsups-Bold.pfb
-zplsups-Bold-t1 npxsups-Bold " ntxsupsT1Encoding ReEncodeFont " <npxsups_T1.enc <npxsups-Bold.pfb
-zplsups-Bold-ly1 npxsups-Bold " ntxsupsLY1Encoding ReEncodeFont " <npxsups_LY1.enc <npxsups-Bold.pfb
-zplsups-BoldItalic-ot1 npxsups-BoldItalic " ntxsupsOT1Encoding ReEncodeFont " <npxsups_OT1.enc <npxsups-BoldItalic.pfb
-zplsups-BoldItalic-t1 npxsups-BoldItalic " ntxsupsT1Encoding ReEncodeFont " <npxsups_T1.enc <npxsups-BoldItalic.pfb
-zplsups-BoldItalic-ly1 npxsups-BoldItalic " ntxsupsLY1Encoding ReEncodeFont " <npxsups_LY1.enc <npxsups-BoldItalic.pfb
-zplsups-Slanted-ot1 npxsups-Slanted " ntxsupsOT1Encoding ReEncodeFont " <npxsups_OT1.enc <npxsups-Slanted.pfb
-zplsups-Slanted-t1 npxsups-Slanted " ntxsupsT1Encoding ReEncodeFont " <npxsups_T1.enc <npxsups-Slanted.pfb
-zplsups-Slanted-ly1 npxsups-Slanted " ntxsupsLY1Encoding ReEncodeFont " <npxsups_LY1.enc <npxsups-Slanted.pfb
-zplsups-BoldSlanted-ot1 npxsups-BoldSlanted " ntxsupsOT1Encoding ReEncodeFont " <npxsups_OT1.enc <npxsups-BoldSlanted.pfb
-zplsups-BoldSlanted-t1 npxsups-BoldSlanted " ntxsupsT1Encoding ReEncodeFont " <npxsups_T1.enc <npxsups-BoldSlanted.pfb
-zplsups-BoldSlanted-ly1 npxsups-BoldSlanted " ntxsupsLY1Encoding ReEncodeFont " <npxsups_LY1.enc <npxsups-BoldSlanted.pfb
+zplsups-Regular-ot1 npxsups-Regular " npxsupsOT1Encoding ReEncodeFont " <npxsups_OT1.enc <npxsups-Regular.pfb
+zplsups-Regular-t1 npxsups-Regular " npxsupsT1Encoding ReEncodeFont " <npxsups_T1.enc <npxsups-Regular.pfb
+zplsups-Regular-ly1 npxsups-Regular " npxsupsLY1Encoding ReEncodeFont " <npxsups_LY1.enc <npxsups-Regular.pfb
+zplsups-Italic-ot1 npxsups-Italic " npxsupsOT1Encoding ReEncodeFont " <npxsups_OT1.enc <npxsups-Italic.pfb
+zplsups-Italic-t1 npxsups-Italic " npxsupsT1Encoding ReEncodeFont " <npxsups_T1.enc <npxsups-Italic.pfb
+zplsups-Italic-ly1 npxsups-Italic " npxsupsLY1Encoding ReEncodeFont " <npxsups_LY1.enc <npxsups-Italic.pfb
+zplsups-Bold-ot1 npxsups-Bold " npxsupsOT1Encoding ReEncodeFont " <npxsups_OT1.enc <npxsups-Bold.pfb
+zplsups-Bold-t1 npxsups-Bold " npxsupsT1Encoding ReEncodeFont " <npxsups_T1.enc <npxsups-Bold.pfb
+zplsups-Bold-ly1 npxsups-Bold " npxsupsLY1Encoding ReEncodeFont " <npxsups_LY1.enc <npxsups-Bold.pfb
+zplsups-BoldItalic-ot1 npxsups-BoldItalic " npxsupsOT1Encoding ReEncodeFont " <npxsups_OT1.enc <npxsups-BoldItalic.pfb
+zplsups-BoldItalic-t1 npxsups-BoldItalic " npxsupsT1Encoding ReEncodeFont " <npxsups_T1.enc <npxsups-BoldItalic.pfb
+zplsups-BoldItalic-ly1 npxsups-BoldItalic " npxsupsLY1Encoding ReEncodeFont " <npxsups_LY1.enc <npxsups-BoldItalic.pfb
+zplsups-Slanted-ot1 npxsups-Slanted " npxsupsOT1Encoding ReEncodeFont " <npxsups_OT1.enc <npxsups-Slanted.pfb
+zplsups-Slanted-t1 npxsups-Slanted " npxsupsT1Encoding ReEncodeFont " <npxsups_T1.enc <npxsups-Slanted.pfb
+zplsups-Slanted-ly1 npxsups-Slanted " npxsupsLY1Encoding ReEncodeFont " <npxsups_LY1.enc <npxsups-Slanted.pfb
+zplsups-BoldSlanted-ot1 npxsups-BoldSlanted " npxsupsOT1Encoding ReEncodeFont " <npxsups_OT1.enc <npxsups-BoldSlanted.pfb
+zplsups-BoldSlanted-t1 npxsups-BoldSlanted " npxsupsT1Encoding ReEncodeFont " <npxsups_T1.enc <npxsups-BoldSlanted.pfb
+zplsups-BoldSlanted-ly1 npxsups-BoldSlanted " npxsupsLY1Encoding ReEncodeFont " <npxsups_LY1.enc <npxsups-BoldSlanted.pfb
zpl-Regular-tlf-sc-t1 TeXGyrePagellaX-Regular " encntx-ec-tlf-pc ReEncodeFont " <[ntx-ec-tlf-pc.enc <zplr.pfb
zpl-Regular-osf-sc-t1 TeXGyrePagellaX-Regular " encntx-ec-osf-pc ReEncodeFont " <[ntx-ec-osf-pc.enc <zplr.pfb
diff --git a/fonts/newpx/tex/ly1minzpl.fd b/fonts/newpx/tex/ly1minzpl.fd
index df2b7e96f2..9927e717e6 100644
--- a/fonts/newpx/tex/ly1minzpl.fd
+++ b/fonts/newpx/tex/ly1minzpl.fd
@@ -1,6 +1,6 @@
\ProvidesFile{ly1minzpl.fd}[2021/05/25 v1.0 font definition file for LY1/minzpl/TLF]
-\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
+\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{}
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
diff --git a/fonts/newpx/tex/ly1zpllf.fd b/fonts/newpx/tex/ly1zpllf.fd
index af58f28968..e6b8afe7cb 100644
--- a/fonts/newpx/tex/ly1zpllf.fd
+++ b/fonts/newpx/tex/ly1zpllf.fd
@@ -1,6 +1,6 @@
-\ProvidesFile{ly1zpllf.fd}[2021/05/25 v1.0 font definition file for LY1/zpl/LF]
+\ProvidesFile{ly1zpllf.fd}[2021/05/25 v1.0 font definition file for LY1/zpl/lf]
-\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
+\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{}
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
@@ -10,29 +10,29 @@
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{LY1}{zplLF}{\zpl@spacing}
-\DeclareFontShape{LY1}{zplLF}{b}{sc}{<-> \zpl@scaled zpl-Bold-lf-sc\zpl@lsfx-ly1}{}
-\DeclareFontShape{LY1}{zplLF}{b}{n}{<-> \zpl@scaled zpl-Bold-lf-ly1}{}
-\DeclareFontShape{LY1}{zplLF}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-lf-sc\zpl@lsfx-ly1}{}
-\DeclareFontShape{LY1}{zplLF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-lf-ly1}{}
-\DeclareFontShape{LY1}{zplLF}{m}{sc}{<-> \zpl@scaled zpl-Regular-lf-sc\zpl@lsfx-ly1}{}
-\DeclareFontShape{LY1}{zplLF}{m}{n}{<-> \zpl@scaled zpl-Regular-lf-ly1}{}
-\DeclareFontShape{LY1}{zplLF}{m}{scit}{<-> \zpl@scaled zpl-Italic-lf-sc\zpl@lsfx-ly1}{}
-\DeclareFontShape{LY1}{zplLF}{m}{it}{<-> \zpl@scaled zpl-Italic-lf-ly1}{}
-\DeclareFontShape{LY1}{zplLF}{bx}{sc}{<->ssub * zplLF/b/sc}{}
-\DeclareFontShape{LY1}{zplLF}{bx}{n}{<->ssub * zplLF/b/n}{}
-\DeclareFontShape{LY1}{zplLF}{bx}{scit}{<->ssub * zplLF/b/scit}{}
-\DeclareFontShape{LY1}{zplLF}{bx}{it}{<->ssub * zplLF/b/it}{}
+\DeclareFontFamily{LY1}{zpllf}{\zpl@spacing}
+\DeclareFontShape{LY1}{zpllf}{b}{sc}{<-> \zpl@scaled zpl-Bold-lf-sc\zpl@lsfx-ly1}{}
+\DeclareFontShape{LY1}{zpllf}{b}{n}{<-> \zpl@scaled zpl-Bold-lf-ly1}{}
+\DeclareFontShape{LY1}{zpllf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-lf-sc\zpl@lsfx-ly1}{}
+\DeclareFontShape{LY1}{zpllf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-lf-ly1}{}
+\DeclareFontShape{LY1}{zpllf}{m}{sc}{<-> \zpl@scaled zpl-Regular-lf-sc\zpl@lsfx-ly1}{}
+\DeclareFontShape{LY1}{zpllf}{m}{n}{<-> \zpl@scaled zpl-Regular-lf-ly1}{}
+\DeclareFontShape{LY1}{zpllf}{m}{scit}{<-> \zpl@scaled zpl-Italic-lf-sc\zpl@lsfx-ly1}{}
+\DeclareFontShape{LY1}{zpllf}{m}{it}{<-> \zpl@scaled zpl-Italic-lf-ly1}{}
+\DeclareFontShape{LY1}{zpllf}{bx}{sc}{<->ssub * zpllf/b/sc}{}
+\DeclareFontShape{LY1}{zpllf}{bx}{n}{<->ssub * zpllf/b/n}{}
+\DeclareFontShape{LY1}{zpllf}{bx}{scit}{<->ssub * zpllf/b/scit}{}
+\DeclareFontShape{LY1}{zpllf}{bx}{it}{<->ssub * zpllf/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{LY1}{zplLF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-lf-ly1}{}
- \DeclareFontShape{LY1}{zplLF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-lf-ly1}{}
- \DeclareFontShape{LY1}{zplLF}{bx}{sl}{<->ssub * zplLF/b/sl}{}
+ \DeclareFontShape{LY1}{zpllf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-lf-ly1}{}
+ \DeclareFontShape{LY1}{zpllf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-lf-ly1}{}
+ \DeclareFontShape{LY1}{zpllf}{bx}{sl}{<->ssub * zpllf/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{LY1}{zplLF}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-ly1}{}
- \DeclareFontShape{LY1}{zplLF}{b}{sl}{<->ssub * zplLF/m/sl}{}
- \DeclareFontShape{LY1}{zplLF}{bx}{sl}{<->ssub * zplLF/m/sl}{}
+ \DeclareFontShape{LY1}{zpllf}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-ly1}{}
+ \DeclareFontShape{LY1}{zpllf}{b}{sl}{<->ssub * zpllf/m/sl}{}
+ \DeclareFontShape{LY1}{zpllf}{bx}{sl}{<->ssub * zpllf/m/sl}{}
\fi
-\DeclareFontShape{LY1}{zplLF}{b}{scsl}{<->ssub * zplLF/b/scit}{}
-\DeclareFontShape{LY1}{zplLF}{bx}{scsl}{<->ssub * zplLF/b/scit}{}
-\DeclareFontShape{LY1}{zplLF}{m}{scsl}{<->ssub * zplLF/m/scit}{}
+\DeclareFontShape{LY1}{zpllf}{b}{scsl}{<->ssub * zpllf/b/scit}{}
+\DeclareFontShape{LY1}{zpllf}{bx}{scsl}{<->ssub * zpllf/b/scit}{}
+\DeclareFontShape{LY1}{zpllf}{m}{scsl}{<->ssub * zpllf/m/scit}{}
\endinput
diff --git a/fonts/newpx/tex/ly1zplosf.fd b/fonts/newpx/tex/ly1zplosf.fd
index 0e53ec571b..5b2f6badba 100644
--- a/fonts/newpx/tex/ly1zplosf.fd
+++ b/fonts/newpx/tex/ly1zplosf.fd
@@ -1,6 +1,6 @@
-\ProvidesFile{ly1zplosf.fd}[2021/05/25 v1.0 font definition file for LY1/zpl/OsF]
+\ProvidesFile{ly1zplosf.fd}[2021/05/25 v1.0 font definition file for LY1/zpl/osf]
-\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
+\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{}
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
@@ -10,29 +10,29 @@
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{LY1}{zplOsF}{\zpl@spacing}
-\DeclareFontShape{LY1}{zplOsF}{b}{sc}{<-> \zpl@scaled zpl-Bold-osf-sc\zpl@lsfx-ly1}{}
-\DeclareFontShape{LY1}{zplOsF}{b}{n}{<-> \zpl@scaled zpl-Bold-osf-ly1}{}
-\DeclareFontShape{LY1}{zplOsF}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-osf-sc\zpl@lsfx-ly1}{}
-\DeclareFontShape{LY1}{zplOsF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-osf-ly1}{}
-\DeclareFontShape{LY1}{zplOsF}{m}{sc}{<-> \zpl@scaled zpl-Regular-osf-sc\zpl@lsfx-ly1}{}
-\DeclareFontShape{LY1}{zplOsF}{m}{n}{<-> \zpl@scaled zpl-Regular-osf-ly1}{}
-\DeclareFontShape{LY1}{zplOsF}{m}{scit}{<-> \zpl@scaled zpl-Italic-osf-sc\zpl@lsfx-ly1}{}
-\DeclareFontShape{LY1}{zplOsF}{m}{it}{<-> \zpl@scaled zpl-Italic-osf-ly1}{}
-\DeclareFontShape{LY1}{zplOsF}{bx}{sc}{<->ssub * zplOsF/b/sc}{}
-\DeclareFontShape{LY1}{zplOsF}{bx}{n}{<->ssub * zplOsF/b/n}{}
-\DeclareFontShape{LY1}{zplOsF}{bx}{scit}{<->ssub * zplOsF/b/scit}{}
-\DeclareFontShape{LY1}{zplOsF}{bx}{it}{<->ssub * zplOsF/b/it}{}
+\DeclareFontFamily{LY1}{zplosf}{\zpl@spacing}
+\DeclareFontShape{LY1}{zplosf}{b}{sc}{<-> \zpl@scaled zpl-Bold-osf-sc\zpl@lsfx-ly1}{}
+\DeclareFontShape{LY1}{zplosf}{b}{n}{<-> \zpl@scaled zpl-Bold-osf-ly1}{}
+\DeclareFontShape{LY1}{zplosf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-osf-sc\zpl@lsfx-ly1}{}
+\DeclareFontShape{LY1}{zplosf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-osf-ly1}{}
+\DeclareFontShape{LY1}{zplosf}{m}{sc}{<-> \zpl@scaled zpl-Regular-osf-sc\zpl@lsfx-ly1}{}
+\DeclareFontShape{LY1}{zplosf}{m}{n}{<-> \zpl@scaled zpl-Regular-osf-ly1}{}
+\DeclareFontShape{LY1}{zplosf}{m}{scit}{<-> \zpl@scaled zpl-Italic-osf-sc\zpl@lsfx-ly1}{}
+\DeclareFontShape{LY1}{zplosf}{m}{it}{<-> \zpl@scaled zpl-Italic-osf-ly1}{}
+\DeclareFontShape{LY1}{zplosf}{bx}{sc}{<->ssub * zplosf/b/sc}{}
+\DeclareFontShape{LY1}{zplosf}{bx}{n}{<->ssub * zplosf/b/n}{}
+\DeclareFontShape{LY1}{zplosf}{bx}{scit}{<->ssub * zplosf/b/scit}{}
+\DeclareFontShape{LY1}{zplosf}{bx}{it}{<->ssub * zplosf/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{LY1}{zplOsF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-osf-ly1}{}
- \DeclareFontShape{LY1}{zplOsF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-osf-ly1}{}
- \DeclareFontShape{LY1}{zplOsF}{bx}{sl}{<->ssub * zplOsF/b/sl}{}
+ \DeclareFontShape{LY1}{zplosf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-osf-ly1}{}
+ \DeclareFontShape{LY1}{zplosf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-osf-ly1}{}
+ \DeclareFontShape{LY1}{zplosf}{bx}{sl}{<->ssub * zplosf/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{LY1}{zplOsF}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-ly1}{}
- \DeclareFontShape{LY1}{zplOsF}{b}{sl}{<->ssub * zplOsF/m/sl}{}
- \DeclareFontShape{LY1}{zplOsF}{bx}{sl}{<->ssub * zplOsF/m/sl}{}
+ \DeclareFontShape{LY1}{zplosf}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-ly1}{}
+ \DeclareFontShape{LY1}{zplosf}{b}{sl}{<->ssub * zplosf/m/sl}{}
+ \DeclareFontShape{LY1}{zplosf}{bx}{sl}{<->ssub * zplosf/m/sl}{}
\fi
-\DeclareFontShape{LY1}{zplOsF}{b}{scsl}{<->ssub * zplOsF/b/scit}{}
-\DeclareFontShape{LY1}{zplOsF}{bx}{scsl}{<->ssub * zplOsF/b/scit}{}
-\DeclareFontShape{LY1}{zplOsF}{m}{scsl}{<->ssub * zplOsF/m/scit}{}
+\DeclareFontShape{LY1}{zplosf}{b}{scsl}{<->ssub * zplosf/b/scit}{}
+\DeclareFontShape{LY1}{zplosf}{bx}{scsl}{<->ssub * zplosf/b/scit}{}
+\DeclareFontShape{LY1}{zplosf}{m}{scsl}{<->ssub * zplosf/m/scit}{}
\endinput
diff --git a/fonts/newpx/tex/ly1zpltlf.fd b/fonts/newpx/tex/ly1zpltlf.fd
index 847bb2075a..2506dfee75 100644
--- a/fonts/newpx/tex/ly1zpltlf.fd
+++ b/fonts/newpx/tex/ly1zpltlf.fd
@@ -1,6 +1,6 @@
-\ProvidesFile{ly1zpltlf.fd}[2021/05/25 v1.0 font definition file for LY1/zpl/TLF]
+\ProvidesFile{ly1zpltlf.fd}[2021/05/25 v1.0 font definition file for LY1/zpl/tlf]
-\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
+\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{}
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
@@ -10,29 +10,29 @@
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{LY1}{zplTLF}{\zpl@spacing}
-\DeclareFontShape{LY1}{zplTLF}{b}{sc}{<-> \zpl@scaled zpl-Bold-tlf-sc\zpl@lsfx-ly1}{}
-\DeclareFontShape{LY1}{zplTLF}{b}{n}{<-> \zpl@scaled zpl-Bold-tlf-ly1}{}
-\DeclareFontShape{LY1}{zplTLF}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-tlf-sc\zpl@lsfx-ly1}{}
-\DeclareFontShape{LY1}{zplTLF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tlf-ly1}{}
-\DeclareFontShape{LY1}{zplTLF}{m}{sc}{<-> \zpl@scaled zpl-Regular-tlf-sc\zpl@lsfx-ly1}{}
-\DeclareFontShape{LY1}{zplTLF}{m}{n}{<-> \zpl@scaled zpl-Regular-tlf-ly1}{}
-\DeclareFontShape{LY1}{zplTLF}{m}{scit}{<-> \zpl@scaled zpl-Italic-tlf-sc\zpl@lsfx-ly1}{}
-\DeclareFontShape{LY1}{zplTLF}{m}{it}{<-> \zpl@scaled zpl-Italic-tlf-ly1}{}
-\DeclareFontShape{LY1}{zplTLF}{bx}{sc}{<->ssub * zplTLF/b/sc}{}
-\DeclareFontShape{LY1}{zplTLF}{bx}{n}{<->ssub * zplTLF/b/n}{}
-\DeclareFontShape{LY1}{zplTLF}{bx}{scit}{<->ssub * zplTLF/b/scit}{}
-\DeclareFontShape{LY1}{zplTLF}{bx}{it}{<->ssub * zplTLF/b/it}{}
+\DeclareFontFamily{LY1}{zpltlf}{\zpl@spacing}
+\DeclareFontShape{LY1}{zpltlf}{b}{sc}{<-> \zpl@scaled zpl-Bold-tlf-sc\zpl@lsfx-ly1}{}
+\DeclareFontShape{LY1}{zpltlf}{b}{n}{<-> \zpl@scaled zpl-Bold-tlf-ly1}{}
+\DeclareFontShape{LY1}{zpltlf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-tlf-sc\zpl@lsfx-ly1}{}
+\DeclareFontShape{LY1}{zpltlf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tlf-ly1}{}
+\DeclareFontShape{LY1}{zpltlf}{m}{sc}{<-> \zpl@scaled zpl-Regular-tlf-sc\zpl@lsfx-ly1}{}
+\DeclareFontShape{LY1}{zpltlf}{m}{n}{<-> \zpl@scaled zpl-Regular-tlf-ly1}{}
+\DeclareFontShape{LY1}{zpltlf}{m}{scit}{<-> \zpl@scaled zpl-Italic-tlf-sc\zpl@lsfx-ly1}{}
+\DeclareFontShape{LY1}{zpltlf}{m}{it}{<-> \zpl@scaled zpl-Italic-tlf-ly1}{}
+\DeclareFontShape{LY1}{zpltlf}{bx}{sc}{<->ssub * zpltlf/b/sc}{}
+\DeclareFontShape{LY1}{zpltlf}{bx}{n}{<->ssub * zpltlf/b/n}{}
+\DeclareFontShape{LY1}{zpltlf}{bx}{scit}{<->ssub * zpltlf/b/scit}{}
+\DeclareFontShape{LY1}{zpltlf}{bx}{it}{<->ssub * zpltlf/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{LY1}{zplTLF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tlf-ly1}{}
- \DeclareFontShape{LY1}{zplTLF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tlf-ly1}{}
- \DeclareFontShape{LY1}{zplTLF}{bx}{sl}{<->ssub * zplTLF/b/sl}{}
+ \DeclareFontShape{LY1}{zpltlf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tlf-ly1}{}
+ \DeclareFontShape{LY1}{zpltlf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tlf-ly1}{}
+ \DeclareFontShape{LY1}{zpltlf}{bx}{sl}{<->ssub * zpltlf/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{LY1}{zplTLF}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-ly1}{}
- \DeclareFontShape{LY1}{zplTLF}{b}{sl}{<->ssub * zplTLF/m/sl}{}
- \DeclareFontShape{LY1}{zplTLF}{bx}{sl}{<->ssub * zplTLF/m/sl}{}
+ \DeclareFontShape{LY1}{zpltlf}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-ly1}{}
+ \DeclareFontShape{LY1}{zpltlf}{b}{sl}{<->ssub * zpltlf/m/sl}{}
+ \DeclareFontShape{LY1}{zpltlf}{bx}{sl}{<->ssub * zpltlf/m/sl}{}
\fi
-\DeclareFontShape{LY1}{zplTLF}{b}{scsl}{<->ssub * zplTLF/b/scit}{}
-\DeclareFontShape{LY1}{zplTLF}{bx}{scsl}{<->ssub * zplTLF/b/scit}{}
-\DeclareFontShape{LY1}{zplTLF}{m}{scsl}{<->ssub * zplTLF/m/scit}{}
+\DeclareFontShape{LY1}{zpltlf}{b}{scsl}{<->ssub * zpltlf/b/scit}{}
+\DeclareFontShape{LY1}{zpltlf}{bx}{scsl}{<->ssub * zpltlf/b/scit}{}
+\DeclareFontShape{LY1}{zpltlf}{m}{scsl}{<->ssub * zpltlf/m/scit}{}
\endinput
diff --git a/fonts/newpx/tex/ly1zpltosf.fd b/fonts/newpx/tex/ly1zpltosf.fd
index 84e56add27..aa7f2a4509 100644
--- a/fonts/newpx/tex/ly1zpltosf.fd
+++ b/fonts/newpx/tex/ly1zpltosf.fd
@@ -1,6 +1,6 @@
-\ProvidesFile{ly1zpltosf.fd}[2021/05/25 v1.0 font definition file for LY1/zpl/TOsF]
+\ProvidesFile{ly1zpltosf.fd}[2021/05/25 v1.0 font definition file for LY1/zpl/tosf]
-\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
+\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{}
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
@@ -12,29 +12,29 @@
\ifdefined\zpl@adobescfalse\zpl@makeadobesc\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{LY1}{zplTOsF}{\zpl@spacing}
-\DeclareFontShape{LY1}{zplTOsF}{b}{sc}{<-> \zpl@scaled zpl-Bold-tosf-sc\zpl@lsfx\zpl@asfx-ly1}{}
-\DeclareFontShape{LY1}{zplTOsF}{b}{n}{<-> \zpl@scaled zpl-Bold-tosf-ly1}{}
-\DeclareFontShape{LY1}{zplTOsF}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-tosf-sc\zpl@lsfx-ly1}{}
-\DeclareFontShape{LY1}{zplTOsF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tosf-ly1}{}
-\DeclareFontShape{LY1}{zplTOsF}{m}{sc}{<-> \zpl@scaled zpl-Regular-tosf-sc\zpl@lsfx\zpl@asfx-ly1}{}
-\DeclareFontShape{LY1}{zplTOsF}{m}{n}{<-> \zpl@scaled zpl-Regular-tosf-ly1}{}
-\DeclareFontShape{LY1}{zplTOsF}{m}{scit}{<-> \zpl@scaled zpl-Italic-tosf-sc\zpl@lsfx-ly1}{}
-\DeclareFontShape{LY1}{zplTOsF}{m}{it}{<-> \zpl@scaled zpl-Italic-tosf-ly1}{}
-\DeclareFontShape{LY1}{zplTOsF}{bx}{sc}{<->ssub * zplTOsF/b/sc}{}
-\DeclareFontShape{LY1}{zplTOsF}{bx}{n}{<->ssub * zplTOsF/b/n}{}
-\DeclareFontShape{LY1}{zplTOsF}{bx}{scit}{<->ssub * zplTOsF/b/scit}{}
-\DeclareFontShape{LY1}{zplTOsF}{bx}{it}{<->ssub * zplTOsF/b/it}{}
+\DeclareFontFamily{LY1}{zpltosf}{\zpl@spacing}
+\DeclareFontShape{LY1}{zpltosf}{b}{sc}{<-> \zpl@scaled zpl-Bold-tosf-sc\zpl@lsfx\zpl@asfx-ly1}{}
+\DeclareFontShape{LY1}{zpltosf}{b}{n}{<-> \zpl@scaled zpl-Bold-tosf-ly1}{}
+\DeclareFontShape{LY1}{zpltosf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-tosf-sc\zpl@lsfx-ly1}{}
+\DeclareFontShape{LY1}{zpltosf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tosf-ly1}{}
+\DeclareFontShape{LY1}{zpltosf}{m}{sc}{<-> \zpl@scaled zpl-Regular-tosf-sc\zpl@lsfx\zpl@asfx-ly1}{}
+\DeclareFontShape{LY1}{zpltosf}{m}{n}{<-> \zpl@scaled zpl-Regular-tosf-ly1}{}
+\DeclareFontShape{LY1}{zpltosf}{m}{scit}{<-> \zpl@scaled zpl-Italic-tosf-sc\zpl@lsfx-ly1}{}
+\DeclareFontShape{LY1}{zpltosf}{m}{it}{<-> \zpl@scaled zpl-Italic-tosf-ly1}{}
+\DeclareFontShape{LY1}{zpltosf}{bx}{sc}{<->ssub * zpltosf/b/sc}{}
+\DeclareFontShape{LY1}{zpltosf}{bx}{n}{<->ssub * zpltosf/b/n}{}
+\DeclareFontShape{LY1}{zpltosf}{bx}{scit}{<->ssub * zpltosf/b/scit}{}
+\DeclareFontShape{LY1}{zpltosf}{bx}{it}{<->ssub * zpltosf/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{LY1}{zplTOsF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tosf-ly1}{}
- \DeclareFontShape{LY1}{zplTOsF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tosf-ly1}{}
- \DeclareFontShape{LY1}{zplTOsF}{bx}{sl}{<->ssub * zplTOsF/b/sl}{}
+ \DeclareFontShape{LY1}{zpltosf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tosf-ly1}{}
+ \DeclareFontShape{LY1}{zpltosf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tosf-ly1}{}
+ \DeclareFontShape{LY1}{zpltosf}{bx}{sl}{<->ssub * zpltosf/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{LY1}{zplTOsF}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-ly1}{}
- \DeclareFontShape{LY1}{zplTOsF}{b}{sl}{<->ssub * zplTOsF/m/sl}{}
- \DeclareFontShape{LY1}{zplTOsF}{bx}{sl}{<->ssub * zplTOsF/m/sl}{}
+ \DeclareFontShape{LY1}{zpltosf}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-ly1}{}
+ \DeclareFontShape{LY1}{zpltosf}{b}{sl}{<->ssub * zpltosf/m/sl}{}
+ \DeclareFontShape{LY1}{zpltosf}{bx}{sl}{<->ssub * zpltosf/m/sl}{}
\fi
-\DeclareFontShape{LY1}{zplTOsF}{b}{scsl}{<->ssub * zplTOsF/b/scit}{}
-\DeclareFontShape{LY1}{zplTOsF}{bx}{scsl}{<->ssub * zplTOsF/b/scit}{}
-\DeclareFontShape{LY1}{zplTOsF}{m}{scsl}{<->ssub * zplTOsF/m/scit}{}
+\DeclareFontShape{LY1}{zpltosf}{b}{scsl}{<->ssub * zpltosf/b/scit}{}
+\DeclareFontShape{LY1}{zpltosf}{bx}{scsl}{<->ssub * zpltosf/b/scit}{}
+\DeclareFontShape{LY1}{zpltosf}{m}{scsl}{<->ssub * zpltosf/m/scit}{}
\endinput
diff --git a/fonts/newpx/tex/newpxtext.sty b/fonts/newpx/tex/newpxtext.sty
index 696a5c9732..1b25ea155a 100644
--- a/fonts/newpx/tex/newpxtext.sty
+++ b/fonts/newpx/tex/newpxtext.sty
@@ -8,16 +8,18 @@
% Text is now directed to an extension of TeXGyrePagella rather than ppl.
% 1.5 is first version of newpxtext to support both [pdf]latex and unicode latex.
-\def\fileversion{1.521}
-\def\filedate{2023/09/27}
+\def\fileversion{1.53}
+\def\filedate{2023/10/23}
\ProvidesPackage{newpxtext}[%
\filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for TeXGyrePagellaX]
\message{`newpxtext' v\fileversion, \filedate\space Text macros taking advantage of TeXGyre Pagella and its extensions (msharpe)}
\RequirePackage[T1]{fontenc}
-\renewcommand*{\rmdefault}{zplTLF} % the default until end of preamble
+\RequirePackage{xcolor}
+\renewcommand*{\rmdefault}{zpltlf} % the default until end of preamble
\renewcommand*{\familydefault}{\rmdefault}
+\RequirePackage{xpatch} % need to patch \scshape
\RequirePackage{iftex,xkeyval,etoolbox,textcomp}
\RequirePackage{xstring,ifthen,scalefnt} % for \textfrac
\IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
@@ -127,13 +129,17 @@
\newdimen\zplsups@scale
\newdimen\zplsups@raise
\def\zplsups@raised{\z@}
-\def\zplsups@spaced{.04em}
+\def\zplsups@Lspaced{.04em}
+\def\zplsups@Rspaced{.04em}
\def\zplsups@scaledval{1.0}
-\def\zplsups@supscale{1.0}
+\def\zplsups@scalefactor{1}
+\newcommand*{\zplsups@color}{black}
\DeclareOptionX{supscaled}{\renewcommand*{\zplsups@scaledval}{#1}}
\DeclareOptionX{supscale}{\renewcommand*{\zplsups@scaledval}{#1}}
\DeclareOptionX{supsraised}{\renewcommand*{\zplsups@raised}{#1}}
-\DeclareOptionX{supspaced}{\renewcommand*{\zplsups@supspaced}{#1}}
+\DeclareOptionX{supLspaced}{\renewcommand*{\zplsups@Lspaced}{#1}}
+\DeclareOptionX{supRspaced}{\renewcommand*{\zplsups@Rspaced}{#1}}
+\DeclareOptionX{supscolor}{\renewcommand*{\zplsups@color}{#1}}
% Other options
\DeclareOptionX{defaultsups}[true]{%
@@ -203,8 +209,8 @@
\setlength{\zplsups@raise}{\zplsups@raised}
\setlength{\zplsups@scale}{\zplsups@scaledval\p@}
\zplsups@scale=\zpl@scale\zplsups@scale %
+\def\zplsups@scalefactor{\strip@pt\zplsups@scale}
\def\zplsups@scaled{s*[\strip@pt\zplsups@scale]}
-
% for stacked fractions
\@ifundefined{zpl@xht}{\def\zpl@xht{460}}{} % lowercase letters
\@ifundefined{zpl@deht}{\def\zpl@deht{412}}{} % denominator figures ht
@@ -218,6 +224,7 @@
\def\re@DeclareTextSymbol#1#2#3{%
\let#1=\undefined
\DeclareTextSymbol{#1}{#2}{#3}}
+
\ifzpl@otf
\ifzpl@nomath
\RequirePackage[no-math]{fontspec}
@@ -232,7 +239,14 @@
"local", "texmf", "system" }}
\fi
\def\zpl@base{TeXGyrePagellaX}
-
+ \ifzpl@scosf
+ \AtBeginDocument{%
+ \xpretocmd{\scshape}
+ {\addfontfeatures{Numbers=OldStyle}}
+ {}{}%
+ }%
+ \fi
+
\newcommand{\textfrac}[3][]{{%\normalfont%
\mbox{%
\ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
@@ -242,23 +256,18 @@
}}}
\else % type1
-% for possible use in footnote markers
-% \DeclareFontFamily{OT1}{zplsups}{}%
-% \DeclareFontShape{OT1}{zplsups}{m}{n}{%
-% <-> \zplsups@scaled zplsups-Regular-ot1
-%}{}
-% \DeclareFontFamily{T1}{zplsups}{}%
-% \DeclareFontShape{T1}{zsups}{m}{n}{%
-% <-> \zplsups@scaled zplsups-Regular-t1
-%}{}
-% \DeclareFontFamily{TS1}{zsups}{}%
-% \DeclareFontShape{TS1}{zsups}{m}{n}{%
-% <-> \zplsups@scaled zplsups-Regular-ts1
-%}{}
-\DeclareRobustCommand{\supstyle}{%
- \not@math@alphabet\supstyle\relax
- \usefont{\f@encoding}{zplsups}{m}{n}}
-
+ \ifzpl@scosf
+ \AtBeginDocument{%
+ \xpretocmd{\scshape}
+ {\fontfamily{zpl\zpl@figurealign osf}}
+ {}{}%
+ }%
+ \fi%
+ \DeclareRobustCommand{\sustyle}{%
+ \not@math@alphabet\sustyle\relax
+ \fontfamily{zplsups}\selectfont}
+ \let\supstyle\sustyle
+
\ifdim\zplsups@raise=\z@
\DeclareRobustCommand{\textsups}[1]{{\supstyle#1}}
\else
@@ -273,13 +282,7 @@
% \fontfigurestyle{superior}\selectfont}
% \let\sustyle=\sufigures
% \DeclareTextFontCommand{\textsu}{\sufigures}
-% \let\textsuperior\textsu
- \DeclareRobustCommand{\sustyle}{%
- \not@math@alphabet\sustyle\relax
- \fontfamily{zplsups}\selectfont}
\let\sufigures=\sustyle
- \let\nustyle=\sustyle
- \let\nufigures=\sustyle
\fa@naming@exception{figures}{{inferior}{proportional}}{inf}
\fa@naming@exception{figures}{{inferior}{tabular}}{inf}
@@ -288,11 +291,12 @@
% \let\instyle=\infigures
% \DeclareTextFontCommand{\textinf}{\infigures}
% \let\textinferior\textinf
- \DeclareRobustCommand{\instyle}{%
+ \DeclareRobustCommand{\infstyle}{%
\not@math@alphabet\instyle\relax
\fontfamily{zplsubs}\selectfont}
- \let\infigures=\instyle
-
+ \let\infigures=\infstyle
+ \let\instyle\infstyle
+
\fa@naming@exception{figures}{{denominators}{proportional}}{dnom}
\fa@naming@exception{figures}{{denominators}{tabular}}{dnom}
% \def\defigures{\@nomath\defigures
@@ -354,8 +358,8 @@
} % textfrac
\fi
-\let\orig@footnote=\thefootnote
-\let\orig@makefnmark=\@makefnmark
+%\let\orig@footnote=\thefootnote
+%\let\orig@makefnmark=\@makefnmark
\def\bfseries@rm{b}
\def\mdseries@rm{m}
\def\useosf{\zpl@liningfalse}
@@ -392,13 +396,13 @@
{\edef\zpl@dflt{\zpl@dflt StylisticSet={\zpl@lst} ,
}}{}
- \defaultfontfeatures{
+ \defaultfontfeatures[\zpl@base]{
Ligatures = TeX ,
Scale = \zpl@scale ,
Extension = .otf ,
SmallCapsFeatures={\ifzpl@scosf Numbers = OldStyle ,
- \fi RawFeature = +\zpl@scraw ,
- \ifluatex Renderer=Basic\fi} ,
+ \fi RawFeature = +\zpl@scraw } ,
+ \ifluatex Renderer=Basic , \fi
\zpl@dflt ,
RawFeature=-ss05 ,
\zpl@defaultfeatures
@@ -413,29 +417,26 @@
\edef\qhv@scale{\strip@pt\@tempdima}
\def\zpl@scaled{s*[\zpl@scale]}% used in fd files
- %\def\oldstylenums#1{{\fontencoding{TS1}\selectfont #1}}
-
- %\expandafter\patchcmd\expandafter{\csname scshape \endcsname}{\fontshape}{\fontfamily{zpl\zpl@figurealign osf}\fontshape}{\message{Replaced figure style by osf in sc.}}{\message{Unable to replace figure style by osf in sc.}}
\DeclareRobustCommand{\lfstyle}{%
\not@math@alphabet\lfstyle\relax
- \fontfamily{zplLF}\selectfont %
+ \fontfamily{zpllf}\selectfont %
}
\DeclareRobustCommand{\tlfstyle}{%
\not@math@alphabet\tlfstyle\relax
- \fontfamily{zplTLF}\selectfont %
+ \fontfamily{zpltlf}\selectfont %
}
\DeclareRobustCommand{\osfstyle}{%
\not@math@alphabet\osfstyle\relax
- \fontfamily{zplOsF}\selectfont %
+ \fontfamily{zplosf}\selectfont %
}
\DeclareRobustCommand{\tosfstyle}{%
\not@math@alphabet\tosfstyle\relax
- \fontfamily{zplTOsF}\selectfont %
+ \fontfamily{zpltosf}\selectfont %
}
\ifzpl@defaultsups %
\else
- \ExplSyntaxOn
+ \ExplSyntaxOn
\DeclareDocumentCommand \fakesuperscript {m} {
\@textsuperscript{\selectfont#1}
}
@@ -443,23 +444,31 @@
\IfBooleanTF #1 \fakesuperscript \realsuperscript
}
\DeclareDocumentCommand \realsuperscript {m} {
- \ifzpl@defaultsups\fakesuperscript{#1}
- \else\hspace*{\zplsups@spaced}\textsups{#1}\fi
- }
-
- \cs_set:Npn \@makefnmark {
- \mbox{%
+ \hbox_set:Nn \l_tmpa_box {{\sustyle#1}}
+ \box_scale:Nnn \l_tmpa_box { \zplsups@scalefactor } { \zplsups@scalefactor }
+ \hbox_set:Nn \l_tmpa_box
+ { \box_move_up:nn \zplsups@raised {\box_use:N \l_tmpa_box} }
+ \hspace*{\zplsups@Lspaced}{\color{\zplsups@color}%
+ \box_use:N \l_tmpa_box} \hspace*{\zplsups@Rspaced}}%
+
+
+ \cs_set:Npn \@makefnmark {
+ \mbox{%
\footnotemarkfont\textsuperscript{\@thefnmark}}
}
- \cs_if_exist:NTF \ftntm@font
+ \cs_if_exist:NTF \ftntm@font % will exist only for KOMA
{
- \cs_new:Npn \footnotemarkfont {\normalfont \ftntm@font}
+ \cs_new:Npn \footnotemarkfont {\normalfont \ftntm@font}
}
{
- \cs_new:Npn \footnotemarkfont {\normalfont}
+ \cs_new:Npn \footnotemarkfont {\normalfont}
}
\ExplSyntaxOff
\fi
+ \ifzpl@KOMA
+ \setkomafont{footnotereference}{\normalfont\supstyle}
+ \setkomafont{footnotelabel}{\normalfont\supstyle}
+ \fi
% \ifzpl@KOMA
% \let\textsuperscript\sustyle
% \setkomafont{footnotelabel}{\textsuperscript}
@@ -510,7 +519,7 @@
\ifzpl@otf
% \def\zpl@nft{\if t\zpl@thmtab Monospaced%
% \else Proportional\fi}
- \DeclareTextFontCommand{\textsl}{\slshape}
+%\DeclareTextFontCommand{\textsl}{\slshape}
\DeclareTextFontCommand{%
\osfstyle}{\addfontfeatures{Numbers={Proportional,OldStyle}}}
\DeclareTextFontCommand{%
@@ -520,32 +529,69 @@
\DeclareTextFontCommand{%
\lfstyle}{\addfontfeatures{Numbers={Proportional,Lining}}}
- \providecommand\sufigures{%
- \addfontfeatures{VerticalPosition=Superior}}
- \providecommand\infigures{%
- \addfontfeatures{VerticalPosition=Inferior}}
- \providecommand\nufigures{%
- \addfontfeatures{VerticalPosition=Numerator}}
- \providecommand\defigures{%
- \addfontfeatures{VerticalPosition=Denominator}}
- \let\sustyle=\sufigures
- \let\nustyle=\nufigures
- \let\instyle=\infigures
- \let\destyle=\defigures
+ \DeclareRobustCommand{\destyle}{%
+ \not@math@alphabet\destyle\relax
+ \addfontfeatures{VerticalPosition=Denominator}%
+ }
+ \DeclareRobustCommand{\nustyle}{%
+ \not@math@alphabet\nustyle\relax
+ \addfontfeatures{VerticalPosition=Numerator}%
+ }
+ \DeclareRobustCommand{\sustyle}{%
+ \not@math@alphabet\sustyle\relax
+ \addfontfeatures{VerticalPosition=Superior}%
+ }
+ \DeclareRobustCommand{\infstyle}{%
+ \not@math@alphabet\infstyle\relax
+ \addfontfeatures{VerticalPosition=Inferior}%
+ }
+ \let\instyle\infstyle
+ \let\sufigures\sustyle
+ \let\nufigures\nustyle
+ \let\infigures\infstyle
+ \let\defigures\destyle
+
\ifzpl@defaultsups %
\else
+ \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont\textsuperscript{\@thefnmark}}{}{}
+ \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont\textsuperscript{\@thefnmark}}{}{}
+ %\show\maketitle
\RequirePackage{realscripts}
- \renewcommand\footnotemarkfont{\normalfont\sufigures}
+ \renewcommand\footnotemarkfont{\normalfont}%\sufigures}
+ \ExplSyntaxOn
+ \DeclareDocumentCommand \fakesuperscript {m} {
+ \@textsuperscript{\selectfont#1}
+ }
+ \RenewDocumentCommand \textsuperscript {s} {
+ \IfBooleanTF #1 \fakesuperscript \realsuperscript
+ }
+ \DeclareDocumentCommand \realsuperscript {m} {
+ \hbox_set:Nn \l_tmpa_box {\textsups{#1}}
+ \box_scale:Nnn \l_tmpa_box { \zplsups@scalefactor } { \zplsups@scalefactor }
+ \hbox_set:Nn \l_tmpa_box
+ { \box_move_up:nn \zplsups@raised {\box_use:N \l_tmpa_box} }
+ \hspace*{\zplsups@Lspaced}{\color{\zplsups@color}%
+ \box_use:N \l_tmpa_box }%
+ \hspace*{\zplsups@Rspaced}}
+
+ \cs_set:Npn \@makefnmark {%
+ \mbox{%
+ \footnotemarkfont\textsuperscript{\@thefnmark}}
+ }
+ \cs_if_exist:NTF \ftntm@font
+ {
+ \cs_set:Npn \footnotemarkfont {\normalfont \ftntm@font}
+ }
+ {
+ \cs_set:Npn \footnotemarkfont {\normalfont}
+ }
+ \ExplSyntaxOff
\fi
\ifzpl@KOMA
\setkomafont{footnotereference}{\normalfont\sustyle}
\setkomafont{footnotelabel}{\normalfont\sustyle}
\fi
-% \ifzpl@scosf
-% \edef\zpl@fnt{\expandafter\csname zpl\ifzpl@tabular T\fi OsF\endcsname}
-% \DeclareRobustCommand{\textsc}[1]{%
-% {\zpl@fnt \addfontfeatures{RawFeature=+smcp}#1}}%
-% \fi
+
\renewcommand*{\textcircled}[1]{\hmode@bgroup\ooalign{%
\hfil \raise -.255ex\hbox{{%
\normalfont\addfontfeatures{Numbers={Monospaced, Lining}}%
@@ -574,18 +620,17 @@
\DeclareRobustCommand{\texttosf}[1]{%
{\tosfstyle #1}%
}
-\DeclareRobustCommand{\textsu}[1]{%
- {\sustyle #1}%
-}
\DeclareTextFontCommand{\textsu}{\sustyle}
- \let\textsuperior\textsu
+ \let\textsup\textsu
+ \let\textsups\textsu
\DeclareTextFontCommand{\textnumerator}{\nustyle}
\ifzpl@notextnu\else\let\textnu=\textnumerator\fi
\let\textnum\textnumerator
\DeclareTextFontCommand{\textde}{\destyle}
\let\textdenominator\textde
-\DeclareTextFontCommand{\textinf}{\instyle}
+\DeclareTextFontCommand{\textinf}{\infstyle}
\let\textinferior\textinf
+ \let\textsub\textinf
\newdimen\zpl@sixem\zpl@sixem6pt % for checking if a number refers to ex
\newdimen\zpl@y \newdimen\zpl@x
@@ -650,12 +695,6 @@
\fi
\setmainfont
[ Numbers = {\zpl@figurealign,\zpl@figurestyle},
- UprightFont = *-Regular ,
- ItalicFont = *-Italic ,
- SlantedFont = *-Slanted ,
- BoldFont = *-Bold ,
- BoldItalicFont = *-BoldItalic ,
- BoldSlantedFont= *-BoldSlanted ,
] {\zpl@base}
\let\zpl@sty\zpl@figurestyle
\if l\zpl@thmlin\def\zpl@sty{Lining}\fi
@@ -669,22 +708,22 @@
\else % type1
\ifzpl@lining
- \def\zpl@figurestyle{LF}
+ \def\zpl@figurestyle{lf}
\else
- \def\zpl@figurestyle{OsF}
+ \def\zpl@figurestyle{osf}
\fi
\ifzpl@tabular
- \def\zpl@figurealign{T}
+ \def\zpl@figurealign{t}
\else
\def\zpl@figurealign{}
\fi
\renewcommand*{\rmdefault}{zpl\zpl@figurealign%
\zpl@figurestyle}
- \ifzpl@scosf %
- \DeclareRobustCommand{\textsc}[1]{%
- {\fontfamily{zpl\zpl@figurealign OsF}\scshape\selectfont #1}%
- }\fi% use OsF in small caps
+ %\ifzpl@scosf %
+ %\DeclareRobustCommand{\textsc}[1]{%
+ %{\fontfamily{zpl\zpl@figurealign osf}\scshape\selectfont #1}%
+ %}\fi% use osf in small caps
\def\zpl@thfigurestyle{\zpl@figurestyle}
\ifx\zpl@figurestyle\zpl@dfltfigurestyle
@@ -697,7 +736,6 @@
\fi % type1
% both
\ifzpl@KOMA
- %\let\textsuperscript\textsu
\@ifpackageloaded{AB@authnote}{%
\renewcommand\AB@authnote[1]{\textsu{#1}}
\renewcommand\AB@affilnote[1]{\textsu{#1}}
@@ -726,9 +764,9 @@
\DeclareTextFontCommand{%
\oldstylenums}{\fontfamily{zpl\zpl@figurealign OsF}\selectfont }
\DeclareTextFontCommand{%
- \liningnums}{\fontfamily{zpl\zpl@figurealign LF}\selectfont }
+ \liningnums}{\fontfamily{zpl\zpl@figurealign lf}\selectfont }
\DeclareTextFontCommand{%
- \tabularnums}{\fontfamily{zplT\zpl@figurestyle}\selectfont }
+ \tabularnums}{\fontfamily{zplt\zpl@figurestyle}\selectfont }
\DeclareTextFontCommand{%
\proportionalnums}{\fontfamily{zpl\zpl@figurestyle}\selectfont }
\re@DeclareTextSymbol{\textdollar}{OT1}{36}
diff --git a/fonts/newpx/tex/newpxtext1.sty b/fonts/newpx/tex/newpxtext1.sty
new file mode 100644
index 0000000000..2dda973cb8
--- /dev/null
+++ b/fonts/newpx/tex/newpxtext1.sty
@@ -0,0 +1,766 @@
+\NeedsTeXFormat{LaTeX2e}
+
+% Based originally on Young Ryu's pxfonts.sty, v.1.1.1
+%
+% Changes from original pxfonts.sty by Michael Sharpe, msharpe at ucsd dot edu;
+% Text and math versions now separate.
+% Added scaled keyword and osf option;
+% Text is now directed to an extension of TeXGyrePagella rather than ppl.
+% 1.5 is the first version of newpxtext to support both [pdf]latex and unicode latex.
+
+\def\fileversion{1.523}
+\def\filedate{2023/09/28}
+\ProvidesPackage{newpxtext}[%
+\filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for TeXGyrePagellaX]
+
+\message{`newpxtext' v\fileversion, \filedate\space Text macros taking advantage of TeXGyre Pagella and its extensions (msharpe)}
+
+\RequirePackage[T1]{fontenc}
+\renewcommand*{\rmdefault}{zplTLF} % the default until end of preamble
+\renewcommand*{\familydefault}{\rmdefault}
+\RequirePackage{xpatch} % need to patch \scshape
+\RequirePackage{iftex,xkeyval,etoolbox,textcomp}
+\RequirePackage{xstring,ifthen,scalefnt} % for \textfrac
+\IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
+\DeclareEncodingSubset{TS1}{zpl*}{0}
+
+%KOMA check
+\newif\ifzpl@KOMA
+\@ifundefined{KOMAClassName}{}{\zpl@KOMAtrue}
+\@ifundefined{ver@scrextend.sty}{}{\zpl@KOMAtrue}
+\newif\ifzpl@LTX
+\@ifclassloaded{article}{\zpl@LTXtrue}{}
+\@ifclassloaded{report}{\zpl@LTXtrue}{}
+\@ifclassloaded{book}{\zpl@LTXtrue}{}
+
+% Engine check
+\newif\ifzpl@otf
+\iftutex\zpl@otftrue
+%\else % [pdf]LaTeX
+% \zpl@otffalse
+\fi
+\def\zpl@divide#1#2{\strip@pt\dimexpr 1pt * (\dimexpr #1pt\relax) / \dimexpr #2pt\relax\relax}
+%%%%%%%%%%%%%%%%%%
+\IfFileExists{xkeyval.sty}{
+ \RequirePackage{xkeyval}
+ }{
+ \let\DeclareOptionX\DeclareOption
+ \let\ExecuteOptionsX\ExecuteOptions
+ \let\ProcessOptionsX\ProcessOptions
+}
+%%%% Start Options
+\newif\ifzpl@nomath\zpl@nomathfalse % load fontspec with no-math
+\newif\ifzpl@lining\zpl@liningtrue
+\newif\ifzpl@tabular\zpl@tabulartrue % default is tabular lining figures
+\@ifundefined{ver@newpxmath.sty}{}{\zpl@nomathtrue}
+
+\DeclareOptionX{type1}[true]{%
+%\@nameuse{if#1}\zpl@otffalse\fi
+}
+\DeclareOptionX{nofontspec}[true]{%
+%\@nameuse{if#1}\zpl@otffalse\fi
+}
+\DeclareOptionX{no-math}[true]{%
+\@nameuse{if#1}\zpl@nomathtrue\fi
+}
+
+\def\zpl@defaultfeatures{}
+\DeclareOptionX{defaultfeatures}{\def\zpl@defaultfeatures{#1}}
+
+%Figure style options
+\edef\zpl@dfltfigurestyle{lf}
+\edef\zpl@dfltfigurealign{t}
+
+\DeclareOptionX{lining}[true]{%
+\@nameuse{zpl@lining#1}
+}
+\DeclareOptionX{lf}[true]{%
+\@nameuse{zpl@lining#1}
+}
+\DeclareOptionX{oldstyle}[true]{%
+\@nameuse{if#1}%
+ \zpl@liningfalse
+\else
+ \zpl@liningtrue
+\fi
+}
+\DeclareOptionX{osf}[true]{%
+\@nameuse{if#1}%
+ \zpl@liningfalse
+\else
+ \zpl@liningtrue
+\fi
+}
+\DeclareOptionX{tabular}[true]{%
+\@nameuse{zpl@tabular#1}
+}
+\DeclareOptionX{t}[true]{%
+\@nameuse{zpl@tabular#1}
+}
+\DeclareOptionX{proportional}[true]{%
+\@nameuse{if#1}%
+ \zpl@tabularfalse
+\else
+ \zpl@tabulartrue
+\fi
+}
+\DeclareOptionX{p}[true]{%
+\@nameuse{if#1}%
+ \zpl@tabularfalse
+\else
+ \zpl@tabulartrue
+\fi
+}
+
+%Scale
+\providecommand{\zpl@scale}{1} % actual scaled command in \zpl@scaled
+\DeclareOptionX{scale}{\def\zpl@scale{#1}}
+\DeclareOptionX{scaled}{\def\zpl@scale{#1}}
+
+\newif\ifzpl@defaultsups
+%\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 % default is to load helvetica as sans serif font
+\newif\ifzpl@thrm
+\newif\ifzpl@sl
+% new sups options
+\newdimen\zplsups@scale
+\newdimen\zplsups@raise
+\def\zplsups@raised{\z@}
+\def\zplsups@Lspaced{.04em}
+\def\zplsups@Rspaced{.04em}
+\def\zplsups@scaledval{1.0}
+\def\zplsups@supscale{1.0}
+\DeclareOptionX{supscaled}{\renewcommand*{\zplsups@scaledval}{#1}}
+\DeclareOptionX{supscale}{\renewcommand*{\zplsups@scaledval}{#1}}
+\DeclareOptionX{supsraised}{\renewcommand*{\zplsups@raised}{#1}}
+\DeclareOptionX{supLspaced}{\renewcommand*{\zplsups@Lspaced}{#1}}
+\DeclareOptionX{supRspaced}{\renewcommand*{\zplsups@Rspaced}{#1}}
+
+% Other options
+\DeclareOptionX{defaultsups}[true]{%
+\@nameuse{zpl@defaultsups#1}
+}
+\DeclareOptionX{babel}[true]{%
+\@nameuse{zpl@babel#1}% for backward compatibility
+}
+\DeclareOptionX{largesc}[true]{%
+\@nameuse{zpl@largesc#1}
+}
+\DeclareOptionX{nohelv}[true]{%
+\@nameuse{if#1}\zpl@helvfalse\fi}%
+
+\def\zpl@helvratio{.94}
+\DeclareOptionX{helvratio}[0.94]{%
+\def\zpl@helvratio{#1}
+}
+\def\zpl@spcmag{1}
+\def\zpl@spc{.25em}
+\def\zpl@stretch{.2em}
+\def\zpl@shrink{.1em}
+\def\zpl@nospc{T}
+
+\DeclareOptionX{spcfactor}{%
+\def\zpl@spcmag{#1}\def\zpl@nospc{F}
+}
+\DeclareOptionX{spacing}{%
+\def\zpl@spc{#1}
+}
+\DeclareOptionX{stretch}{%
+\def\zpl@stretch{#1}
+}
+\DeclareOptionX{shrink}{%
+\def\zpl@shrink{#1}
+}
+\newcount\zpl@cnt \zpl@cnt=0
+\newif\ifzpl@zeroslash
+\newif\ifzpl@notextnu
+\def\zpl@thmlin{X} % default is to not change to lining
+\def\zpl@noti{T}\def\zpl@nolo{T}
+\DeclareOptionX{oldSS}{\advance\zpl@cnt 32 }
+\DeclareOptionX{notextnu}{\zpl@notextnutrue}
+\DeclareOptionX{slashedzero}{\zpl@zeroslashtrue}
+\DeclareOptionX{theoremfont}{\zpl@thrmtrue }
+\DeclareOptionX{thmlining}{\edef\zpl@thmlin{l}}
+\DeclareOptionX{trueslanted}{\zpl@sltrue}
+\DeclareOptionX{scosf}{\zpl@scosftrue}
+\DeclareOptionX{tighter}{%
+\gdef\zpl@spc{.25em}\gdef\zpl@stretch{.125em}%
+\gdef\zpl@shrink{.1em}\def\zpl@noti{F}}
+\DeclareOptionX{looser}{%
+\gdef\zpl@spc{.3em}\gdef\zpl@stretch{.2em}%
+\gdef\zpl@shrink{.1em}\def\zpl@nolo{F}}
+
+\DeclareOptionX{sfracvcenter}{%
+\def\zpl@sfrVC{#1}}
+\DeclareOptionX{sfracvspacing}{%
+\def\zpl@sfrVS{#1}}
+\DeclareOptionX{sfracbarthick}{%
+\def\zpl@sfrTH{#1}}
+\DeclareOptionX{sfracscaling}{%
+\def\zpl@sfrSC{#1}}
+
+\ProcessOptionsX\relax
+
+\setlength{\zplsups@raise}{\zplsups@raised}
+\setlength{\zplsups@scale}{\zplsups@scaledval\p@}
+\zplsups@scale=\zpl@scale\zplsups@scale %
+\def\zplsups@scaled{s*[\strip@pt\zplsups@scale]}
+% for stacked fractions
+\@ifundefined{zpl@xht}{\def\zpl@xht{460}}{} % lowercase letters
+\@ifundefined{zpl@deht}{\def\zpl@deht{412}}{} % denominator figures ht
+\@ifundefined{zpl@nubase}{\def\zpl@nubase{270}}{} % baseline of numerators
+\@ifundefined{zpl@debase}{\def\zpl@debase{0}}{} % baseline of denoms
+\@ifundefined{zpl@sfrVC}{\def\zpl@sfrVC{335}}{}% vertical center of sfrac
+\@ifundefined{zpl@sfrVS}{\def\zpl@sfrVS{106}}{} % space above/below bar
+\@ifundefined{zpl@sfrTH}{\def\zpl@sfrTH{52}}{} % bar thickness
+\@ifundefined{zpl@sfrSC}{\def\zpl@sfrSC{.9}}{} % scale defigures by this
+
+\def\re@DeclareTextSymbol#1#2#3{%
+ \let#1=\undefined
+ \DeclareTextSymbol{#1}{#2}{#3}}
+
+\ifzpl@otf
+ \ifzpl@nomath
+ \RequirePackage[no-math]{fontspec}
+ \else
+ \RequirePackage{fontspec}
+ \fi
+
+ %\ifxetex\XeTeXtracingfonts=1\fi % causing unwanted warnings in Tectonic system
+
+ \ifluatex % avoid possibly uncorrected "system" fonts
+ \directlua{fonts.names.set_location_precedence{
+ "local", "texmf", "system" }}
+ \fi
+ \def\zpl@base{TeXGyrePagellaX}
+ \ifzpl@scosf
+ \AtBeginDocument{%
+ \xpretocmd{\scshape}
+ {\addfontfeatures{Numbers=OldStyle}}
+ {}{}%
+ }%
+ \fi
+
+
+ \newcommand{\textfrac}[3][]{{%\normalfont%
+\mbox{%
+ \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
+ {{\lfstyle#1}\kern.1em}{}%
+\addfontfeatures{RawFeature=+numr}#2\char"2044% numerator
+\addfontfeatures{RawFeature=-numr;+dnom;+ss20}\char"2044{}#3%
+}}}
+
+\else % type1
+ \ifzpl@scosf
+ \AtBeginDocument{%
+ \xpretocmd{\scshape}
+ {\fontfamily{zpl\zpl@figurealign osf}}
+ {}{}%
+ }%
+ \fi%
+% for possible use in footnote markers
+% \DeclareFontFamily{OT1}{zplsups}{}%
+% \DeclareFontShape{OT1}{zplsups}{m}{n}{%
+% <-> \zplsups@scaled zplsups-Regular-ot1
+%}{}
+% \DeclareFontFamily{T1}{zplsups}{}%
+% \DeclareFontShape{T1}{zsups}{m}{n}{%
+% <-> \zplsups@scaled zplsups-Regular-t1
+%}{}
+% \DeclareFontFamily{TS1}{zsups}{}%
+% \DeclareFontShape{TS1}{zsups}{m}{n}{%
+% <-> \zplsups@scaled zplsups-Regular-ts1
+%}{}
+\DeclareRobustCommand{\supstyle}{%
+ \not@math@alphabet\supstyle\relax
+ \usefont{\f@encoding}{zplsups}{m}{n}}
+
+\ifdim\zplsups@raise=\z@
+ \DeclareRobustCommand{\textsups}[1]{{\supstyle#1}}
+\else
+ \DeclareRobustCommand{\textsups}[1]{%
+ \raisebox{\zplsups@raise}{\hbox{{\supstyle#1}}}}
+\fi
+
+\RequirePackage{fontaxes}
+ \fa@naming@exception{figures}{{superior}{proportional}}{sups}
+ \fa@naming@exception{figures}{{superior}{tabular}}{sups}
+% \def\sufigures{\@nomath\sufigures
+% \fontfigurestyle{superior}\selectfont}
+% \let\sustyle=\sufigures
+% \DeclareTextFontCommand{\textsu}{\sufigures}
+% \let\textsuperior\textsu
+ \DeclareRobustCommand{\sustyle}{%
+ \not@math@alphabet\sustyle\relax
+ \fontfamily{zplsups}\selectfont}
+ \let\sufigures=\sustyle
+ \let\nustyle=\sustyle
+ \let\nufigures=\sustyle
+
+ \fa@naming@exception{figures}{{inferior}{proportional}}{inf}
+ \fa@naming@exception{figures}{{inferior}{tabular}}{inf}
+% \def\infigures{\@nomath\infigures
+% \fontfigurestyle{inferior}\selectfont}
+% \let\instyle=\infigures
+% \DeclareTextFontCommand{\textinf}{\infigures}
+% \let\textinferior\textinf
+ \DeclareRobustCommand{\instyle}{%
+ \not@math@alphabet\instyle\relax
+ \fontfamily{zplsubs}\selectfont}
+ \let\infigures=\instyle
+
+ \fa@naming@exception{figures}{{denominators}{proportional}}{dnom}
+ \fa@naming@exception{figures}{{denominators}{tabular}}{dnom}
+% \def\defigures{\@nomath\defigures
+% \fontfamily{defigures}\selectfont}
+% \DeclareTextFontCommand{\textde}{\defigures}
+% \let\textdenominators\textde
+ \DeclareRobustCommand{\destyle}{%
+ \not@math@alphabet\destyle\relax
+ \fontfamily{zpldnom}\selectfont}
+ \let\defigures=\destyle
+
+ \fa@naming@exception{figures}{{numerators}{proportional}}{numr}
+ \fa@naming@exception{figures}{{numerators}{tabular}}{numr}
+% \def\defigures{\@nomath\nufigures
+% \fontfigurestyle{numerators}\selectfont}
+% \let\nustyle=\nufigures
+% \DeclareTextFontCommand{\textnu}{\nufigures}
+% \let\textnumerators\textnu
+ \DeclareRobustCommand{\nustyle}{%
+ \not@math@alphabet\nustyle\relax
+ \fontfamily{zplnumr}\selectfont}
+ \let\nufigures=\nustyle
+
+\newcommand{\textfrac}[3][]{% like \textfrac[1]{7}{8}
+ \mbox{%
+ \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
+ {\textlf{#1}\kern.1em}{}%
+ {\nustyle#2}% numerator
+ \StrRight{#2}{1}[\@digit@]%
+ % look for 1, 2, 6, 7
+ \ifcase\@digit@% 0
+ \or%\kern.03em% 1
+ \or\kern.04em% 2
+ \or%\kern-.01em% 3
+ \or%\kern.02em% 4
+ \or%\kern.01em% 5
+ \or\kern.01em% 6
+ \or\kern-.11em% 7
+ \or%\kern-.11em% 8
+ \or\kern-.02em% 9
+ \fi%
+% \kern\zpl@foresolidus{\fontencoding{TS1}\selectfont\char"2F}%
+% \kern\zpl@aftsolidus%
+ {\fontencoding{TS1}\selectfont\char"2F}%
+ \StrLeft{#3}{1}[\@digit@]%
+ % look for 1, 4, 7
+ \ifcase\@digit@% 0
+ \or%\kern -.02em% 1
+ \or% 2
+ \or% 3
+ \or\kern -.05em% 4
+ \or% 5
+ \or\kern-.02em% 6
+ \or\kern .01em% 7
+ \fi%
+ {\destyle #3}% denominator [#3]
+ }%mbox
+} % textfrac
+\fi
+
+\let\orig@footnote=\thefootnote
+\let\orig@makefnmark=\@makefnmark
+\def\bfseries@rm{b}
+\def\mdseries@rm{m}
+\def\useosf{\zpl@liningfalse}
+\@onlypreamble\useosf
+\def\useproportional{\zpl@tabularfalse}
+\@onlypreamble\useproportional
+
+\ifzpl@otf
+ \def\zpl@dflt{}
+ \ifzpl@zeroslash\edef\zpl@dflt{Numbers = SlashedZero ,
+ }\fi
+ \if T\zpl@nospc
+ \if F\zpl@noti\def\zpl@spcmag{{1,.625,1}}\def\zpl@nospc{F}\fi
+ \if F\zpl@nolo\def\zpl@spcmag{{1.2,1,1}}\def\zpl@nospc{F}\fi
+ \fi
+ \if F\zpl@nospc
+ \edef\zpl@dflt{\zpl@dflt WordSpace = \zpl@spcmag ,
+ }
+ \fi
+ \def\zpl@scraw{pcap}\def\zpl@scrawN{smcp}
+ \ifzpl@largesc\def\zpl@scraw{smcp}\def\zpl@scrawN{pcap}\fi
+
+ %\zpl@cnt will be 0..2^8-1
+ \edef\zpl@lst{}
+ \ifnum\zpl@cnt>127 \edef\zpl@lst{8}\advance\zpl@cnt -128 \fi
+ \ifnum\zpl@cnt>63 \edef\zpl@lst{7,\zpl@lst}\advance\zpl@cnt -64 \fi
+ \ifnum\zpl@cnt>31 \edef\zpl@lst{6,\zpl@lst}\advance\zpl@cnt -32 \fi
+ \ifnum\zpl@cnt>15 \edef\zpl@lst{5,\zpl@lst}\advance\zpl@cnt -16 \fi
+ \ifnum\zpl@cnt>7 \edef\zpl@lst{4,\zpl@lst}\advance\zpl@cnt -8 \fi
+ \ifnum\zpl@cnt>3 \edef\zpl@lst{3,\zpl@lst}\advance\zpl@cnt -4 \fi
+ \ifnum\zpl@cnt>1 \edef\zpl@lst{2,\zpl@lst}\advance\zpl@cnt -2 \fi
+ \ifnum\zpl@cnt>0 \edef\zpl@lst{1,\zpl@lst}\fi
+ \ifthenelse{\not\equal{\zpl@lst}{}}
+ {\edef\zpl@dflt{\zpl@dflt StylisticSet={\zpl@lst} ,
+ }}{}
+
+ \defaultfontfeatures{
+ Ligatures = TeX ,
+ Scale = \zpl@scale ,
+ Extension = .otf ,
+ SmallCapsFeatures={\ifzpl@scosf Numbers = OldStyle ,
+ \fi RawFeature = -\zpl@scrawN;+\zpl@scraw }
+ \ifluatex Renderer=Basic\fi ,
+ \zpl@dflt ,
+ RawFeature=-ss05 ,
+ \zpl@defaultfeatures
+ }
+
+\else % type1
+ \def\zpl@spacing{%
+ \fontdimen2\font=\zpl@spc
+ \fontdimen3\font=\zpl@stretch
+ \fontdimen4\font=\zpl@shrink}
+ \@tempdima=\zpl@scale\p@\@tempdima=\zpl@helvratio\@tempdima%
+ \edef\qhv@scale{\strip@pt\@tempdima}
+ \def\zpl@scaled{s*[\zpl@scale]}% used in fd files
+
+
+ \DeclareRobustCommand{\lfstyle}{%
+ \not@math@alphabet\lfstyle\relax
+ \fontfamily{zplLF}\selectfont %
+ }
+ \DeclareRobustCommand{\tlfstyle}{%
+ \not@math@alphabet\tlfstyle\relax
+ \fontfamily{zplTLF}\selectfont %
+ }
+ \DeclareRobustCommand{\osfstyle}{%
+ \not@math@alphabet\osfstyle\relax
+ \fontfamily{zplOsF}\selectfont %
+ }
+ \DeclareRobustCommand{\tosfstyle}{%
+ \not@math@alphabet\tosfstyle\relax
+ \fontfamily{zplTOsF}\selectfont %
+ }
+ \ifzpl@defaultsups %
+ \else
+ \ExplSyntaxOn
+ \DeclareDocumentCommand \fakesuperscript {m} {
+ \@textsuperscript{\selectfont#1}
+ }
+ \RenewDocumentCommand \textsuperscript {s} {
+ \IfBooleanTF #1 \fakesuperscript \realsuperscript
+ }
+ \DeclareDocumentCommand \realsuperscript {m} {
+ \ifzpl@defaultsups\fakesuperscript{#1}
+ \else\hspace*{\zplsups@Lspaced}\textsups{#1}\hspace*{\zplsups@Rspaced}\fi
+ }
+
+ \cs_set:Npn \@makefnmark {
+ \mbox{%
+ \footnotemarkfont\textsuperscript{\@thefnmark}}
+ }
+ \cs_if_exist:NTF \ftntm@font
+ {
+ \cs_new:Npn \footnotemarkfont {\normalfont \ftntm@font}
+ }
+ {
+ \cs_new:Npn \footnotemarkfont {\normalfont}
+ }
+ \ExplSyntaxOff
+ \fi
+% \ifzpl@KOMA
+% \let\textsuperscript\sustyle
+% \setkomafont{footnotelabel}{\textsuperscript}
+% \setkomafont{footnotereference}{\textsuperscript}
+% \else % NOT KOMA
+% \def\f@@tn@te{footnote}
+% \def\@makefnmark{%
+% \ifx\@mpfn\f@@tn@te%
+% \ifx\thefootnote\orig@footnote%
+% \hbox{\sustyle\hspace*{.05em}\@thefnmark\hspace*{.05em}}%
+% \else%
+% \orig@makefnmark%
+% \fi
+% \else%
+% \orig@makefnmark%
+% \fi}%
+% \fi
+% \fi
+ \ifzpl@helv\renewcommand*{\sfdefault}{qhv}\fi
+ \renewcommand*{\ttdefault}{npxtt}
+ \DeclareRobustCommand\thfamily % new family for theorem font
+ {\not@math@alphabet\thfamily\relax
+ \fontfamily\thdefault\selectfont}
+ \DeclareRobustCommand{\textth}[1]{%
+ {\thfamily #1}%
+ }
+ \let\textthit\textth
+
+\fi % type1
+
+\ifzpl@thrm
+ %\RequirePackage{amsmath,amsthm} % in case of theoremfont
+ \ifdefined\newtheoremstyle %amsthm and ntheorem, not theorem.sty
+ \@ifpackageloaded{ntheorem}\relax{%
+ \newtheoremstyle{plain}
+ {\medskipamount} % ABOVESPACE, was \topsep
+ {\medskipamount} % BELOWSPACE, was \topsep
+ {\thfamily} % BODYFONT--\thfamily is italic with upright figures and punctuation
+ {} % INDENT (empty value is the same as 0pt)
+ {\bfseries} % HEADFONT--you may want to add \tlfstyle so the number is tab lining, regardless of text figure selection
+ {.} % HEADPUNCT
+ {5pt plus 1pt minus 1pt} % HEADSPACE
+ {} % CUSTOM-HEAD-SPEC\newtheorem{thm}{Theorem}[section]
+ } % end @ifpackageloaded
+ \fi%
+\fi%}
+
+\ifzpl@otf
+ \DeclareTextFontCommand{\textsl}{\slshape}
+ \DeclareTextFontCommand{%
+ \osfstyle}{\addfontfeatures{Numbers={Proportional,OldStyle}}}
+ \DeclareTextFontCommand{%
+ \tosfstyle}{\addfontfeatures{Numbers={Tabular,OldStyle}}}
+ \DeclareTextFontCommand{%
+ \tlfstyle}{\addfontfeatures{Numbers={Tabular,Lining}}}
+ \DeclareTextFontCommand{%
+ \lfstyle}{\addfontfeatures{Numbers={Proportional,Lining}}}
+
+ \DeclareRobustCommand{\destyle}{%
+ \not@math@alphabet\destyle\relax
+ \addfontfeatures{VerticalPosition=Denominator}%
+ }
+ \DeclareRobustCommand{\nustyle}{%
+ \not@math@alphabet\nustyle\relax
+ \addfontfeatures{VerticalPosition=Numerator}%
+ }
+ \DeclareRobustCommand{\sustyle}{%
+ \not@math@alphabet\sustyle\relax
+ \addfontfeatures{VerticalPosition=Superior}%
+ }
+ \DeclareRobustCommand{\infstyle}{%
+ \not@math@alphabet\infstyle\relax
+ \addfontfeatures{VerticalPosition=Inferior}%
+ }
+
+ \let\sufigures\sustyle
+ \let\nufigures\nustyle
+ \let\infigures\infstyle
+ \let\defigures\destyle
+
+ \ifzpl@defaultsups %
+ \else
+ \RequirePackage{realscripts}
+ \renewcommand\footnotemarkfont{\normalfont\sufigures}
+ \fi
+ \ifzpl@KOMA
+ \setkomafont{footnotereference}{\normalfont\sustyle}
+ \setkomafont{footnotelabel}{\normalfont\sustyle}
+ \fi
+
+ \renewcommand*{\textcircled}[1]{\hmode@bgroup\ooalign{%
+ \hfil \raise -.255ex\hbox{{%
+ \normalfont\addfontfeatures{Numbers={Monospaced, Lining}}%
+ \scalefont{.8}{\sustyle#1}}}% end hbox
+ \hfil \crcr \symbol{"25EF}}%
+ \egroup}
+\else % type1
+ \renewcommand*{\textcircled}[1]{\hmode@bgroup\ooalign{%
+ \hfil \raise -.15ex\hbox{{%
+ \normalfont
+ {\scalefont{.8}\sustyle#1}}}% end hbox
+ \hfil \crcr \textbigcircle}%
+ \egroup}
+\fi
+
+% applies to both
+\DeclareRobustCommand{\textlf}[1]{%
+ {\lfstyle #1}%
+}
+\DeclareRobustCommand{\texttlf}[1]{%
+ {\tlfstyle #1}%
+}
+\DeclareRobustCommand{\textosf}[1]{%
+ {\osfstyle #1}%
+}
+\DeclareRobustCommand{\texttosf}[1]{%
+ {\tosfstyle #1}%
+}
+%\DeclareRobustCommand{\textsu}[1]{%
+% {\sustyle #1}%
+%}
+\DeclareTextFontCommand{\textsu}{\sustyle}
+ %\let\textsuperior\textsu
+\let\textsup\textsu
+ \let\textsups\textsu
+\DeclareTextFontCommand{\textnumerator}{\nustyle}
+ \ifzpl@notextnu\else\let\textnu=\textnumerator\fi
+ \let\textnum\textnumerator
+\DeclareTextFontCommand{\textde}{\destyle}
+ \let\textdenominator\textde
+\DeclareTextFontCommand{\textinf}{\instyle}
+ \let\textinferior\textinf
+
+\newdimen\zpl@sixem\zpl@sixem6pt % for checking if a number refers to ex
+\newdimen\zpl@y \newdimen\zpl@x
+
+% convert numerical entry that may be multiple of ex (<6) or em value
+\def\zpl@toex#1{\zpl@x#1pt \ifdim\zpl@x<\z@\zpl@y-\zpl@x\else\zpl@y\zpl@x\fi \ifdim\zpl@y>\zpl@sixem \zpl@x\dimexpr
+ 1pt * (\dimexpr #1pt\relax) / \dimexpr \zpl@xht pt\relax\relax\fi}
+
+\newdimen\zpl@tmpdima \newdimen\zpl@tmpdimb \newdimen\zpl@tmpdimc
+\newdimen\zpl@tmpdimd \newdimen\zpl@tmpdime \newdimen\zpl@tmpdimf
+\newdimen\zpl@dimA
+\newdimen\zpl@dimAA \newdimen\zpl@dimB \newdimen\zpl@dimBB
+\newdimen\zpl@dimC % vertical center
+% double cap letters for below bar, single cap for above
+
+\zpl@toex\zpl@sfrVC\zpl@dimC\zpl@x %Vertical center of fraction
+\zpl@toex\zpl@sfrTH\zpl@tmpdimb\zpl@x % bar thickness
+\zpl@tmpdime.5\zpl@tmpdimb % half bar thickness
+\zpl@toex\zpl@sfrVS\zpl@tmpdimc\zpl@x% vertical space
+\zpl@toex\zpl@deht\zpl@tmpdimd\zpl@x % height of unscaled figures
+\zpl@tmpdimd\zpl@sfrSC\zpl@tmpdimd % height of scaled figures
+\zpl@toex\zpl@debase\zpl@tmpdimf\zpl@x % unscaled baseline of de figures
+\zpl@toex\zpl@nubase\zpl@tmpdima\zpl@x % unscaled baseline of nu figures
+\zpl@tmpdima\zpl@sfrSC\zpl@tmpdima % scaled nu baseline
+\zpl@tmpdimf\zpl@sfrSC\zpl@tmpdimf % scaled de baseline
+\zpl@dimA\zpl@dimC
+\advance\zpl@dimA by \zpl@tmpdime % top of bar
+\zpl@dimAA\zpl@dimC
+\advance\zpl@dimAA by -\zpl@tmpdime % bottom of bar
+\zpl@dimB\zpl@dimA
+\advance\zpl@dimB by \zpl@tmpdimc % top figure baseline
+\advance\zpl@dimB by -\zpl@tmpdima
+\zpl@dimBB\zpl@dimAA
+\advance\zpl@dimBB by -\zpl@tmpdimc %
+\advance\zpl@dimBB by -\zpl@tmpdimd % bottom figure baseline
+\advance\zpl@dimBB by -\zpl@tmpdimf
+\newcommand*{\textsfrac}[3][]{% like \textsfrac[1]{23}{34}
+\mbox{%
+ \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
+ {\textlf{#1}\kern.12em}{}%
+ {\hmode@bgroup%
+\ooalign{%
+ \setbox0=\hbox{\scalefont{\zpl@sfrSC}\nustyle#2}%
+ \hfil \raise\strip@pt\zpl@dimB ex\box0\hfil \crcr%
+ \leaders\hrule height \strip@pt\zpl@dimA ex depth -\strip@pt\zpl@dimAA ex\hfill \crcr%
+ \setbox1=\hbox{\scalefont{\zpl@sfrSC}\destyle#3}%
+ \hfil\raise\strip@pt\zpl@dimBB ex\box1\hfil}%
+\egroup}}
+}
+
+\AtEndPreamble{%
+\ifzpl@otf
+ \ifzpl@lining
+ \def\zpl@figurestyle{Lining}
+ \else
+ \def\zpl@figurestyle{OldStyle}
+ \fi
+ \ifzpl@tabular
+ \def\zpl@figurealign{Monospaced}
+ \else
+ \def\zpl@figurealign{Proportional}
+ \fi
+% \ifzpl@scosf
+% %\traceon
+% \setmainfont
+% [Numbers = {\zpl@figurealign,\zpl@figurestyle},
+% SmallCapsFeatures = { Letters=SmallCaps , Numbers = OldStyle }
+% ] {\zpl@base}
+%% \traceoff
+% \else
+% \setmainfont
+% [Numbers = {\zpl@figurealign,\zpl@figurestyle}
+% SmallCapsFeatures = { Letters=SmallCaps , }
+% ] {\zpl@base}
+% \fi
+ \setmainfont
+ [Numbers = {Proportional , Lining },
+ SmallCapsFeatures = { Letters = SmallCaps , Numbers = OldStyle }
+ ] {TeXGyrePagellaX}
+
+
+% \let\zpl@sty\zpl@figurestyle
+% \if l\zpl@thmlin\def\zpl@sty{Lining}\fi
+% \newcommand{\thfamily}%{\@nameuse{zpl\zpl@figurestyle}%
+% {\addfontfeatures{%
+% Numbers={\zpl@figurealign,\zpl@sty} ,
+% RawFeature=+ss05}
+% \itshape} % for theorems
+% \ifzpl@sl\else\let\slshape=\thfamily\fi % change
+
+\else % type1
+ \ifzpl@lining
+ \def\zpl@figurestyle{lf}
+ \else
+ \def\zpl@figurestyle{osf}
+ \fi
+ \ifzpl@tabular
+ \def\zpl@figurealign{t}
+ \else
+ \def\zpl@figurealign{}
+ \fi
+
+ \renewcommand*{\rmdefault}{zpl\zpl@figurealign%
+ \zpl@figurestyle}
+ \let\familydefault\rmdefault
+
+ % use OsF in small caps
+
+ \def\zpl@thfigurestyle{\zpl@figurestyle}
+ \ifx\zpl@figurestyle\zpl@dfltfigurestyle
+ \def\zpl@thfigurestyle{tlf}
+ \else
+ \def\zpl@thfigurestyle{osf}
+ \fi % there just two possible figure styles for the theorem font
+ \newcommand*{\thdefault}{zplth-\zpl@thfigurestyle}
+ \normalfont
+\fi % type1
+% both
+\ifzpl@KOMA
+ %\let\textsuperscript\textsu
+ \@ifpackageloaded{AB@authnote}{%
+ \renewcommand\AB@authnote[1]{\textsu{#1}}
+ \renewcommand\AB@affilnote[1]{\textsu{#1}}
+ }
+\fi
+%both
+\ifzpl@thrm
+ \@ifundefined{theoremstyle}{}{
+ \theoremstyle{plain}
+ \patchcmd{\th@plain}{\itshape}{\thfamily}{\message{Replaced itshape by thfamily in theorem style plain.}}{\message{Unable to replace itshape by thfamily in theorem style plain.}}
+}
+\fi
+}
+
+% Define \oldstylenums, \liningnums ,\tabularnums and \proportionalnums
+\ifzpl@otf
+ \DeclareTextFontCommand{%
+ \oldstylenums}{\addfontfeatures{Numbers=OldStyle}}
+ \DeclareTextFontCommand{%
+ \liningnums}{\addfontfeatures{Numbers=Lining}}
+ \DeclareTextFontCommand{%
+ \tabularnums}{\addfontfeatures{Numbers=Tabular}}
+ \DeclareTextFontCommand{%
+ \proportionalnums}{\addfontfeatures{Numbers=Proportional}}
+\else % type1
+ \DeclareTextFontCommand{%
+ \oldstylenums}{\fontfamily{zpl\zpl@figurealign OsF}\selectfont }
+ \DeclareTextFontCommand{%
+ \liningnums}{\fontfamily{zpl\zpl@figurealign LF}\selectfont }
+ \DeclareTextFontCommand{%
+ \tabularnums}{\fontfamily{zplT\zpl@figurestyle}\selectfont }
+ \DeclareTextFontCommand{%
+ \proportionalnums}{\fontfamily{zpl\zpl@figurestyle}\selectfont }
+ \re@DeclareTextSymbol{\textdollar}{OT1}{36}
+\fi
+
+\endinput
+
diff --git a/fonts/newpx/tex/newpxtextX.sty b/fonts/newpx/tex/newpxtextX.sty
new file mode 100644
index 0000000000..b2f46f3c67
--- /dev/null
+++ b/fonts/newpx/tex/newpxtextX.sty
@@ -0,0 +1,506 @@
+\NeedsTeXFormat{LaTeX2e}
+
+% Based originally on Young Ryu's pxfonts.sty, v.1.1.1
+%
+% Changes from original pxfonts.sty by Michael Sharpe, msharpe at ucsd dot edu;
+% Text and math versions now separate.
+% Added scaled keyword and osf option;
+% Text is now directed to an extension of TeXGyrePagella rather than ppl.
+% 1.5 is the first version of newpxtext to support both [pdf]latex and unicode latex.
+
+\def\fileversion{1.523X}
+\def\filedate{2023/10/02}
+\ProvidesPackage{newpxtextX}[%
+\filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for TeXGyrePagellaX]
+
+\message{`newpxtextX' v\fileversion, \filedate\space Text macros taking advantage of TeXGyre Pagella and its extensions (msharpe)}
+
+\RequirePackage[T1]{fontenc}
+
+\RequirePackage{xpatch} % need to patch \scshape
+\RequirePackage{iftex,xkeyval,etoolbox,textcomp}
+\RequirePackage{xstring,ifthen,scalefnt} % for \textfrac
+
+% Engine check
+\newif\ifzpl@otf
+\iftutex\zpl@otftrue
+\else
+ \endinput
+\fi
+%%%%%%%%%%%%%%%%%%
+ \RequirePackage{xkeyval}
+%%%% Start Options
+\newif\ifzpl@nomath\zpl@nomathfalse % load fontspec with no-math
+\newif\ifzpl@lining\zpl@liningtrue
+\newif\ifzpl@tabular\zpl@tabulartrue % default is tabular lining figures
+\@ifundefined{ver@newpxmath.sty}{}{\zpl@nomathtrue}
+
+\DeclareOptionX{type1}[true]{%
+%\@nameuse{if#1}\zpl@otffalse\fi
+}
+\DeclareOptionX{nofontspec}[true]{%
+%\@nameuse{if#1}\zpl@otffalse\fi
+}
+\DeclareOptionX{no-math}[true]{%
+\@nameuse{if#1}\zpl@nomathtrue\fi
+}
+
+\def\zpl@defaultfeatures{}
+\DeclareOptionX{defaultfeatures}{\def\zpl@defaultfeatures{#1}}
+
+%Figure style options
+\edef\zpl@dfltfigurestyle{lf}
+\edef\zpl@dfltfigurealign{t}
+
+\DeclareOptionX{lining}[true]{%
+\@nameuse{zpl@lining#1}
+}
+\DeclareOptionX{lf}[true]{%
+\@nameuse{zpl@lining#1}
+}
+\DeclareOptionX{oldstyle}[true]{%
+\@nameuse{if#1}%
+ \zpl@liningfalse
+\else
+ \zpl@liningtrue
+\fi
+}
+\DeclareOptionX{osf}[true]{%
+\@nameuse{if#1}%
+ \zpl@liningfalse
+\else
+ \zpl@liningtrue
+\fi
+}
+\DeclareOptionX{tabular}[true]{%
+\@nameuse{zpl@tabular#1}
+}
+\DeclareOptionX{t}[true]{%
+\@nameuse{zpl@tabular#1}
+}
+\DeclareOptionX{proportional}[true]{%
+\@nameuse{if#1}%
+ \zpl@tabularfalse
+\else
+ \zpl@tabulartrue
+\fi
+}
+\DeclareOptionX{p}[true]{%
+\@nameuse{if#1}%
+ \zpl@tabularfalse
+\else
+ \zpl@tabulartrue
+\fi
+}
+
+%Scale
+\providecommand{\zpl@scale}{1} % actual scaled command in \zpl@scaled
+\DeclareOptionX{scale}{\def\zpl@scale{#1}}
+\DeclareOptionX{scaled}{\def\zpl@scale{#1}}
+
+\newif\ifzpl@defaultsups
+%\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 % default is to load helvetica as sans serif font
+\newif\ifzpl@thrm
+\newif\ifzpl@sl
+% new sups options
+\newdimen\zplsups@scale
+\newdimen\zplsups@raise
+\def\zplsups@raised{\z@}
+\def\zplsups@Lspaced{.04em}
+\def\zplsups@Rspaced{.04em}
+\def\zplsups@scaledval{1.0}
+\def\zplsups@supscale{1.0}
+\DeclareOptionX{supscaled}{\renewcommand*{\zplsups@scaledval}{#1}}
+\DeclareOptionX{supscale}{\renewcommand*{\zplsups@scaledval}{#1}}
+\DeclareOptionX{supsraised}{\renewcommand*{\zplsups@raised}{#1}}
+\DeclareOptionX{supLspaced}{\renewcommand*{\zplsups@Lspaced}{#1}}
+\DeclareOptionX{supRspaced}{\renewcommand*{\zplsups@Rspaced}{#1}}
+
+% Other options
+\DeclareOptionX{defaultsups}[true]{%
+\@nameuse{zpl@defaultsups#1}
+}
+\DeclareOptionX{babel}[true]{%
+\@nameuse{zpl@babel#1}% for backward compatibility
+}
+\DeclareOptionX{largesc}[true]{%
+\@nameuse{zpl@largesc#1}
+}
+\DeclareOptionX{nohelv}[true]{%
+\@nameuse{if#1}\zpl@helvfalse\fi}%
+
+\def\zpl@helvratio{.94}
+\DeclareOptionX{helvratio}[0.94]{%
+\def\zpl@helvratio{#1}
+}
+\def\zpl@spcmag{1}
+\def\zpl@spc{.25em}
+\def\zpl@stretch{.2em}
+\def\zpl@shrink{.1em}
+\def\zpl@nospc{T}
+
+\DeclareOptionX{spcfactor}{%
+\def\zpl@spcmag{#1}\def\zpl@nospc{F}
+}
+\DeclareOptionX{spacing}{%
+\def\zpl@spc{#1}
+}
+\DeclareOptionX{stretch}{%
+\def\zpl@stretch{#1}
+}
+\DeclareOptionX{shrink}{%
+\def\zpl@shrink{#1}
+}
+\newcount\zpl@cnt \zpl@cnt=0
+\newif\ifzpl@zeroslash
+\newif\ifzpl@notextnu
+\def\zpl@thmlin{X} % default is to not change to lining
+\def\zpl@noti{T}\def\zpl@nolo{T}
+\DeclareOptionX{oldSS}{\advance\zpl@cnt 32 }
+\DeclareOptionX{notextnu}{\zpl@notextnutrue}
+\DeclareOptionX{slashedzero}{\zpl@zeroslashtrue}
+\DeclareOptionX{theoremfont}{\zpl@thrmtrue }
+\DeclareOptionX{thmlining}{\edef\zpl@thmlin{l}}
+\DeclareOptionX{trueslanted}{\zpl@sltrue}
+\DeclareOptionX{scosf}{\zpl@scosftrue}
+\DeclareOptionX{tighter}{%
+\gdef\zpl@spc{.25em}\gdef\zpl@stretch{.125em}%
+\gdef\zpl@shrink{.1em}\def\zpl@noti{F}}
+\DeclareOptionX{looser}{%
+\gdef\zpl@spc{.3em}\gdef\zpl@stretch{.2em}%
+\gdef\zpl@shrink{.1em}\def\zpl@nolo{F}}
+
+\DeclareOptionX{sfracvcenter}{%
+\def\zpl@sfrVC{#1}}
+\DeclareOptionX{sfracvspacing}{%
+\def\zpl@sfrVS{#1}}
+\DeclareOptionX{sfracbarthick}{%
+\def\zpl@sfrTH{#1}}
+\DeclareOptionX{sfracscaling}{%
+\def\zpl@sfrSC{#1}}
+
+\ProcessOptionsX\relax
+
+\setlength{\zplsups@raise}{\zplsups@raised}
+\setlength{\zplsups@scale}{\zplsups@scaledval\p@}
+\zplsups@scale=\zpl@scale\zplsups@scale %
+\def\zplsups@scaled{s*[\strip@pt\zplsups@scale]}
+% for stacked fractions
+\@ifundefined{zpl@xht}{\def\zpl@xht{460}}{} % lowercase letters
+\@ifundefined{zpl@deht}{\def\zpl@deht{412}}{} % denominator figures ht
+\@ifundefined{zpl@nubase}{\def\zpl@nubase{270}}{} % baseline of numerators
+\@ifundefined{zpl@debase}{\def\zpl@debase{0}}{} % baseline of denoms
+\@ifundefined{zpl@sfrVC}{\def\zpl@sfrVC{335}}{}% vertical center of sfrac
+\@ifundefined{zpl@sfrVS}{\def\zpl@sfrVS{106}}{} % space above/below bar
+\@ifundefined{zpl@sfrTH}{\def\zpl@sfrTH{52}}{} % bar thickness
+\@ifundefined{zpl@sfrSC}{\def\zpl@sfrSC{.9}}{} % scale defigures by this
+
+\def\re@DeclareTextSymbol#1#2#3{%
+ \let#1=\undefined
+ \DeclareTextSymbol{#1}{#2}{#3}}
+
+\ifzpl@otf
+ \ifzpl@nomath
+ \RequirePackage[no-math]{fontspec}
+ \else
+ \RequirePackage{fontspec}
+ \fi
+
+ \ifluatex % avoid possibly uncorrected "system" fonts
+ \directlua{fonts.names.set_location_precedence{
+ "local", "texmf", "system" }}
+ \fi
+ \def\zpl@base{TeXGyrePagellaX}
+% \ifzpl@scosf
+% \AtEndPreamble{%
+% \xpretocmd{\scshape}
+% {\addfontfeatures{ Numbers = OldStyle }}
+% {}{}%
+% }%
+% \fi
+
+
+ \newcommand{\textfrac}[3][]{{%\normalfont%
+\mbox{%
+ \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
+ {{\lfstyle#1}\kern.1em}{}%
+\addfontfeatures{RawFeature=+numr}#2\char"2044% numerator
+\addfontfeatures{RawFeature=-numr;+dnom;+ss20}\char"2044{}#3%
+}}}
+
+\else % type1
+\fi
+
+\def\useosf{\zpl@liningfalse}
+\@onlypreamble\useosf
+\def\useproportional{\zpl@tabularfalse}
+\@onlypreamble\useproportional
+
+\ifzpl@otf
+ \def\zpl@dflt{}
+ \ifzpl@zeroslash\edef\zpl@dflt{Numbers = SlashedZero ,
+ }\fi
+ \if T\zpl@nospc
+ \if F\zpl@noti\def\zpl@spcmag{{1,.625,1}}\def\zpl@nospc{F}\fi
+ \if F\zpl@nolo\def\zpl@spcmag{{1.2,1,1}}\def\zpl@nospc{F}\fi
+ \fi
+ \if F\zpl@nospc
+ \edef\zpl@dflt{\zpl@dflt WordSpace = \zpl@spcmag ,
+ }
+ \fi
+ \def\zpl@scraw{pcap}\def\zpl@scrawN{smcp}
+ \ifzpl@largesc\def\zpl@scraw{smcp}\def\zpl@scrawN{pcap}\fi
+
+ %\zpl@cnt will be 0..2^8-1
+ \edef\zpl@lst{}
+ \ifnum\zpl@cnt>127 \edef\zpl@lst{8}\advance\zpl@cnt -128 \fi
+ \ifnum\zpl@cnt>63 \edef\zpl@lst{7,\zpl@lst}\advance\zpl@cnt -64 \fi
+ \ifnum\zpl@cnt>31 \edef\zpl@lst{6,\zpl@lst}\advance\zpl@cnt -32 \fi
+ \ifnum\zpl@cnt>15 \edef\zpl@lst{5,\zpl@lst}\advance\zpl@cnt -16 \fi
+ \ifnum\zpl@cnt>7 \edef\zpl@lst{4,\zpl@lst}\advance\zpl@cnt -8 \fi
+ \ifnum\zpl@cnt>3 \edef\zpl@lst{3,\zpl@lst}\advance\zpl@cnt -4 \fi
+ \ifnum\zpl@cnt>1 \edef\zpl@lst{2,\zpl@lst}\advance\zpl@cnt -2 \fi
+ \ifnum\zpl@cnt>0 \edef\zpl@lst{1,\zpl@lst}\fi
+ \ifthenelse{\not\equal{\zpl@lst}{}}
+ {\edef\zpl@dflt{\zpl@dflt StylisticSet={\zpl@lst} ,
+ }}{}
+
+ \defaultfontfeatures{
+ Ligatures = TeX ,
+ Scale = \zpl@scale ,
+ Extension = .otf ,
+ SmallCapsFeatures={\ifzpl@scosf Numbers = OldStyle ,
+ \fi RawFeature = -\zpl@scrawN;+\zpl@scraw }
+ \ifluatex Renderer=Basic\fi ,
+ \zpl@dflt ,
+ RawFeature=-ss05 ,
+ \zpl@defaultfeatures
+ }
+
+\else % type1
+ \fi % type1
+
+\ifzpl@thrm
+ %\RequirePackage{amsmath,amsthm} % in case of theoremfont
+ \ifdefined\newtheoremstyle %amsthm and ntheorem, not theorem.sty
+ \@ifpackageloaded{ntheorem}\relax{%
+ \newtheoremstyle{plain}
+ {\medskipamount} % ABOVESPACE, was \topsep
+ {\medskipamount} % BELOWSPACE, was \topsep
+ {\thfamily} % BODYFONT--\thfamily is italic with upright figures and punctuation
+ {} % INDENT (empty value is the same as 0pt)
+ {\bfseries} % HEADFONT--you may want to add \tlfstyle so the number is tab lining, regardless of text figure selection
+ {.} % HEADPUNCT
+ {5pt plus 1pt minus 1pt} % HEADSPACE
+ {} % CUSTOM-HEAD-SPEC\newtheorem{thm}{Theorem}[section]
+ } % end @ifpackageloaded
+ \fi%
+\fi%}
+
+\ifzpl@otf
+ \DeclareTextFontCommand{\textsl}{\slshape}
+ \DeclareTextFontCommand{%
+ \osfstyle}{\addfontfeatures{Numbers={Proportional,OldStyle}}}
+ \DeclareTextFontCommand{%
+ \tosfstyle}{\addfontfeatures{Numbers={Tabular,OldStyle}}}
+ \DeclareTextFontCommand{%
+ \tlfstyle}{\addfontfeatures{Numbers={Tabular,Lining}}}
+ \DeclareTextFontCommand{%
+ \lfstyle}{\addfontfeatures{Numbers={Proportional,Lining}}}
+
+ \DeclareRobustCommand{\destyle}{%
+ \not@math@alphabet\destyle\relax
+ \addfontfeatures{VerticalPosition=Denominator}%
+ }
+ \DeclareRobustCommand{\nustyle}{%
+ \not@math@alphabet\nustyle\relax
+ \addfontfeatures{VerticalPosition=Numerator}%
+ }
+ \DeclareRobustCommand{\sustyle}{%
+ \not@math@alphabet\sustyle\relax
+ \addfontfeatures{VerticalPosition=Superior}%
+ }
+ \DeclareRobustCommand{\infstyle}{%
+ \not@math@alphabet\infstyle\relax
+ \addfontfeatures{VerticalPosition=Inferior}%
+ }
+
+ \let\sufigures\sustyle
+ \let\nufigures\nustyle
+ \let\infigures\infstyle
+ \let\defigures\destyle
+
+ \ifzpl@defaultsups %
+ \else
+ \RequirePackage{realscripts}
+ \renewcommand\footnotemarkfont{\normalfont\sufigures}
+ \fi
+% \ifzpl@KOMA
+% \setkomafont{footnotereference}{\normalfont\sustyle}
+% \setkomafont{footnotelabel}{\normalfont\sustyle}
+% \fi
+
+ \renewcommand*{\textcircled}[1]{\hmode@bgroup\ooalign{%
+ \hfil \raise -.255ex\hbox{{%
+ \normalfont\addfontfeatures{Numbers={Monospaced, Lining}}%
+ \scalefont{.8}{\sustyle#1}}}% end hbox
+ \hfil \crcr \symbol{"25EF}}%
+ \egroup}
+\else % type1
+\fi
+
+% applies to both
+\DeclareRobustCommand{\textlf}[1]{%
+ {\lfstyle #1}%
+}
+\DeclareRobustCommand{\texttlf}[1]{%
+ {\tlfstyle #1}%
+}
+\DeclareRobustCommand{\textosf}[1]{%
+ {\osfstyle #1}%
+}
+\DeclareRobustCommand{\texttosf}[1]{%
+ {\tosfstyle #1}%
+}
+%\DeclareRobustCommand{\textsu}[1]{%
+% {\sustyle #1}%
+%}
+\DeclareTextFontCommand{\textsu}{\sustyle}
+ %\let\textsuperior\textsu
+\let\textsup\textsu
+ \let\textsups\textsu
+\DeclareTextFontCommand{\textnumerator}{\nustyle}
+ \ifzpl@notextnu\else\let\textnu=\textnumerator\fi
+ \let\textnum\textnumerator
+\DeclareTextFontCommand{\textde}{\destyle}
+ \let\textdenominator\textde
+\DeclareTextFontCommand{\textinf}{\instyle}
+ \let\textinferior\textinf
+
+\newdimen\zpl@sixem\zpl@sixem6pt % for checking if a number refers to ex
+\newdimen\zpl@y \newdimen\zpl@x
+
+% convert numerical entry that may be multiple of ex (<6) or em value
+\def\zpl@toex#1{\zpl@x#1pt \ifdim\zpl@x<\z@\zpl@y-\zpl@x\else\zpl@y\zpl@x\fi \ifdim\zpl@y>\zpl@sixem \zpl@x\dimexpr
+ 1pt * (\dimexpr #1pt\relax) / \dimexpr \zpl@xht pt\relax\relax\fi}
+
+\newdimen\zpl@tmpdima \newdimen\zpl@tmpdimb \newdimen\zpl@tmpdimc
+\newdimen\zpl@tmpdimd \newdimen\zpl@tmpdime \newdimen\zpl@tmpdimf
+\newdimen\zpl@dimA
+\newdimen\zpl@dimAA \newdimen\zpl@dimB \newdimen\zpl@dimBB
+\newdimen\zpl@dimC % vertical center
+% double cap letters for below bar, single cap for above
+
+\zpl@toex\zpl@sfrVC\zpl@dimC\zpl@x %Vertical center of fraction
+\zpl@toex\zpl@sfrTH\zpl@tmpdimb\zpl@x % bar thickness
+\zpl@tmpdime.5\zpl@tmpdimb % half bar thickness
+\zpl@toex\zpl@sfrVS\zpl@tmpdimc\zpl@x% vertical space
+\zpl@toex\zpl@deht\zpl@tmpdimd\zpl@x % height of unscaled figures
+\zpl@tmpdimd\zpl@sfrSC\zpl@tmpdimd % height of scaled figures
+\zpl@toex\zpl@debase\zpl@tmpdimf\zpl@x % unscaled baseline of de figures
+\zpl@toex\zpl@nubase\zpl@tmpdima\zpl@x % unscaled baseline of nu figures
+\zpl@tmpdima\zpl@sfrSC\zpl@tmpdima % scaled nu baseline
+\zpl@tmpdimf\zpl@sfrSC\zpl@tmpdimf % scaled de baseline
+\zpl@dimA\zpl@dimC
+\advance\zpl@dimA by \zpl@tmpdime % top of bar
+\zpl@dimAA\zpl@dimC
+\advance\zpl@dimAA by -\zpl@tmpdime % bottom of bar
+\zpl@dimB\zpl@dimA
+\advance\zpl@dimB by \zpl@tmpdimc % top figure baseline
+\advance\zpl@dimB by -\zpl@tmpdima
+\zpl@dimBB\zpl@dimAA
+\advance\zpl@dimBB by -\zpl@tmpdimc %
+\advance\zpl@dimBB by -\zpl@tmpdimd % bottom figure baseline
+\advance\zpl@dimBB by -\zpl@tmpdimf
+\newcommand*{\textsfrac}[3][]{% like \textsfrac[1]{23}{34}
+\mbox{%
+ \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
+ {\textlf{#1}\kern.12em}{}%
+ {\hmode@bgroup%
+\ooalign{%
+ \setbox0=\hbox{\scalefont{\zpl@sfrSC}\nustyle#2}%
+ \hfil \raise\strip@pt\zpl@dimB ex\box0\hfil \crcr%
+ \leaders\hrule height \strip@pt\zpl@dimA ex depth -\strip@pt\zpl@dimAA ex\hfill \crcr%
+ \setbox1=\hbox{\scalefont{\zpl@sfrSC}\destyle#3}%
+ \hfil\raise\strip@pt\zpl@dimBB ex\box1\hfil}%
+\egroup}}
+}
+
+\AtEndPreamble{%
+\ifzpl@otf
+ \ifzpl@lining
+ \def\zpl@figurestyle{Lining}
+ \else
+ \def\zpl@figurestyle{OldStyle}
+ \fi
+ \ifzpl@tabular
+ \def\zpl@figurealign{Monospaced}
+ \else
+ \def\zpl@figurealign{Proportional}
+ \fi
+% \ifzpl@scosf
+% %\traceon
+% \setmainfont
+% [Numbers = {\zpl@figurealign,\zpl@figurestyle},
+% SmallCapsFeatures = { Letters=SmallCaps , Numbers = OldStyle }
+% ] {\zpl@base}
+%% \traceoff
+% \else
+% \setmainfont
+% [Numbers = {\zpl@figurealign,\zpl@figurestyle}
+% SmallCapsFeatures = { Letters=SmallCaps , }
+% ] {\zpl@base}
+% \fi
+%\traceon
+\setmainfont
+ [Numbers = {Proportional , Lining },
+ SmallCapsFeatures = { Letters = SmallCaps , Numbers = OldStyle }
+ ] {TeXGyrePagellaX}
+
+
+% \let\zpl@sty\zpl@figurestyle
+% \if l\zpl@thmlin\def\zpl@sty{Lining}\fi
+% \newcommand{\thfamily}%{\@nameuse{zpl\zpl@figurestyle}%
+% {\addfontfeatures{%
+% Numbers={\zpl@figurealign,\zpl@sty} ,
+% RawFeature=+ss05}
+% \itshape} % for theorems
+% \ifzpl@sl\else\let\slshape=\thfamily\fi % change
+
+\else % type1
+ \fi % type1
+% both
+%\ifzpl@KOMA
+% %\let\textsuperscript\textsu
+% \@ifpackageloaded{AB@authnote}{%
+% \renewcommand\AB@authnote[1]{\textsu{#1}}
+% \renewcommand\AB@affilnote[1]{\textsu{#1}}
+% }
+%\fi
+%both
+\ifzpl@thrm
+ \@ifundefined{theoremstyle}{}{
+ \theoremstyle{plain}
+ \patchcmd{\th@plain}{\itshape}{\thfamily}{\message{Replaced itshape by thfamily in theorem style plain.}}{\message{Unable to replace itshape by thfamily in theorem style plain.}}
+}
+\fi
+}
+
+% Define \oldstylenums, \liningnums ,\tabularnums and \proportionalnums
+\ifzpl@otf
+ \DeclareTextFontCommand{%
+ \oldstylenums}{\addfontfeatures{Numbers=OldStyle}}
+ \DeclareTextFontCommand{%
+ \liningnums}{\addfontfeatures{Numbers=Lining}}
+ \DeclareTextFontCommand{%
+ \tabularnums}{\addfontfeatures{Numbers=Tabular}}
+ \DeclareTextFontCommand{%
+ \proportionalnums}{\addfontfeatures{Numbers=Proportional}}
+\else % type1
+\fi
+
+\endinput
+
diff --git a/fonts/newpx/tex/ot1minzpl.fd b/fonts/newpx/tex/ot1minzpl.fd
index 490d13ff73..b37ce888c4 100644
--- a/fonts/newpx/tex/ot1minzpl.fd
+++ b/fonts/newpx/tex/ot1minzpl.fd
@@ -1,6 +1,6 @@
\ProvidesFile{ot1minzpl.fd}[2021/05/25 v1.0 font definition file for OT1/minzpl/TLF]
-\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
+\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{}
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
diff --git a/fonts/newpx/tex/ot1zpllf.fd b/fonts/newpx/tex/ot1zpllf.fd
index 197e31aa08..1782095ea3 100644
--- a/fonts/newpx/tex/ot1zpllf.fd
+++ b/fonts/newpx/tex/ot1zpllf.fd
@@ -1,6 +1,6 @@
-\ProvidesFile{ot1zpllf.fd}[2021/05/25 v1.0 font definition file for OT1/zpl/LF]
+\ProvidesFile{ot1zpllf.fd}[2021/05/25 v1.0 font definition file for OT1/zpl/lf]
-\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
+\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{}
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
@@ -10,29 +10,29 @@
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{OT1}{zplLF}{\zpl@spacing}
-\DeclareFontShape{OT1}{zplLF}{b}{sc}{<-> \zpl@scaled zpl-Bold-lf-sc\zpl@lsfx-ot1}{}
-\DeclareFontShape{OT1}{zplLF}{b}{n}{<-> \zpl@scaled zpl-Bold-lf-ot1}{}
-\DeclareFontShape{OT1}{zplLF}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-lf-sc\zpl@lsfx-ot1}{}
-\DeclareFontShape{OT1}{zplLF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-lf-ot1}{}
-\DeclareFontShape{OT1}{zplLF}{m}{sc}{<-> \zpl@scaled zpl-Regular-lf-sc\zpl@lsfx-ot1}{}
-\DeclareFontShape{OT1}{zplLF}{m}{n}{<-> \zpl@scaled zpl-Regular-lf-ot1}{}
-\DeclareFontShape{OT1}{zplLF}{m}{scit}{<-> \zpl@scaled zpl-Italic-lf-sc\zpl@lsfx-ot1}{}
-\DeclareFontShape{OT1}{zplLF}{m}{it}{<-> \zpl@scaled zpl-Italic-lf-ot1}{}
-\DeclareFontShape{OT1}{zplLF}{bx}{sc}{<->ssub * zplLF/b/sc}{}
-\DeclareFontShape{OT1}{zplLF}{bx}{n}{<->ssub * zplLF/b/n}{}
-\DeclareFontShape{OT1}{zplLF}{bx}{scit}{<->ssub * zplLF/b/scit}{}
-\DeclareFontShape{OT1}{zplLF}{bx}{it}{<->ssub * zplLF/b/it}{}
+\DeclareFontFamily{OT1}{zpllf}{\zpl@spacing}
+\DeclareFontShape{OT1}{zpllf}{b}{sc}{<-> \zpl@scaled zpl-Bold-lf-sc\zpl@lsfx-ot1}{}
+\DeclareFontShape{OT1}{zpllf}{b}{n}{<-> \zpl@scaled zpl-Bold-lf-ot1}{}
+\DeclareFontShape{OT1}{zpllf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-lf-sc\zpl@lsfx-ot1}{}
+\DeclareFontShape{OT1}{zpllf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-lf-ot1}{}
+\DeclareFontShape{OT1}{zpllf}{m}{sc}{<-> \zpl@scaled zpl-Regular-lf-sc\zpl@lsfx-ot1}{}
+\DeclareFontShape{OT1}{zpllf}{m}{n}{<-> \zpl@scaled zpl-Regular-lf-ot1}{}
+\DeclareFontShape{OT1}{zpllf}{m}{scit}{<-> \zpl@scaled zpl-Italic-lf-sc\zpl@lsfx-ot1}{}
+\DeclareFontShape{OT1}{zpllf}{m}{it}{<-> \zpl@scaled zpl-Italic-lf-ot1}{}
+\DeclareFontShape{OT1}{zpllf}{bx}{sc}{<->ssub * zpllf/b/sc}{}
+\DeclareFontShape{OT1}{zpllf}{bx}{n}{<->ssub * zpllf/b/n}{}
+\DeclareFontShape{OT1}{zpllf}{bx}{scit}{<->ssub * zpllf/b/scit}{}
+\DeclareFontShape{OT1}{zpllf}{bx}{it}{<->ssub * zpllf/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{OT1}{zplLF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-lf-ot1}{}
- \DeclareFontShape{OT1}{zplLF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-lf-ot1}{}
- \DeclareFontShape{OT1}{zplLF}{bx}{sl}{<->ssub * zplLF/b/sl}{}
+ \DeclareFontShape{OT1}{zpllf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-lf-ot1}{}
+ \DeclareFontShape{OT1}{zpllf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-lf-ot1}{}
+ \DeclareFontShape{OT1}{zpllf}{bx}{sl}{<->ssub * zpllf/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{OT1}{zplLF}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-ot1}{}
- \DeclareFontShape{OT1}{zplLF}{b}{sl}{<->ssub * zplLF/m/sl}{}
- \DeclareFontShape{OT1}{zplLF}{bx}{sl}{<->ssub * zplLF/m/sl}{}
+ \DeclareFontShape{OT1}{zpllf}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-ot1}{}
+ \DeclareFontShape{OT1}{zpllf}{b}{sl}{<->ssub * zpllf/m/sl}{}
+ \DeclareFontShape{OT1}{zpllf}{bx}{sl}{<->ssub * zpllf/m/sl}{}
\fi
-\DeclareFontShape{OT1}{zplLF}{b}{scsl}{<->ssub * zplLF/b/scit}{}
-\DeclareFontShape{OT1}{zplLF}{bx}{scsl}{<->ssub * zplLF/b/scit}{}
-\DeclareFontShape{OT1}{zplLF}{m}{scsl}{<->ssub * zplLF/m/scit}{}
+\DeclareFontShape{OT1}{zpllf}{b}{scsl}{<->ssub * zpllf/b/scit}{}
+\DeclareFontShape{OT1}{zpllf}{bx}{scsl}{<->ssub * zpllf/b/scit}{}
+\DeclareFontShape{OT1}{zpllf}{m}{scsl}{<->ssub * zpllf/m/scit}{}
\endinput
diff --git a/fonts/newpx/tex/ot1zplosf.fd b/fonts/newpx/tex/ot1zplosf.fd
index c196686570..d1ea0482b8 100644
--- a/fonts/newpx/tex/ot1zplosf.fd
+++ b/fonts/newpx/tex/ot1zplosf.fd
@@ -1,6 +1,6 @@
-\ProvidesFile{ot1zplosf.fd}[2021/05/25 v1.0 font definition file for OT1/zpl/OsF]
+\ProvidesFile{ot1zplosf.fd}[2021/05/25 v1.0 font definition file for OT1/zpl/osf]
-\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
+\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{}
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
@@ -10,29 +10,29 @@
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{OT1}{zplOsF}{\zpl@spacing}
-\DeclareFontShape{OT1}{zplOsF}{b}{sc}{<-> \zpl@scaled zpl-Bold-osf-sc\zpl@lsfx-ot1}{}
-\DeclareFontShape{OT1}{zplOsF}{b}{n}{<-> \zpl@scaled zpl-Bold-osf-ot1}{}
-\DeclareFontShape{OT1}{zplOsF}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-osf-sc\zpl@lsfx-ot1}{}
-\DeclareFontShape{OT1}{zplOsF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-osf-ot1}{}
-\DeclareFontShape{OT1}{zplOsF}{m}{sc}{<-> \zpl@scaled zpl-Regular-osf-sc\zpl@lsfx-ot1}{}
-\DeclareFontShape{OT1}{zplOsF}{m}{n}{<-> \zpl@scaled zpl-Regular-osf-ot1}{}
-\DeclareFontShape{OT1}{zplOsF}{m}{scit}{<-> \zpl@scaled zpl-Italic-osf-sc\zpl@lsfx-ot1}{}
-\DeclareFontShape{OT1}{zplOsF}{m}{it}{<-> \zpl@scaled zpl-Italic-osf-ot1}{}
-\DeclareFontShape{OT1}{zplOsF}{bx}{sc}{<->ssub * zplOsF/b/sc}{}
-\DeclareFontShape{OT1}{zplOsF}{bx}{n}{<->ssub * zplOsF/b/n}{}
-\DeclareFontShape{OT1}{zplOsF}{bx}{scit}{<->ssub * zplOsF/b/scit}{}
-\DeclareFontShape{OT1}{zplOsF}{bx}{it}{<->ssub * zplOsF/b/it}{}
+\DeclareFontFamily{OT1}{zplosf}{\zpl@spacing}
+\DeclareFontShape{OT1}{zplosf}{b}{sc}{<-> \zpl@scaled zpl-Bold-osf-sc\zpl@lsfx-ot1}{}
+\DeclareFontShape{OT1}{zplosf}{b}{n}{<-> \zpl@scaled zpl-Bold-osf-ot1}{}
+\DeclareFontShape{OT1}{zplosf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-osf-sc\zpl@lsfx-ot1}{}
+\DeclareFontShape{OT1}{zplosf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-osf-ot1}{}
+\DeclareFontShape{OT1}{zplosf}{m}{sc}{<-> \zpl@scaled zpl-Regular-osf-sc\zpl@lsfx-ot1}{}
+\DeclareFontShape{OT1}{zplosf}{m}{n}{<-> \zpl@scaled zpl-Regular-osf-ot1}{}
+\DeclareFontShape{OT1}{zplosf}{m}{scit}{<-> \zpl@scaled zpl-Italic-osf-sc\zpl@lsfx-ot1}{}
+\DeclareFontShape{OT1}{zplosf}{m}{it}{<-> \zpl@scaled zpl-Italic-osf-ot1}{}
+\DeclareFontShape{OT1}{zplosf}{bx}{sc}{<->ssub * zplosf/b/sc}{}
+\DeclareFontShape{OT1}{zplosf}{bx}{n}{<->ssub * zplosf/b/n}{}
+\DeclareFontShape{OT1}{zplosf}{bx}{scit}{<->ssub * zplosf/b/scit}{}
+\DeclareFontShape{OT1}{zplosf}{bx}{it}{<->ssub * zplosf/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{OT1}{zplOsF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-osf-ot1}{}
- \DeclareFontShape{OT1}{zplOsF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-osf-ot1}{}
- \DeclareFontShape{OT1}{zplOsF}{bx}{sl}{<->ssub * zplOsF/b/sl}{}
+ \DeclareFontShape{OT1}{zplosf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-osf-ot1}{}
+ \DeclareFontShape{OT1}{zplosf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-osf-ot1}{}
+ \DeclareFontShape{OT1}{zplosf}{bx}{sl}{<->ssub * zplosf/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{OT1}{zplOsF}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-ot1}{}
- \DeclareFontShape{OT1}{zplOsF}{b}{sl}{<->ssub * zplOsF/m/sl}{}
- \DeclareFontShape{OT1}{zplOsF}{bx}{sl}{<->ssub * zplOsF/m/sl}{}
+ \DeclareFontShape{OT1}{zplosf}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-ot1}{}
+ \DeclareFontShape{OT1}{zplosf}{b}{sl}{<->ssub * zplosf/m/sl}{}
+ \DeclareFontShape{OT1}{zplosf}{bx}{sl}{<->ssub * zplosf/m/sl}{}
\fi
-\DeclareFontShape{OT1}{zplOsF}{b}{scsl}{<->ssub * zplOsF/b/scit}{}
-\DeclareFontShape{OT1}{zplOsF}{bx}{scsl}{<->ssub * zplOsF/b/scit}{}
-\DeclareFontShape{OT1}{zplOsF}{m}{scsl}{<->ssub * zplOsF/m/scit}{}
+\DeclareFontShape{OT1}{zplosf}{b}{scsl}{<->ssub * zplosf/b/scit}{}
+\DeclareFontShape{OT1}{zplosf}{bx}{scsl}{<->ssub * zplosf/b/scit}{}
+\DeclareFontShape{OT1}{zplosf}{m}{scsl}{<->ssub * zplosf/m/scit}{}
\endinput
diff --git a/fonts/newpx/tex/ot1zpltlf.fd b/fonts/newpx/tex/ot1zpltlf.fd
index c1dd06a019..0ef93971a8 100644
--- a/fonts/newpx/tex/ot1zpltlf.fd
+++ b/fonts/newpx/tex/ot1zpltlf.fd
@@ -1,6 +1,6 @@
-\ProvidesFile{ot1zpltlf.fd}[2021/05/25 v1.0 font definition file for OT1/zpl/TLF]
+\ProvidesFile{ot1zpltlf.fd}[2021/05/25 v1.0 font definition file for OT1/zpl/tlf]
-\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
+\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{}
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
@@ -10,29 +10,29 @@
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{OT1}{zplTLF}{\zpl@spacing}
-\DeclareFontShape{OT1}{zplTLF}{b}{sc}{<-> \zpl@scaled zpl-Bold-tlf-sc\zpl@lsfx-ot1}{}
-\DeclareFontShape{OT1}{zplTLF}{b}{n}{<-> \zpl@scaled zpl-Bold-tlf-ot1}{}
-\DeclareFontShape{OT1}{zplTLF}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-tlf-sc\zpl@lsfx-ot1}{}
-\DeclareFontShape{OT1}{zplTLF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tlf-ot1}{}
-\DeclareFontShape{OT1}{zplTLF}{m}{sc}{<-> \zpl@scaled zpl-Regular-tlf-sc\zpl@lsfx-ot1}{}
-\DeclareFontShape{OT1}{zplTLF}{m}{n}{<-> \zpl@scaled zpl-Regular-tlf-ot1}{}
-\DeclareFontShape{OT1}{zplTLF}{m}{scit}{<-> \zpl@scaled zpl-Italic-tlf-sc\zpl@lsfx-ot1}{}
-\DeclareFontShape{OT1}{zplTLF}{m}{it}{<-> \zpl@scaled zpl-Italic-tlf-ot1}{}
-\DeclareFontShape{OT1}{zplTLF}{bx}{sc}{<->ssub * zplTLF/b/sc}{}
-\DeclareFontShape{OT1}{zplTLF}{bx}{n}{<->ssub * zplTLF/b/n}{}
-\DeclareFontShape{OT1}{zplTLF}{bx}{scit}{<->ssub * zplTLF/b/scit}{}
-\DeclareFontShape{OT1}{zplTLF}{bx}{it}{<->ssub * zplTLF/b/it}{}
+\DeclareFontFamily{OT1}{zpltlf}{\zpl@spacing}
+\DeclareFontShape{OT1}{zpltlf}{b}{sc}{<-> \zpl@scaled zpl-Bold-tlf-sc\zpl@lsfx-ot1}{}
+\DeclareFontShape{OT1}{zpltlf}{b}{n}{<-> \zpl@scaled zpl-Bold-tlf-ot1}{}
+\DeclareFontShape{OT1}{zpltlf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-tlf-sc\zpl@lsfx-ot1}{}
+\DeclareFontShape{OT1}{zpltlf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tlf-ot1}{}
+\DeclareFontShape{OT1}{zpltlf}{m}{sc}{<-> \zpl@scaled zpl-Regular-tlf-sc\zpl@lsfx-ot1}{}
+\DeclareFontShape{OT1}{zpltlf}{m}{n}{<-> \zpl@scaled zpl-Regular-tlf-ot1}{}
+\DeclareFontShape{OT1}{zpltlf}{m}{scit}{<-> \zpl@scaled zpl-Italic-tlf-sc\zpl@lsfx-ot1}{}
+\DeclareFontShape{OT1}{zpltlf}{m}{it}{<-> \zpl@scaled zpl-Italic-tlf-ot1}{}
+\DeclareFontShape{OT1}{zpltlf}{bx}{sc}{<->ssub * zpltlf/b/sc}{}
+\DeclareFontShape{OT1}{zpltlf}{bx}{n}{<->ssub * zpltlf/b/n}{}
+\DeclareFontShape{OT1}{zpltlf}{bx}{scit}{<->ssub * zpltlf/b/scit}{}
+\DeclareFontShape{OT1}{zpltlf}{bx}{it}{<->ssub * zpltlf/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{OT1}{zplTLF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tlf-ot1}{}
- \DeclareFontShape{OT1}{zplTLF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tlf-ot1}{}
- \DeclareFontShape{OT1}{zplTLF}{bx}{sl}{<->ssub * zplTLF/b/sl}{}
+ \DeclareFontShape{OT1}{zpltlf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tlf-ot1}{}
+ \DeclareFontShape{OT1}{zpltlf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tlf-ot1}{}
+ \DeclareFontShape{OT1}{zpltlf}{bx}{sl}{<->ssub * zpltlf/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{OT1}{zplTLF}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-ot1}{}
- \DeclareFontShape{OT1}{zplTLF}{b}{sl}{<->ssub * zplTLF/m/sl}{}
- \DeclareFontShape{OT1}{zplTLF}{bx}{sl}{<->ssub * zplTLF/m/sl}{}
+ \DeclareFontShape{OT1}{zpltlf}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-ot1}{}
+ \DeclareFontShape{OT1}{zpltlf}{b}{sl}{<->ssub * zpltlf/m/sl}{}
+ \DeclareFontShape{OT1}{zpltlf}{bx}{sl}{<->ssub * zpltlf/m/sl}{}
\fi
-\DeclareFontShape{OT1}{zplTLF}{b}{scsl}{<->ssub * zplTLF/b/scit}{}
-\DeclareFontShape{OT1}{zplTLF}{bx}{scsl}{<->ssub * zplTLF/b/scit}{}
-\DeclareFontShape{OT1}{zplTLF}{m}{scsl}{<->ssub * zplTLF/m/scit}{}
+\DeclareFontShape{OT1}{zpltlf}{b}{scsl}{<->ssub * zpltlf/b/scit}{}
+\DeclareFontShape{OT1}{zpltlf}{bx}{scsl}{<->ssub * zpltlf/b/scit}{}
+\DeclareFontShape{OT1}{zpltlf}{m}{scsl}{<->ssub * zpltlf/m/scit}{}
\endinput
diff --git a/fonts/newpx/tex/ot1zpltosf.fd b/fonts/newpx/tex/ot1zpltosf.fd
index 1c97b20a46..81fd2b9d11 100644
--- a/fonts/newpx/tex/ot1zpltosf.fd
+++ b/fonts/newpx/tex/ot1zpltosf.fd
@@ -1,6 +1,6 @@
-\ProvidesFile{ot1zpltosf.fd}[2021/05/25 v1.0 font definition file for OT1/zpl/TOsF]
+\ProvidesFile{ot1zpltosf.fd}[2021/05/25 v1.0 font definition file for OT1/zpl/tosf]
-\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
+\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{}
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
@@ -12,29 +12,29 @@
\ifdefined\zpl@adobescfalse\zpl@makeadobesc\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{OT1}{zplTOsF}{\zpl@spacing}
-\DeclareFontShape{OT1}{zplTOsF}{b}{sc}{<-> \zpl@scaled zpl-Bold-tosf-sc\zpl@lsfx\zpl@asfx-ot1}{}
-\DeclareFontShape{OT1}{zplTOsF}{b}{n}{<-> \zpl@scaled zpl-Bold-tosf-ot1}{}
-\DeclareFontShape{OT1}{zplTOsF}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-tosf-sc\zpl@lsfx-ot1}{}
-\DeclareFontShape{OT1}{zplTOsF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tosf-ot1}{}
-\DeclareFontShape{OT1}{zplTOsF}{m}{sc}{<-> \zpl@scaled zpl-Regular-tosf-sc\zpl@lsfx\zpl@asfx-ot1}{}
-\DeclareFontShape{OT1}{zplTOsF}{m}{n}{<-> \zpl@scaled zpl-Regular-tosf-ot1}{}
-\DeclareFontShape{OT1}{zplTOsF}{m}{scit}{<-> \zpl@scaled zpl-Italic-tosf-sc\zpl@lsfx-ot1}{}
-\DeclareFontShape{OT1}{zplTOsF}{m}{it}{<-> \zpl@scaled zpl-Italic-tosf-ot1}{}
-\DeclareFontShape{OT1}{zplTOsF}{bx}{sc}{<->ssub * zplTOsF/b/sc}{}
-\DeclareFontShape{OT1}{zplTOsF}{bx}{n}{<->ssub * zplTOsF/b/n}{}
-\DeclareFontShape{OT1}{zplTOsF}{bx}{scit}{<->ssub * zplTOsF/b/scit}{}
-\DeclareFontShape{OT1}{zplTOsF}{bx}{it}{<->ssub * zplTOsF/b/it}{}
+\DeclareFontFamily{OT1}{zpltosf}{\zpl@spacing}
+\DeclareFontShape{OT1}{zpltosf}{b}{sc}{<-> \zpl@scaled zpl-Bold-tosf-sc\zpl@lsfx\zpl@asfx-ot1}{}
+\DeclareFontShape{OT1}{zpltosf}{b}{n}{<-> \zpl@scaled zpl-Bold-tosf-ot1}{}
+\DeclareFontShape{OT1}{zpltosf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-tosf-sc\zpl@lsfx-ot1}{}
+\DeclareFontShape{OT1}{zpltosf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tosf-ot1}{}
+\DeclareFontShape{OT1}{zpltosf}{m}{sc}{<-> \zpl@scaled zpl-Regular-tosf-sc\zpl@lsfx\zpl@asfx-ot1}{}
+\DeclareFontShape{OT1}{zpltosf}{m}{n}{<-> \zpl@scaled zpl-Regular-tosf-ot1}{}
+\DeclareFontShape{OT1}{zpltosf}{m}{scit}{<-> \zpl@scaled zpl-Italic-tosf-sc\zpl@lsfx-ot1}{}
+\DeclareFontShape{OT1}{zpltosf}{m}{it}{<-> \zpl@scaled zpl-Italic-tosf-ot1}{}
+\DeclareFontShape{OT1}{zpltosf}{bx}{sc}{<->ssub * zpltosf/b/sc}{}
+\DeclareFontShape{OT1}{zpltosf}{bx}{n}{<->ssub * zpltosf/b/n}{}
+\DeclareFontShape{OT1}{zpltosf}{bx}{scit}{<->ssub * zpltosf/b/scit}{}
+\DeclareFontShape{OT1}{zpltosf}{bx}{it}{<->ssub * zpltosf/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{OT1}{zplTOsF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tosf-ot1}{}
- \DeclareFontShape{OT1}{zplTOsF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tosf-ot1}{}
- \DeclareFontShape{OT1}{zplTOsF}{bx}{sl}{<->ssub * zplTOsF/b/sl}{}
+ \DeclareFontShape{OT1}{zpltosf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tosf-ot1}{}
+ \DeclareFontShape{OT1}{zpltosf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tosf-ot1}{}
+ \DeclareFontShape{OT1}{zpltosf}{bx}{sl}{<->ssub * zpltosf/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{OT1}{zplTOsF}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-ot1}{}
- \DeclareFontShape{OT1}{zplTOsF}{b}{sl}{<->ssub * zplTOsF/m/sl}{}
- \DeclareFontShape{OT1}{zplTOsF}{bx}{sl}{<->ssub * zplTOsF/m/sl}{}
+ \DeclareFontShape{OT1}{zpltosf}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-ot1}{}
+ \DeclareFontShape{OT1}{zpltosf}{b}{sl}{<->ssub * zpltosf/m/sl}{}
+ \DeclareFontShape{OT1}{zpltosf}{bx}{sl}{<->ssub * zpltosf/m/sl}{}
\fi
-\DeclareFontShape{OT1}{zplTOsF}{b}{scsl}{<->ssub * zplTOsF/b/scit}{}
-\DeclareFontShape{OT1}{zplTOsF}{bx}{scsl}{<->ssub * zplTOsF/b/scit}{}
-\DeclareFontShape{OT1}{zplTOsF}{m}{scsl}{<->ssub * zplTOsF/m/scit}{}
+\DeclareFontShape{OT1}{zpltosf}{b}{scsl}{<->ssub * zpltosf/b/scit}{}
+\DeclareFontShape{OT1}{zpltosf}{bx}{scsl}{<->ssub * zpltosf/b/scit}{}
+\DeclareFontShape{OT1}{zpltosf}{m}{scsl}{<->ssub * zpltosf/m/scit}{}
\endinput
diff --git a/fonts/newpx/tex/t1minzpl.fd b/fonts/newpx/tex/t1minzpl.fd
index d320d7f8d4..c9262e9177 100644
--- a/fonts/newpx/tex/t1minzpl.fd
+++ b/fonts/newpx/tex/t1minzpl.fd
@@ -1,6 +1,6 @@
\ProvidesFile{t1minzpl.fd}[2021/05/25 v1.0 font definition file for T1/minzpl/TLF]
-\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
+\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{}
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
diff --git a/fonts/newpx/tex/t1zpldnom.fd b/fonts/newpx/tex/t1zpldnom.fd
index 4adab5a93b..91656b05ee 100644
--- a/fonts/newpx/tex/t1zpldnom.fd
+++ b/fonts/newpx/tex/t1zpldnom.fd
@@ -1,4 +1,4 @@
-\ProvidesFile{t1zpldnom.fd}[2021/09/23 v1.0]
+\ProvidesFile{T1zpldnom.fd}[2021/09/23 v1.0]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
\fi
diff --git a/fonts/newpx/tex/t1zplinf.fd b/fonts/newpx/tex/t1zplinf.fd
index a0dcfd32c0..eec0c28f13 100644
--- a/fonts/newpx/tex/t1zplinf.fd
+++ b/fonts/newpx/tex/t1zplinf.fd
@@ -1,4 +1,4 @@
-\ProvidesFile{t1zplinf.fd}[2015/01/17 v1.0]
+\ProvidesFile{T1zplinf.fd}[2015/01/17 v1.0]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
\fi
diff --git a/fonts/newpx/tex/t1zpllf.fd b/fonts/newpx/tex/t1zpllf.fd
index 0ed682d3f6..1757be99f7 100644
--- a/fonts/newpx/tex/t1zpllf.fd
+++ b/fonts/newpx/tex/t1zpllf.fd
@@ -1,6 +1,6 @@
-\ProvidesFile{t1zpllf.fd}[2021/05/25 v1.0 font definition file for T1/zpl/LF]
+\ProvidesFile{T1zpl.fd}[2021/05/25 v1.0 font definition file for T1/zpl/lf]
-\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
+\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{}
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
@@ -10,29 +10,29 @@
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{T1}{zplLF}{\zpl@spacing}
-\DeclareFontShape{T1}{zplLF}{b}{sc}{<-> \zpl@scaled zpl-Bold-lf-sc\zpl@lsfx-t1}{}
-\DeclareFontShape{T1}{zplLF}{b}{n}{<-> \zpl@scaled zpl-Bold-lf-t1}{}
-\DeclareFontShape{T1}{zplLF}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-lf-sc\zpl@lsfx-t1}{}
-\DeclareFontShape{T1}{zplLF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-lf-t1}{}
-\DeclareFontShape{T1}{zplLF}{m}{sc}{<-> \zpl@scaled zpl-Regular-lf-sc\zpl@lsfx-t1}{}
-\DeclareFontShape{T1}{zplLF}{m}{n}{<-> \zpl@scaled zpl-Regular-lf-t1}{}
-\DeclareFontShape{T1}{zplLF}{m}{scit}{<-> \zpl@scaled zpl-Italic-lf-sc\zpl@lsfx-t1}{}
-\DeclareFontShape{T1}{zplLF}{m}{it}{<-> \zpl@scaled zpl-Italic-lf-t1}{}
-\DeclareFontShape{T1}{zplLF}{bx}{sc}{<->ssub * zplLF/b/sc}{}
-\DeclareFontShape{T1}{zplLF}{bx}{n}{<->ssub * zplLF/b/n}{}
-\DeclareFontShape{T1}{zplLF}{bx}{scit}{<->ssub * zplLF/b/scit}{}
-\DeclareFontShape{T1}{zplLF}{bx}{it}{<->ssub * zplLF/b/it}{}
+\DeclareFontFamily{T1}{zpllf}{\zpl@spacing}
+\DeclareFontShape{T1}{zpllf}{b}{sc}{<-> \zpl@scaled zpl-Bold-lf-sc\zpl@lsfx-t1}{}
+\DeclareFontShape{T1}{zpllf}{b}{n}{<-> \zpl@scaled zpl-Bold-lf-t1}{}
+\DeclareFontShape{T1}{zpllf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-lf-sc\zpl@lsfx-t1}{}
+\DeclareFontShape{T1}{zpllf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-lf-t1}{}
+\DeclareFontShape{T1}{zpllf}{m}{sc}{<-> \zpl@scaled zpl-Regular-lf-sc\zpl@lsfx-t1}{}
+\DeclareFontShape{T1}{zpllf}{m}{n}{<-> \zpl@scaled zpl-Regular-lf-t1}{}
+\DeclareFontShape{T1}{zpllf}{m}{scit}{<-> \zpl@scaled zpl-Italic-lf-sc\zpl@lsfx-t1}{}
+\DeclareFontShape{T1}{zpllf}{m}{it}{<-> \zpl@scaled zpl-Italic-lf-t1}{}
+\DeclareFontShape{T1}{zpllf}{bx}{sc}{<->ssub * zpllf/b/sc}{}
+\DeclareFontShape{T1}{zpllf}{bx}{n}{<->ssub * zpllf/b/n}{}
+\DeclareFontShape{T1}{zpllf}{bx}{scit}{<->ssub * zpllf/b/scit}{}
+\DeclareFontShape{T1}{zpllf}{bx}{it}{<->ssub * zpllf/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{T1}{zplLF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-lf-t1}{}
- \DeclareFontShape{T1}{zplLF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-lf-t1}{}
- \DeclareFontShape{T1}{zplLF}{bx}{sl}{<->ssub * zplLF/b/sl}{}
+ \DeclareFontShape{T1}{zpllf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-lf-t1}{}
+ \DeclareFontShape{T1}{zpllf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-lf-t1}{}
+ \DeclareFontShape{T1}{zpllf}{bx}{sl}{<->ssub * zpllf/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{T1}{zplLF}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-t1}{}
- \DeclareFontShape{T1}{zplLF}{b}{sl}{<->ssub * zplLF/m/sl}{}
- \DeclareFontShape{T1}{zplLF}{bx}{sl}{<->ssub * zplLF/m/sl}{}
+ \DeclareFontShape{T1}{zpllf}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-t1}{}
+ \DeclareFontShape{T1}{zpllf}{b}{sl}{<->ssub * zpllf/m/sl}{}
+ \DeclareFontShape{T1}{zpllf}{bx}{sl}{<->ssub * zpllf/m/sl}{}
\fi
-\DeclareFontShape{T1}{zplLF}{b}{scsl}{<->ssub * zplLF/b/scit}{}
-\DeclareFontShape{T1}{zplLF}{m}{scsl}{<->ssub * zplLF/m/scit}{}
-\DeclareFontShape{T1}{zplLF}{b}{scsl}{<->ssub * zplLF/b/scit}{}
+\DeclareFontShape{T1}{zpllf}{b}{scsl}{<->ssub * zpllf/b/scit}{}
+\DeclareFontShape{T1}{zpllf}{m}{scsl}{<->ssub * zpllf/m/scit}{}
+\DeclareFontShape{T1}{zpllf}{b}{scsl}{<->ssub * zpllf/b/scit}{}
\endinput
diff --git a/fonts/newpx/tex/t1zplosf.fd b/fonts/newpx/tex/t1zplosf.fd
index 1eca4cea2f..b403ce84fb 100644
--- a/fonts/newpx/tex/t1zplosf.fd
+++ b/fonts/newpx/tex/t1zplosf.fd
@@ -1,6 +1,6 @@
-\ProvidesFile{t1zplosf.fd}[2021/05/25 v1.0 font definition file for T1/zpl/OsF]
+\ProvidesFile{t1zplosf.fd}[2021/05/25 v1.0 font definition file for T1/zpl/osf]
-\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
+\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{}
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
@@ -11,29 +11,29 @@
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{T1}{zplOsF}{\zpl@spacing}
-\DeclareFontShape{T1}{zplOsF}{b}{sc}{<-> \zpl@scaled zpl-Bold-osf-sc\zpl@lsfx-t1}{}
-\DeclareFontShape{T1}{zplOsF}{b}{n}{<-> \zpl@scaled zpl-Bold-osf-t1}{}
-\DeclareFontShape{T1}{zplOsF}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-osf-sc\zpl@lsfx-t1}{}
-\DeclareFontShape{T1}{zplOsF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-osf-t1}{}
-\DeclareFontShape{T1}{zplOsF}{m}{sc}{<-> \zpl@scaled zpl-Regular-osf-sc\zpl@lsfx-t1}{}
-\DeclareFontShape{T1}{zplOsF}{m}{n}{<-> \zpl@scaled zpl-Regular-osf-t1}{}
-\DeclareFontShape{T1}{zplOsF}{m}{scit}{<-> \zpl@scaled zpl-Italic-osf-sc\zpl@lsfx-t1}{}
-\DeclareFontShape{T1}{zplOsF}{m}{it}{<-> \zpl@scaled zpl-Italic-osf-t1}{}
-\DeclareFontShape{T1}{zplOsF}{bx}{sc}{<->ssub * zplOsF/b/sc}{}
-\DeclareFontShape{T1}{zplOsF}{bx}{n}{<->ssub * zplOsF/b/n}{}
-\DeclareFontShape{T1}{zplOsF}{bx}{scit}{<->ssub * zplOsF/b/scit}{}
-\DeclareFontShape{T1}{zplOsF}{bx}{it}{<->ssub * zplOsF/b/it}{}
+\DeclareFontFamily{T1}{zplosf}{\zpl@spacing}
+\DeclareFontShape{T1}{zplosf}{b}{sc}{<-> \zpl@scaled zpl-Bold-osf-sc\zpl@lsfx-t1}{}
+\DeclareFontShape{T1}{zplosf}{b}{n}{<-> \zpl@scaled zpl-Bold-osf-t1}{}
+\DeclareFontShape{T1}{zplosf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-osf-sc\zpl@lsfx-t1}{}
+\DeclareFontShape{T1}{zplosf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-osf-t1}{}
+\DeclareFontShape{T1}{zplosf}{m}{sc}{<-> \zpl@scaled zpl-Regular-osf-sc\zpl@lsfx-t1}{}
+\DeclareFontShape{T1}{zplosf}{m}{n}{<-> \zpl@scaled zpl-Regular-osf-t1}{}
+\DeclareFontShape{T1}{zplosf}{m}{scit}{<-> \zpl@scaled zpl-Italic-osf-sc\zpl@lsfx-t1}{}
+\DeclareFontShape{T1}{zplosf}{m}{it}{<-> \zpl@scaled zpl-Italic-osf-t1}{}
+\DeclareFontShape{T1}{zplosf}{bx}{sc}{<->ssub * zplosf/b/sc}{}
+\DeclareFontShape{T1}{zplosf}{bx}{n}{<->ssub * zplosf/b/n}{}
+\DeclareFontShape{T1}{zplosf}{bx}{scit}{<->ssub * zplosf/b/scit}{}
+\DeclareFontShape{T1}{zplosf}{bx}{it}{<->ssub * zplosf/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{T1}{zplOsF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-osf-t1}{}
- \DeclareFontShape{T1}{zplOsF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-osf-t1}{}
- \DeclareFontShape{T1}{zplOsF}{bx}{sl}{<->ssub * zplOsF/b/sl}{}
+ \DeclareFontShape{T1}{zplosf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-osf-t1}{}
+ \DeclareFontShape{T1}{zplosf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-osf-t1}{}
+ \DeclareFontShape{T1}{zplosf}{bx}{sl}{<->ssub * zplosf/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{T1}{zplOsF}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-t1}{}
- \DeclareFontShape{T1}{zplOsF}{b}{sl}{<->ssub * zplOsF/m/sl}{}
- \DeclareFontShape{T1}{zplOsF}{bx}{sl}{<->ssub * zplOsF/m/sl}{}
+ \DeclareFontShape{T1}{zplosf}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-t1}{}
+ \DeclareFontShape{T1}{zplosf}{b}{sl}{<->ssub * zplosf/m/sl}{}
+ \DeclareFontShape{T1}{zplosf}{bx}{sl}{<->ssub * zplosf/m/sl}{}
\fi
-\DeclareFontShape{T1}{zplOsF}{b}{scsl}{<->ssub * zplOsF/b/scit}{}
-\DeclareFontShape{T1}{zplOsF}{m}{scsl}{<->ssub * zplOsF/m/scit}{}
-\DeclareFontShape{T1}{zplOsF}{bx}{scsl}{<->ssub * zplOsF/b/scit}{}
+\DeclareFontShape{T1}{zplosf}{b}{scsl}{<->ssub * zplosf/b/scit}{}
+\DeclareFontShape{T1}{zplosf}{m}{scsl}{<->ssub * zplosf/m/scit}{}
+\DeclareFontShape{T1}{zplosf}{bx}{scsl}{<->ssub * zplosf/b/scit}{}
\endinput
diff --git a/fonts/newpx/tex/t1zpltlf.fd b/fonts/newpx/tex/t1zpltlf.fd
index 55eed53ceb..ad19ffb543 100644
--- a/fonts/newpx/tex/t1zpltlf.fd
+++ b/fonts/newpx/tex/t1zpltlf.fd
@@ -1,6 +1,6 @@
-\ProvidesFile{t1zpltlf.fd}[2021/05/25 v1.0 font definition file for T1/zpl/TLF]
+\ProvidesFile{t1zpltlf.fd}[2021/05/25 v1.0 font definition file for T1/zpl/tlf]
-\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
+\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{}
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
@@ -10,29 +10,29 @@
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{T1}{zplTLF}{\zpl@spacing}
-\DeclareFontShape{T1}{zplTLF}{b}{sc}{<-> \zpl@scaled zpl-Bold-tlf-sc\zpl@lsfx-t1}{}
-\DeclareFontShape{T1}{zplTLF}{b}{n}{<-> \zpl@scaled zpl-Bold-tlf-t1}{}
-\DeclareFontShape{T1}{zplTLF}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-tlf-sc\zpl@lsfx-t1}{}
-\DeclareFontShape{T1}{zplTLF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tlf-t1}{}
-\DeclareFontShape{T1}{zplTLF}{m}{sc}{<-> \zpl@scaled zpl-Regular-tlf-sc\zpl@lsfx-t1}{}
-\DeclareFontShape{T1}{zplTLF}{m}{n}{<-> \zpl@scaled zpl-Regular-tlf-t1}{}
-\DeclareFontShape{T1}{zplTLF}{m}{scit}{<-> \zpl@scaled zpl-Italic-tlf-sc\zpl@lsfx-t1}{}
-\DeclareFontShape{T1}{zplTLF}{m}{it}{<-> \zpl@scaled zpl-Italic-tlf-t1}{}
-\DeclareFontShape{T1}{zplTLF}{bx}{sc}{<->ssub * zplTLF/b/sc}{}
-\DeclareFontShape{T1}{zplTLF}{bx}{n}{<->ssub * zplTLF/b/n}{}
-\DeclareFontShape{T1}{zplTLF}{bx}{scit}{<->ssub * zplTLF/b/scit}{}
-\DeclareFontShape{T1}{zplTLF}{bx}{it}{<->ssub * zplTLF/b/it}{}
+\DeclareFontFamily{T1}{zpltlf}{\zpl@spacing}
+\DeclareFontShape{T1}{zpltlf}{b}{sc}{<-> \zpl@scaled zpl-Bold-tlf-sc\zpl@lsfx-t1}{}
+\DeclareFontShape{T1}{zpltlf}{b}{n}{<-> \zpl@scaled zpl-Bold-tlf-t1}{}
+\DeclareFontShape{T1}{zpltlf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-tlf-sc\zpl@lsfx-t1}{}
+\DeclareFontShape{T1}{zpltlf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tlf-t1}{}
+\DeclareFontShape{T1}{zpltlf}{m}{sc}{<-> \zpl@scaled zpl-Regular-tlf-sc\zpl@lsfx-t1}{}
+\DeclareFontShape{T1}{zpltlf}{m}{n}{<-> \zpl@scaled zpl-Regular-tlf-t1}{}
+\DeclareFontShape{T1}{zpltlf}{m}{scit}{<-> \zpl@scaled zpl-Italic-tlf-sc\zpl@lsfx-t1}{}
+\DeclareFontShape{T1}{zpltlf}{m}{it}{<-> \zpl@scaled zpl-Italic-tlf-t1}{}
+\DeclareFontShape{T1}{zpltlf}{bx}{sc}{<->ssub * zpltlf/b/sc}{}
+\DeclareFontShape{T1}{zpltlf}{bx}{n}{<->ssub * zpltlf/b/n}{}
+\DeclareFontShape{T1}{zpltlf}{bx}{scit}{<->ssub * zpltlf/b/scit}{}
+\DeclareFontShape{T1}{zpltlf}{bx}{it}{<->ssub * zpltlf/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{T1}{zplTLF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tlf-t1}{}
- \DeclareFontShape{T1}{zplTLF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tlf-t1}{}
- \DeclareFontShape{T1}{zplTLF}{bx}{sl}{<->ssub * zplTLF/b/sl}{}
+ \DeclareFontShape{T1}{zpltlf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tlf-t1}{}
+ \DeclareFontShape{T1}{zpltlf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tlf-t1}{}
+ \DeclareFontShape{T1}{zpltlf}{bx}{sl}{<->ssub * zpltlf/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{T1}{zplTLF}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-t1}{}
- \DeclareFontShape{T1}{zplTLF}{b}{sl}{<->ssub * zplTLF/m/sl}{}
- \DeclareFontShape{T1}{zplTLF}{bx}{sl}{<->ssub * zplTLF/m/sl}{}
+ \DeclareFontShape{T1}{zpltlf}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-t1}{}
+ \DeclareFontShape{T1}{zpltlf}{b}{sl}{<->ssub * zpltlf/m/sl}{}
+ \DeclareFontShape{T1}{zpltlf}{bx}{sl}{<->ssub * zpltlf/m/sl}{}
\fi
-\DeclareFontShape{T1}{zplTLF}{b}{scsl}{<->ssub * zplTLF/b/scit}{}
-\DeclareFontShape{T1}{zplTLF}{m}{scsl}{<->ssub * zplTLF/m/scit}{}
-\DeclareFontShape{T1}{zplTLF}{bx}{scsl}{<->ssub * zplTLF/b/scit}{}
+\DeclareFontShape{T1}{zpltlf}{b}{scsl}{<->ssub * zpltlf/b/scit}{}
+\DeclareFontShape{T1}{zpltlf}{m}{scsl}{<->ssub * zpltlf/m/scit}{}
+\DeclareFontShape{T1}{zpltlf}{bx}{scsl}{<->ssub * zpltlf/b/scit}{}
\endinput
diff --git a/fonts/newpx/tex/t1zpltosf.fd b/fonts/newpx/tex/t1zpltosf.fd
index cb4b8f4f99..bda43810cd 100644
--- a/fonts/newpx/tex/t1zpltosf.fd
+++ b/fonts/newpx/tex/t1zpltosf.fd
@@ -1,6 +1,6 @@
-\ProvidesFile{t1zpltosf.fd}[2021/05/25 v1.0 font definition file for T1/zpl/TOsF]
+\ProvidesFile{t1zpltosf.fd}[2021/05/25 v1.0 font definition file for T1/zpl/tosf]
-\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
+\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{}
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
@@ -12,29 +12,29 @@
\ifdefined\zpl@adobescfalse\zpl@makeadobesc\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{T1}{zplTOsF}{\zpl@spacing}
-\DeclareFontShape{T1}{zplTOsF}{b}{sc}{<-> \zpl@scaled zpl-Bold-tosf-sc\zpl@lsfx\zpl@asfx-t1}{}
-\DeclareFontShape{T1}{zplTOsF}{b}{n}{<-> \zpl@scaled zpl-Bold-tosf-t1}{}
-\DeclareFontShape{T1}{zplTOsF}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-tosf-sc\zpl@lsfx-t1}{}
-\DeclareFontShape{T1}{zplTOsF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tosf-t1}{}
-\DeclareFontShape{T1}{zplTOsF}{m}{sc}{<-> \zpl@scaled zpl-Regular-tosf-sc\zpl@lsfx\zpl@asfx-t1}{}
-\DeclareFontShape{T1}{zplTOsF}{m}{n}{<-> \zpl@scaled zpl-Regular-tosf-t1}{}
-\DeclareFontShape{T1}{zplTOsF}{m}{scit}{<-> \zpl@scaled zpl-Italic-tosf-sc\zpl@lsfx-t1}{}
-\DeclareFontShape{T1}{zplTOsF}{m}{it}{<-> \zpl@scaled zpl-Italic-tosf-t1}{}
-\DeclareFontShape{T1}{zplTOsF}{bx}{sc}{<->ssub * zplTOsF/b/sc}{}
-\DeclareFontShape{T1}{zplTOsF}{bx}{n}{<->ssub * zplTOsF/b/n}{}
-\DeclareFontShape{T1}{zplTOsF}{bx}{scit}{<->ssub * zplTOsF/b/scit}{}
-\DeclareFontShape{T1}{zplTOsF}{bx}{it}{<->ssub * zplTOsF/b/it}{}
+\DeclareFontFamily{T1}{zpltosf}{\zpl@spacing}
+\DeclareFontShape{T1}{zpltosf}{b}{sc}{<-> \zpl@scaled zpl-Bold-tosf-sc\zpl@lsfx\zpl@asfx-t1}{}
+\DeclareFontShape{T1}{zpltosf}{b}{n}{<-> \zpl@scaled zpl-Bold-tosf-t1}{}
+\DeclareFontShape{T1}{zpltosf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-tosf-sc\zpl@lsfx-t1}{}
+\DeclareFontShape{T1}{zpltosf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tosf-t1}{}
+\DeclareFontShape{T1}{zpltosf}{m}{sc}{<-> \zpl@scaled zpl-Regular-tosf-sc\zpl@lsfx\zpl@asfx-t1}{}
+\DeclareFontShape{T1}{zpltosf}{m}{n}{<-> \zpl@scaled zpl-Regular-tosf-t1}{}
+\DeclareFontShape{T1}{zpltosf}{m}{scit}{<-> \zpl@scaled zpl-Italic-tosf-sc\zpl@lsfx-t1}{}
+\DeclareFontShape{T1}{zpltosf}{m}{it}{<-> \zpl@scaled zpl-Italic-tosf-t1}{}
+\DeclareFontShape{T1}{zpltosf}{bx}{sc}{<->ssub * zpltosf/b/sc}{}
+\DeclareFontShape{T1}{zpltosf}{bx}{n}{<->ssub * zpltosf/b/n}{}
+\DeclareFontShape{T1}{zpltosf}{bx}{scit}{<->ssub * zpltosf/b/scit}{}
+\DeclareFontShape{T1}{zpltosf}{bx}{it}{<->ssub * zpltosf/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{T1}{zplTOsF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tosf-t1}{}
- \DeclareFontShape{T1}{zplTOsF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tosf-t1}{}
- \DeclareFontShape{T1}{zplTOsF}{bx}{sl}{<->ssub * zplTOsF/b/sl}{}
+ \DeclareFontShape{T1}{zpltosf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tosf-t1}{}
+ \DeclareFontShape{T1}{zpltosf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tosf-t1}{}
+ \DeclareFontShape{T1}{zpltosf}{bx}{sl}{<->ssub * zpltosf/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{T1}{zplTOsF}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-t1}{}
- \DeclareFontShape{T1}{zplTOsF}{b}{sl}{<->ssub * zplTOsF/m/sl}{}
- \DeclareFontShape{T1}{zplTOsF}{bx}{sl}{<->ssub * zplTOsF/m/sl}{}
+ \DeclareFontShape{T1}{zpltosf}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-t1}{}
+ \DeclareFontShape{T1}{zpltosf}{b}{sl}{<->ssub * zpltosf/m/sl}{}
+ \DeclareFontShape{T1}{zpltosf}{bx}{sl}{<->ssub * zpltosf/m/sl}{}
\fi
-\DeclareFontShape{T1}{zplTOsF}{b}{scsl}{<->ssub * zplTOsF/b/scit}{}
-\DeclareFontShape{T1}{zplTOsF}{bx}{scsl}{<->ssub * zplTOsF/b/scit}{}
-\DeclareFontShape{T1}{zplTOsF}{m}{scsl}{<->ssub * zplTOsF/m/scit}{}
+\DeclareFontShape{T1}{zpltosf}{b}{scsl}{<->ssub * zpltosf/b/scit}{}
+\DeclareFontShape{T1}{zpltosf}{bx}{scsl}{<->ssub * zpltosf/b/scit}{}
+\DeclareFontShape{T1}{zpltosf}{m}{scsl}{<->ssub * zpltosf/m/scit}{}
\endinput
diff --git a/fonts/newpx/tex/ts1zpllf.fd b/fonts/newpx/tex/ts1zpllf.fd
index 50b59fd2b4..dc9216ce49 100644
--- a/fonts/newpx/tex/ts1zpllf.fd
+++ b/fonts/newpx/tex/ts1zpllf.fd
@@ -1,24 +1,24 @@
-\ProvidesFile{ts1zpllf.fd}[2021/11/24 v1.0 fd file for TS1/zplLF]
+\ProvidesFile{TS1zpllf.fd}[2021/11/24 v1.0 fd file for TS1/zplLF]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{TS1}{zplLF}{\zpl@spacing}
-\DeclareFontShape{TS1}{zplLF}{b}{n}{<-> \zpl@scaled zplLF-Bold-ts1}{}
-\DeclareFontShape{TS1}{zplLF}{b}{it}{<-> \zpl@scaled zplLF-BoldItalic-ts1}{}
-\DeclareFontShape{TS1}{zplLF}{m}{n}{<-> \zpl@scaled zplLF-Regular-ts1}{}
-\DeclareFontShape{TS1}{zplLF}{m}{it}{<-> \zpl@scaled zplLF-Italic-ts1}{}
-\DeclareFontShape{TS1}{zplLF}{m}{sl}{<-> \zpl@scaled zplLF-Slanted-ts1}{}
-\DeclareFontShape{TS1}{zplLF}{b}{sl}{<-> \zpl@scaled zplLF-BoldSlanted-ts1}{}
-\DeclareFontShape{TS1}{zplLF}{bx}{n}{<->ssub * zplLF/b/n}{}
-\DeclareFontShape{TS1}{zplLF}{bx}{it}{<->ssub * zplLF/b/it}{}
-\DeclareFontShape{TS1}{zplLF}{bx}{sl}{<->ssub * zplLF/b/sl}{}
-\DeclareFontShape{TS1}{zplLF}{m}{sc}{<->ssub * zplLF/m/n}{}
-\DeclareFontShape{TS1}{zplLF}{m}{scit}{<->ssub * zplLF/m/it}{}
-\DeclareFontShape{TS1}{zplLF}{b}{sc}{<->ssub * zplLF/b/n}{}
-\DeclareFontShape{TS1}{zplLF}{b}{scit}{<->ssub * zplLF/b/it}{}
-\DeclareFontShape{TS1}{zplLF}{bx}{sc}{<->ssub * zplLF/b/n}{}
-\DeclareFontShape{TS1}{zplLF}{bx}{scit}{<->ssub * zplLF/b/it}{}
+\DeclareFontFamily{TS1}{zpllf}{\zpl@spacing}
+\DeclareFontShape{TS1}{zpllf}{b}{n}{<-> \zpl@scaled zplLF-Bold-ts1}{}
+\DeclareFontShape{TS1}{zpllf}{b}{it}{<-> \zpl@scaled zplLF-BoldItalic-ts1}{}
+\DeclareFontShape{TS1}{zpllf}{m}{n}{<-> \zpl@scaled zplLF-Regular-ts1}{}
+\DeclareFontShape{TS1}{zpllf}{m}{it}{<-> \zpl@scaled zplLF-Italic-ts1}{}
+\DeclareFontShape{TS1}{zpllf}{m}{sl}{<-> \zpl@scaled zplLF-Slanted-ts1}{}
+\DeclareFontShape{TS1}{zpllf}{b}{sl}{<-> \zpl@scaled zplLF-BoldSlanted-ts1}{}
+\DeclareFontShape{TS1}{zpllf}{bx}{n}{<->ssub * zplLF/b/n}{}
+\DeclareFontShape{TS1}{zpllf}{bx}{it}{<->ssub * zplLF/b/it}{}
+\DeclareFontShape{TS1}{zpllf}{bx}{sl}{<->ssub * zplLF/b/sl}{}
+\DeclareFontShape{TS1}{zpllf}{m}{sc}{<->ssub * zplLF/m/n}{}
+\DeclareFontShape{TS1}{zpllf}{m}{scit}{<->ssub * zplLF/m/it}{}
+\DeclareFontShape{TS1}{zpllf}{b}{sc}{<->ssub * zplLF/b/n}{}
+\DeclareFontShape{TS1}{zpllf}{b}{scit}{<->ssub * zplLF/b/it}{}
+\DeclareFontShape{TS1}{zpllf}{bx}{sc}{<->ssub * zplLF/b/n}{}
+\DeclareFontShape{TS1}{zpllf}{bx}{scit}{<->ssub * zplLF/b/it}{}
\endinput
diff --git a/fonts/newpx/tex/ts1zplosf.fd b/fonts/newpx/tex/ts1zplosf.fd
index 8c45a451ca..7362847b7a 100644
--- a/fonts/newpx/tex/ts1zplosf.fd
+++ b/fonts/newpx/tex/ts1zplosf.fd
@@ -1,24 +1,24 @@
-\ProvidesFile{ts1zplosf.fd}[2021/11/24 v1.0 fd file for TS1/zplOsF]
+\ProvidesFile{ts1zplosf.fd}[2021/11/24 v1.0 fd file for TS1/zplosf]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{TS1}{zplOsF}{\zpl@spacing}
-\DeclareFontShape{TS1}{zplOsF}{b}{n}{<-> \zpl@scaled zplOsF-Bold-ts1}{}
-\DeclareFontShape{TS1}{zplOsF}{b}{it}{<-> \zpl@scaled zplOsF-BoldItalic-ts1}{}
-\DeclareFontShape{TS1}{zplOsF}{m}{n}{<-> \zpl@scaled zplOsF-Regular-ts1}{}
-\DeclareFontShape{TS1}{zplOsF}{m}{it}{<-> \zpl@scaled zplOsF-Italic-ts1}{}
-\DeclareFontShape{TS1}{zplOsF}{m}{sl}{<-> \zpl@scaled zplOsF-Slanted-ts1}{}
-\DeclareFontShape{TS1}{zplOsF}{b}{sl}{<-> \zpl@scaled zplOsF-BoldSlanted-ts1}{}
-\DeclareFontShape{TS1}{zplOsF}{bx}{n}{<->ssub * zplOsF/b/n}{}
-\DeclareFontShape{TS1}{zplOsF}{bx}{it}{<->ssub * zplOsF/b/it}{}
-\DeclareFontShape{TS1}{zplOsF}{m}{sc}{<->ssub * zplOsF/m/n}{}
-\DeclareFontShape{TS1}{zplOsF}{m}{scit}{<->ssub * zplOsF/m/it}{}
-\DeclareFontShape{TS1}{zplOsF}{b}{sc}{<->ssub * zplOsF/b/n}{}
-\DeclareFontShape{TS1}{zplOsF}{b}{scit}{<->ssub * zplOsF/b/it}{}
-\DeclareFontShape{TS1}{zplOsF}{bx}{sc}{<->ssub * zplOsF/b/n}{}
-\DeclareFontShape{TS1}{zplOsF}{bx}{scit}{<->ssub * zplOsF/b/it}{}
-\DeclareFontShape{TS1}{zplOsF}{bx}{sl}{<->ssub * zplOsF/b/sl}{}
+\DeclareFontFamily{TS1}{zplosf}{\zpl@spacing}
+\DeclareFontShape{TS1}{zplosf}{b}{n}{<-> \zpl@scaled zplOsF-Bold-ts1}{}
+\DeclareFontShape{TS1}{zplosf}{b}{it}{<-> \zpl@scaled zplOsF-BoldItalic-ts1}{}
+\DeclareFontShape{TS1}{zplosf}{m}{n}{<-> \zpl@scaled zplOsF-Regular-ts1}{}
+\DeclareFontShape{TS1}{zplosf}{m}{it}{<-> \zpl@scaled zplOsF-Italic-ts1}{}
+\DeclareFontShape{TS1}{zplosf}{m}{sl}{<-> \zpl@scaled zplOsF-Slanted-ts1}{}
+\DeclareFontShape{TS1}{zplosf}{b}{sl}{<-> \zpl@scaled zplOsF-BoldSlanted-ts1}{}
+\DeclareFontShape{TS1}{zplosf}{bx}{n}{<->ssub * zplosf/b/n}{}
+\DeclareFontShape{TS1}{zplosf}{bx}{it}{<->ssub * zplosf/b/it}{}
+\DeclareFontShape{TS1}{zplosf}{m}{sc}{<->ssub * zplosf/m/n}{}
+\DeclareFontShape{TS1}{zplosf}{m}{scit}{<->ssub * zplosf/m/it}{}
+\DeclareFontShape{TS1}{zplosf}{b}{sc}{<->ssub * zplosf/b/n}{}
+\DeclareFontShape{TS1}{zplosf}{b}{scit}{<->ssub * zplosf/b/it}{}
+\DeclareFontShape{TS1}{zplosf}{bx}{sc}{<->ssub * zplosf/b/n}{}
+\DeclareFontShape{TS1}{zplosf}{bx}{scit}{<->ssub * zplosf/b/it}{}
+\DeclareFontShape{TS1}{zplosf}{bx}{sl}{<->ssub * zplosf/b/sl}{}
\endinput
diff --git a/fonts/newpx/tex/ts1zpltlf.fd b/fonts/newpx/tex/ts1zpltlf.fd
index d16ecc401b..514358dac3 100644
--- a/fonts/newpx/tex/ts1zpltlf.fd
+++ b/fonts/newpx/tex/ts1zpltlf.fd
@@ -5,20 +5,20 @@
\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{TS1}{zplTLF}{\zpl@spacing}
-\DeclareFontShape{TS1}{zplTLF}{b}{n}{<-> \zpl@scaled zplTLF-Bold-ts1}{}
-\DeclareFontShape{TS1}{zplTLF}{b}{it}{<-> \zpl@scaled zplTLF-BoldItalic-ts1}{}
-\DeclareFontShape{TS1}{zplTLF}{m}{n}{<-> \zpl@scaled zplTLF-Regular-ts1}{}
-\DeclareFontShape{TS1}{zplTLF}{m}{it}{<-> \zpl@scaled zplTLF-Italic-ts1}{}
-\DeclareFontShape{TS1}{zplTLF}{m}{sl}{<-> \zpl@scaled zplTLF-Slanted-ts1}{}
-\DeclareFontShape{TS1}{zplTLF}{b}{sl}{<-> \zpl@scaled zplTLF-BoldSlanted-ts1}{}
-\DeclareFontShape{TS1}{zplTLF}{bx}{n}{<->ssub * zplTLF/b/n}{}
-\DeclareFontShape{TS1}{zplTLF}{bx}{it}{<->ssub * zplTLF/b/it}{}
-\DeclareFontShape{TS1}{zplTLF}{m}{sc}{<->ssub * zplTLF/m/n}{}
-\DeclareFontShape{TS1}{zplTLF}{m}{scit}{<->ssub * zplTLF/m/it}{}
-\DeclareFontShape{TS1}{zplTLF}{b}{sc}{<->ssub * zplTLF/b/n}{}
-\DeclareFontShape{TS1}{zplTLF}{b}{scit}{<->ssub * zplTLF/b/it}{}
-\DeclareFontShape{TS1}{zplTLF}{bx}{sc}{<->ssub * zplTLF/b/n}{}
-\DeclareFontShape{TS1}{zplTLF}{bx}{scit}{<->ssub * zplTLF/b/it}{}
-\DeclareFontShape{TS1}{zplTLF}{bx}{sl}{<->ssub * zplTLF/b/sl}{}
+\DeclareFontFamily{TS1}{zpltlf}{\zpl@spacing}
+\DeclareFontShape{TS1}{zpltlf}{b}{n}{<-> \zpl@scaled zplTLF-Bold-ts1}{}
+\DeclareFontShape{TS1}{zpltlf}{b}{it}{<-> \zpl@scaled zplTLF-BoldItalic-ts1}{}
+\DeclareFontShape{TS1}{zpltlf}{m}{n}{<-> \zpl@scaled zplTLF-Regular-ts1}{}
+\DeclareFontShape{TS1}{zpltlf}{m}{it}{<-> \zpl@scaled zplTLF-Italic-ts1}{}
+\DeclareFontShape{TS1}{zpltlf}{m}{sl}{<-> \zpl@scaled zplTLF-Slanted-ts1}{}
+\DeclareFontShape{TS1}{zpltlf}{b}{sl}{<-> \zpl@scaled zplTLF-BoldSlanted-ts1}{}
+\DeclareFontShape{TS1}{zpltlf}{bx}{n}{<->ssub * zpltlf/b/n}{}
+\DeclareFontShape{TS1}{zpltlf}{bx}{it}{<->ssub * zpltlf/b/it}{}
+\DeclareFontShape{TS1}{zpltlf}{m}{sc}{<->ssub * zpltlf/m/n}{}
+\DeclareFontShape{TS1}{zpltlf}{m}{scit}{<->ssub * zpltlf/m/it}{}
+\DeclareFontShape{TS1}{zpltlf}{b}{sc}{<->ssub * zpltlf/b/n}{}
+\DeclareFontShape{TS1}{zpltlf}{b}{scit}{<->ssub * zpltlf/b/it}{}
+\DeclareFontShape{TS1}{zpltlf}{bx}{sc}{<->ssub * zpltlf/b/n}{}
+\DeclareFontShape{TS1}{zpltlf}{bx}{scit}{<->ssub * zpltlf/b/it}{}
+\DeclareFontShape{TS1}{zpltlf}{bx}{sl}{<->ssub * zpltlf/b/sl}{}
\endinput
diff --git a/fonts/newpx/tex/ts1zpltosf.fd b/fonts/newpx/tex/ts1zpltosf.fd
index 9fc5aa68e5..63a4c154c7 100644
--- a/fonts/newpx/tex/ts1zpltosf.fd
+++ b/fonts/newpx/tex/ts1zpltosf.fd
@@ -5,20 +5,20 @@
\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{TS1}{zplTOsF}{\zpl@spacing}
-\DeclareFontShape{TS1}{zplTOsF}{b}{n}{<-> \zpl@scaled zplTOsF-Bold-ts1}{}
-\DeclareFontShape{TS1}{zplTOsF}{b}{it}{<-> \zpl@scaled zplTOsF-BoldItalic-ts1}{}
-\DeclareFontShape{TS1}{zplTOsF}{m}{n}{<-> \zpl@scaled zplTOsF-Regular-ts1}{}
-\DeclareFontShape{TS1}{zplTOsF}{m}{it}{<-> \zpl@scaled zplTOsF-Italic-ts1}{}
-\DeclareFontShape{TS1}{zplTOsF}{m}{sl}{<-> \zpl@scaled zplTOsF-Slanted-ts1}{}
-\DeclareFontShape{TS1}{zplTOsF}{b}{sl}{<-> \zpl@scaled zplTOsF-BoldSlanted-ts1}{}
-\DeclareFontShape{TS1}{zplTOsF}{bx}{n}{<->ssub * zplTOsF/b/n}{}
-\DeclareFontShape{TS1}{zplTOsF}{bx}{it}{<->ssub * zplTOsF/b/it}{}
-\DeclareFontShape{TS1}{zplTOsF}{m}{sc}{<->ssub * zplTOsF/m/n}{}
-\DeclareFontShape{TS1}{zplTOsF}{m}{scit}{<->ssub * zplTOsF/m/it}{}
-\DeclareFontShape{TS1}{zplTOsF}{b}{sc}{<->ssub * zplTOsF/b/n}{}
-\DeclareFontShape{TS1}{zplTOsF}{b}{scit}{<->ssub * zplTOsF/b/it}{}
-\DeclareFontShape{TS1}{zplTOsF}{bx}{sc}{<->ssub * zplTOsF/b/n}{}
-\DeclareFontShape{TS1}{zplTOsF}{bx}{scit}{<->ssub * zplTOsF/b/it}{}
-\DeclareFontShape{TS1}{zplTOsF}{bx}{sl}{<->ssub * zplTOsF/b/sl}{}
+\DeclareFontFamily{TS1}{zpltosf}{\zpl@spacing}
+\DeclareFontShape{TS1}{zpltosf}{b}{n}{<-> \zpl@scaled zplTOsF-Bold-ts1}{}
+\DeclareFontShape{TS1}{zpltosf}{b}{it}{<-> \zpl@scaled zplTOsF-BoldItalic-ts1}{}
+\DeclareFontShape{TS1}{zpltosf}{m}{n}{<-> \zpl@scaled zplTOsF-Regular-ts1}{}
+\DeclareFontShape{TS1}{zpltosf}{m}{it}{<-> \zpl@scaled zplTOsF-Italic-ts1}{}
+\DeclareFontShape{TS1}{zpltosf}{m}{sl}{<-> \zpl@scaled zplTOsF-Slanted-ts1}{}
+\DeclareFontShape{TS1}{zpltosf}{b}{sl}{<-> \zpl@scaled zplTOsF-BoldSlanted-ts1}{}
+\DeclareFontShape{TS1}{zpltosf}{bx}{n}{<->ssub * zpltosf/b/n}{}
+\DeclareFontShape{TS1}{zpltosf}{bx}{it}{<->ssub * zpltosf/b/it}{}
+\DeclareFontShape{TS1}{zpltosf}{m}{sc}{<->ssub * zpltosf/m/n}{}
+\DeclareFontShape{TS1}{zpltosf}{m}{scit}{<->ssub * zpltosf/m/it}{}
+\DeclareFontShape{TS1}{zpltosf}{b}{sc}{<->ssub * zpltosf/b/n}{}
+\DeclareFontShape{TS1}{zpltosf}{b}{scit}{<->ssub * zpltosf/b/it}{}
+\DeclareFontShape{TS1}{zpltosf}{bx}{sc}{<->ssub * zpltosf/b/n}{}
+\DeclareFontShape{TS1}{zpltosf}{bx}{scit}{<->ssub * zpltosf/b/it}{}
+\DeclareFontShape{TS1}{zpltosf}{bx}{sl}{<->ssub * zpltosf/b/sl}{}
\endinput
diff --git a/fonts/newpx/tfm/zplsups-Bold-ly1.tfm b/fonts/newpx/tfm/zplsups-Bold-ly1.tfm
index fdb41b4122..49861fc68c 100644
--- a/fonts/newpx/tfm/zplsups-Bold-ly1.tfm
+++ b/fonts/newpx/tfm/zplsups-Bold-ly1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-Bold-ot1.tfm b/fonts/newpx/tfm/zplsups-Bold-ot1.tfm
index c48c0c1784..16cb0b6647 100644
--- a/fonts/newpx/tfm/zplsups-Bold-ot1.tfm
+++ b/fonts/newpx/tfm/zplsups-Bold-ot1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-Bold-t1.tfm b/fonts/newpx/tfm/zplsups-Bold-t1.tfm
index 8979c858db..e0298b38e8 100644
--- a/fonts/newpx/tfm/zplsups-Bold-t1.tfm
+++ b/fonts/newpx/tfm/zplsups-Bold-t1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-Bold-ts1.tfm b/fonts/newpx/tfm/zplsups-Bold-ts1.tfm
index 590ebd1be0..4e22e9a927 100644
--- a/fonts/newpx/tfm/zplsups-Bold-ts1.tfm
+++ b/fonts/newpx/tfm/zplsups-Bold-ts1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-BoldItalic-ly1.tfm b/fonts/newpx/tfm/zplsups-BoldItalic-ly1.tfm
index a5bf388369..68e342fe3c 100644
--- a/fonts/newpx/tfm/zplsups-BoldItalic-ly1.tfm
+++ b/fonts/newpx/tfm/zplsups-BoldItalic-ly1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-BoldItalic-ot1.tfm b/fonts/newpx/tfm/zplsups-BoldItalic-ot1.tfm
index 19e87204de..ed9c1de09f 100644
--- a/fonts/newpx/tfm/zplsups-BoldItalic-ot1.tfm
+++ b/fonts/newpx/tfm/zplsups-BoldItalic-ot1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-BoldItalic-t1.tfm b/fonts/newpx/tfm/zplsups-BoldItalic-t1.tfm
index 8ba4fded64..c1bbeb9072 100644
--- a/fonts/newpx/tfm/zplsups-BoldItalic-t1.tfm
+++ b/fonts/newpx/tfm/zplsups-BoldItalic-t1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-BoldItalic-ts1.tfm b/fonts/newpx/tfm/zplsups-BoldItalic-ts1.tfm
index a09a407f67..678037816f 100644
--- a/fonts/newpx/tfm/zplsups-BoldItalic-ts1.tfm
+++ b/fonts/newpx/tfm/zplsups-BoldItalic-ts1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-BoldSlanted-ly1.tfm b/fonts/newpx/tfm/zplsups-BoldSlanted-ly1.tfm
new file mode 100644
index 0000000000..fe3dd3c453
--- /dev/null
+++ b/fonts/newpx/tfm/zplsups-BoldSlanted-ly1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-BoldSlanted-ot1.tfm b/fonts/newpx/tfm/zplsups-BoldSlanted-ot1.tfm
new file mode 100644
index 0000000000..cdd9382fb0
--- /dev/null
+++ b/fonts/newpx/tfm/zplsups-BoldSlanted-ot1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-BoldSlanted-t1.tfm b/fonts/newpx/tfm/zplsups-BoldSlanted-t1.tfm
new file mode 100644
index 0000000000..a0ea90b1ec
--- /dev/null
+++ b/fonts/newpx/tfm/zplsups-BoldSlanted-t1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-BoldSlanted-ts1.tfm b/fonts/newpx/tfm/zplsups-BoldSlanted-ts1.tfm
new file mode 100644
index 0000000000..58f01ad232
--- /dev/null
+++ b/fonts/newpx/tfm/zplsups-BoldSlanted-ts1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-Italic-ly1.tfm b/fonts/newpx/tfm/zplsups-Italic-ly1.tfm
index 9d99cbefd5..64f7e00acd 100644
--- a/fonts/newpx/tfm/zplsups-Italic-ly1.tfm
+++ b/fonts/newpx/tfm/zplsups-Italic-ly1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-Italic-ot1.tfm b/fonts/newpx/tfm/zplsups-Italic-ot1.tfm
index 4cc6018918..a4a753e40c 100644
--- a/fonts/newpx/tfm/zplsups-Italic-ot1.tfm
+++ b/fonts/newpx/tfm/zplsups-Italic-ot1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-Italic-t1.tfm b/fonts/newpx/tfm/zplsups-Italic-t1.tfm
index eb6b9c51ed..adb6ad7c80 100644
--- a/fonts/newpx/tfm/zplsups-Italic-t1.tfm
+++ b/fonts/newpx/tfm/zplsups-Italic-t1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-Italic-ts1.tfm b/fonts/newpx/tfm/zplsups-Italic-ts1.tfm
index c6b36cfe8c..a7e2c2fde1 100644
--- a/fonts/newpx/tfm/zplsups-Italic-ts1.tfm
+++ b/fonts/newpx/tfm/zplsups-Italic-ts1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-Regular-ly1.tfm b/fonts/newpx/tfm/zplsups-Regular-ly1.tfm
index 74ec255451..d6c1e4b63d 100644
--- a/fonts/newpx/tfm/zplsups-Regular-ly1.tfm
+++ b/fonts/newpx/tfm/zplsups-Regular-ly1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-Regular-ot1.tfm b/fonts/newpx/tfm/zplsups-Regular-ot1.tfm
index 529f77337a..14d44d16b1 100644
--- a/fonts/newpx/tfm/zplsups-Regular-ot1.tfm
+++ b/fonts/newpx/tfm/zplsups-Regular-ot1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-Regular-t1.tfm b/fonts/newpx/tfm/zplsups-Regular-t1.tfm
index af1b9de208..403236557a 100644
--- a/fonts/newpx/tfm/zplsups-Regular-t1.tfm
+++ b/fonts/newpx/tfm/zplsups-Regular-t1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-Regular-ts1.tfm b/fonts/newpx/tfm/zplsups-Regular-ts1.tfm
index 1f60b97d80..2ac2e51a9a 100644
--- a/fonts/newpx/tfm/zplsups-Regular-ts1.tfm
+++ b/fonts/newpx/tfm/zplsups-Regular-ts1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-Slanted-ly1.tfm b/fonts/newpx/tfm/zplsups-Slanted-ly1.tfm
new file mode 100644
index 0000000000..dd45e99b70
--- /dev/null
+++ b/fonts/newpx/tfm/zplsups-Slanted-ly1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-Slanted-ot1.tfm b/fonts/newpx/tfm/zplsups-Slanted-ot1.tfm
new file mode 100644
index 0000000000..73dcf86b5e
--- /dev/null
+++ b/fonts/newpx/tfm/zplsups-Slanted-ot1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-Slanted-t1.tfm b/fonts/newpx/tfm/zplsups-Slanted-t1.tfm
new file mode 100644
index 0000000000..e6b9619887
--- /dev/null
+++ b/fonts/newpx/tfm/zplsups-Slanted-t1.tfm
Binary files differ
diff --git a/fonts/newpx/tfm/zplsups-Slanted-ts1.tfm b/fonts/newpx/tfm/zplsups-Slanted-ts1.tfm
new file mode 100644
index 0000000000..f348a5ac28
--- /dev/null
+++ b/fonts/newpx/tfm/zplsups-Slanted-ts1.tfm
Binary files differ
diff --git a/fonts/newpx/type1/npxsups-Bold.pfb b/fonts/newpx/type1/npxsups-Bold.pfb
index bc9edfaeae..c8cfb5d354 100644
--- a/fonts/newpx/type1/npxsups-Bold.pfb
+++ b/fonts/newpx/type1/npxsups-Bold.pfb
Binary files differ
diff --git a/fonts/newpx/type1/npxsups-BoldItalic.pfb b/fonts/newpx/type1/npxsups-BoldItalic.pfb
index 3b239da0ba..75e64b0708 100644
--- a/fonts/newpx/type1/npxsups-BoldItalic.pfb
+++ b/fonts/newpx/type1/npxsups-BoldItalic.pfb
Binary files differ
diff --git a/fonts/newpx/type1/npxsups-Italic.pfb b/fonts/newpx/type1/npxsups-Italic.pfb
index 448a104ede..a663c41e04 100644
--- a/fonts/newpx/type1/npxsups-Italic.pfb
+++ b/fonts/newpx/type1/npxsups-Italic.pfb
Binary files differ
diff --git a/fonts/newpx/type1/npxsups-Regular.pfb b/fonts/newpx/type1/npxsups-Regular.pfb
index c02ea69b62..f05f31552c 100644
--- a/fonts/newpx/type1/npxsups-Regular.pfb
+++ b/fonts/newpx/type1/npxsups-Regular.pfb
Binary files differ
diff --git a/fonts/newpx/type1/npxsups-Slanted.pfb b/fonts/newpx/type1/npxsups-Slanted.pfb
index 08b8c751e1..9f831c1906 100644
--- a/fonts/newpx/type1/npxsups-Slanted.pfb
+++ b/fonts/newpx/type1/npxsups-Slanted.pfb
Binary files differ
diff --git a/graphics/pgf/contrib/tikz-osci/doc/tikz-osci-doc.pdf b/graphics/pgf/contrib/tikz-osci/doc/tikz-osci-doc.pdf
index 3d35f6a353..83f2438d7f 100644
--- a/graphics/pgf/contrib/tikz-osci/doc/tikz-osci-doc.pdf
+++ b/graphics/pgf/contrib/tikz-osci/doc/tikz-osci-doc.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/tikz-osci/doc/tikz-osci-doc.tex b/graphics/pgf/contrib/tikz-osci/doc/tikz-osci-doc.tex
index 0449e3cfd6..35088179cf 100644
--- a/graphics/pgf/contrib/tikz-osci/doc/tikz-osci-doc.tex
+++ b/graphics/pgf/contrib/tikz-osci/doc/tikz-osci-doc.tex
@@ -8,7 +8,7 @@
\usepackage{hyperref}
\title{TikZ Oscilloscope Package}
\author{Thibault Giauffret}
-\def\version{0.3.0}
+\def\version{0.4.0}
% Use sans serif font
\renewcommand{\familydefault}{\sfdefault}
@@ -34,7 +34,7 @@
\vspace{0.3cm}
{\huge \textbf{TikZ Oscilloscope Package}}\\[0.3cm]
{\Large Thibault Giauffret}\\[0.3cm]
- \textit{Version \version\ of \today}
+ \textit{Version \version\ of \today}\\[0.3cm]
\vspace{0.3cm}
\end{center}
\end{tcolorbox}
@@ -44,7 +44,11 @@
\begin{minipage}{0.5\linewidth}
\begin{center}
\osci[%
- scale=0.7
+ scale=0.7,
+ sample rate=500,
+ func one=1.78*sin(2*180/0.020*x),
+ horizontal cursor one=-1.78,
+ horizontal cursor two=1.78,
]
\end{center}
\end{minipage}
@@ -52,21 +56,22 @@
\begin{center}
\osci[%
scale=0.7,
- rounded corners=0,
second channel=1,
screen offset one=2,
screen offset two=-2,
- time div=20,
+ time div=10,
voltage div one=4,
voltage div two=1,
- sample rate=200,
+ sample rate=400,
xy mode=0,
- func one=2*sin(2*180/0.020*x),
+ func one=(sin(2*180*x/0.02)>0?6:-6),
func two=1*sin(2*180/0.020*x)+0.2*sin(2*180/0.040*x),
indicators=0,
- color one=D62626,
- color two=1053AF,
- graph back color=777799,
+ color one=FAC356,
+ color two=C18FFA,
+ color text one = 000000,
+ color text two = 000000,
+ graph back color=3C4A66,
info back color=333333,
info text color=FFFFFF,
main axis color=DDDDDD,
@@ -116,23 +121,40 @@ The package is loaded with the command \verb|\usepackage{tikz-osci}|. It defines
\texttt{voltage div one} & Voltage division of the first channel (in V). & Default: \texttt{1} \\\hline
\texttt{voltage div two} & Voltage division of the second channel (in V). & Default: \texttt{1} \\\hline
\texttt{sample rate} & Sample rate. & Default: \texttt{200} \\\hline
- \texttt{xy mode} & 1 if the oscilloscope is in XY mode (Lissajou curve), 0 otherwise. & Default : 0 \\\hline
+ \texttt{xy mode} & 1 if the oscilloscope is in XY mode (Lissajous curve), 0 otherwise. & Default : 0 \\\hline
\texttt{math mode} & 1 for addition, 2 for subtraction, 3 for multiplication, 4 for division, 0 otherwise. xy mode option must be set to 0. & Default: \texttt{0} \\\hline
\texttt{math mode hide source} & 0 to display channels CH1 and CH2 with the third channel, 1 to hide them. & Default : \texttt{0} \\\hline
\texttt{func one} & Expression of the first channel (pgf maths format). Trigonometric functions are defined in degrees. & Default: \texttt{2*sin(2*180/0.020*x)} \\\hline
\texttt{func two} & Expression of the second channel (pgf maths format). Trigonometric functions are defined in degrees. & Default: \texttt{1*sin(2*180/0.020*x) + 0.2*sin(2*180/0.040*x)} \\\hline
\texttt{indicators} & 1 if the channel indicators are enabled, 0 otherwise. & Default: \texttt{1} \\\hline
+ \texttt{horizontal cursor one} & Horizontal position of the first cursor (between -4 and 4). \texttt{false} to disable. & Default: \texttt{false} \\\hline
+ \texttt{horizontal cursor two} & Horizontal position of the second cursor (between -4 and 4). \texttt{false} to disable. & Default: \texttt{false} \\\hline
+ \texttt{vertical cursor one} & Vertical position of the first cursor (between -4 and 4). \texttt{false} to disable. & Default: \texttt{false} \\\hline
+ \texttt{vertical cursor two} & Vertical position of the second cursor (between -4 and 4). \texttt{false} to disable. & Default: \texttt{false} \\\hline
+ \texttt{cursor precision} & Number of digits after the decimal point for the cursor values. & Default: \texttt{1} \\\hline
\texttt{color one} & Color of the first channel (in hexadecimal). & Default: \texttt{D62626} \\\hline
\texttt{color text one} & Text color of the first channel (in hexadecimal). & Default: \texttt{FFFFFF} \\\hline
\texttt{color two} & Color of the second channel (in hexadecimal). & Default: \texttt{1053AF} \\\hline
\texttt{color text two} & Text color of the second channel (in hexadecimal). & Default: \texttt{FFFFFF} \\\hline
- \texttt{color three} & Color of the XY mode and the math mode (in hexadecimal). & Default: \texttt{2E8B73} \\\hline
- \texttt{color text three} & Text color of the XY mode and the math mode (in hexadecimal). & Default: \texttt{FFFFFF} \\\hline
+ \texttt{color three} & Color of the XY mode and the math mode (in hexadecimal). & Default: \texttt{2E8B73} \\\hline
+ \texttt{color text three} & Text color of the XY mode and the math mode (in hexadecimal). & Default: \texttt{FFFFFF} \\\hline
\texttt{graph back color} & Background color of the graph (in hexadecimal). & Default: \texttt{FFFFFF} \\\hline
\texttt{info back color} & Background color of the information box (in hexadecimal). & Default: \texttt{D6D6D6} \\\hline
\texttt{info text color} & Text color of the information box (in hexadecimal). & Default: \texttt{000000} \\\hline
\texttt{main axis color} & Color of the main axis (in hexadecimal). & Default: \texttt{000000} \\\hline
- \texttt{grid color} & Color of the grid (in hexadecimal). & Default: \texttt{CCCCCC} \\
+ \texttt{grid color} & Color of the grid (in hexadecimal). & Default: \texttt{CCCCCC}
+ \end{tabular}
+\end{tcolorbox}
+
+
+\begin{tcolorbox}[enhanced,breakable,colback=white,colframe=black,width=\textwidth,left=0mm,right=0mm,top=0mm,bottom=0mm,boxsep=0mm]
+ \begin{tabular}{p{0.2\textwidth}|p{0.47\textwidth}|p{0.255\textwidth}}
+
+ \texttt{horizontal cursor color} & Color of the horizontal cursor (in hexadecimal). & Default: \texttt{FFA500} \\\hline
+ \texttt{vertical cursor color} & Color of the vertical cursor (in hexadecimal). & Default: \texttt{800080}\\\hline
+ \texttt{smooth one} & 1 to smooth the first channel, 0 otherwise. & Default: \texttt{0}\\\hline
+ \texttt{smooth two} & 1 to smooth the second channel, 0 otherwise. & Default: \texttt{0}\\\hline
+ \texttt{smooth three} & 1 to smooth the third channel, 0 otherwise. & Default: \texttt{0}
\end{tabular}
\end{tcolorbox}
@@ -143,78 +165,114 @@ A quick documentation in french is available here :
\url{https://www.ensciences.fr/read.php?article=1220}
\end{center}
-\newpage
\section{Examples}
For more examples, see the \texttt{tikz-osci-example.tex} file.
\begin{tcblisting}{enhanced,colback=white,colframe=black,width=\textwidth, title=\bfseries Two channels plot with custom background color, sidebyside}
- \osci[%
- scale=0.7,
- second channel=1,
- screen offset one=2,
- screen offset two=-2,
- time div=20,
- voltage div one=4,
- voltage div two=1,
- sample rate=200,
- xy mode=0,
- func one=2*sin(2*180/0.020*x),
- func two=1*sin(2*180/0.020*x) + 0.2*sin(2*180/0.040*x),
- color one=D62626,
- color two=1053AF,
- graph back color=669966,
- info back color=D6D6D6,
- info text color=000000,
- main axis color=000000,
- grid color=CCCCCC
- ]
+\osci[%
+ scale=0.7,
+ second channel=1,
+ screen offset one=2,
+ screen offset two=-2,
+ time div=20,
+ voltage div one=4,
+ voltage div two=1,
+ sample rate=200,
+ xy mode=0,
+ func one=2*sin(2*180/0.020*x),
+ func two=1*sin(2*180/0.020*x) + 0.2*sin(2*180/0.040*x),
+ color one=D62626,
+ color two=1053AF,
+ graph back color=669966,
+ info back color=D6D6D6,
+ grid color=CCCCCC
+]
\end{tcblisting}
-\begin{tcblisting}{enhanced,colback=white,colframe=black,width=\textwidth, title=\bfseries Lissajou curve (XY mode) and no rounded corner, sidebyside}
- \osci[%
- scale=0.7,
- rounded corners=0,
- second channel=1,
- time div=300,
- voltage div one=1,
- voltage div two=0.5,
- sample rate=500,
- xy mode=1,
- func one=sin(7*x),
- func two=sin(2*x),
- indicators=1,
- graph back color=FFFFFF,
- info back color=D6D6D6,
- info text color=000000,
- main axis color=000000,
- grid color=CCCCCC,
- ]
+\begin{tcblisting}{enhanced,colback=white,colframe=black,width=\textwidth, title=\bfseries Lissajous curve (XY mode) and no rounded corner, sidebyside}
+\osci[%
+ scale=0.7,
+ rounded corners=0,
+ second channel=1,
+ time div=300,
+ voltage div one=1,
+ voltage div two=0.5,
+ sample rate=500,
+ xy mode=1,
+ func one=sin(7*x),
+ func two=sin(2*x),
+ indicators=1,
+ graph back color=FFFFFF,
+ info back color=D6D6D6,
+ info text color=000000,
+ main axis color=000000,
+ grid color=CCCCCC,
+]
\end{tcblisting}
\begin{tcblisting}{enhanced,colback=white,colframe=black,width=\textwidth, title=\bfseries Math mode (multiply) with hidden sources and dark mode, sidebyside}
- \osci[%
- scale=0.7,
- second channel=1,
- time div=10,
- voltage div one=2,
- voltage div two=2,
- sample rate=500,
- xy mode=0,
- math mode=3,
- math mode hide source=1,
- func one=2*sin(2*180/0.040*x),
- func two=3*sin(2*180/0.005*x),
- indicators=0,
- color three=F0DE25,
- color text three=000000,
- graph back color=777799,
- info back color=333333,
- info text color=FFFFFF,
- main axis color=DDDDDD,
- grid color=CCCCCC,
- ]
+\osci[%
+ scale=0.7,
+ second channel=1,
+ time div=10,
+ voltage div one=2,
+ voltage div two=2,
+ sample rate=500,
+ xy mode=0,
+ math mode=3,
+ math mode hide source=1,
+ func one=2*sin(2*180/0.040*x),
+ func two=3*sin(2*180/0.005*x),
+ indicators=0,
+ color three=F0DE25,
+ color text three=000000,
+ graph back color=777799,
+ info back color=333333,
+ info text color=FFFFFF,
+ main axis color=DDDDDD,
+ grid color=CCCCCC,
+]
+\end{tcblisting}
+
+\begin{tcblisting}{enhanced,colback=white,colframe=black,width=\textwidth, title=\bfseries Common periodic signals,sidebyside}
+% Square wave function
+\pgfmathdeclarefunction{square}{4}{%
+\pgfmathparse{(sin(2*180*x/#2+#4) + #3>0?#1:-#1)}%
+}
+
+% Triangle wave function
+\pgfmathdeclarefunction{triangle}{4}{%
+\pgfmathparse{#1*asin(sin(2*180/#2*x + #4))/90}%
+}
+
+\osci[%
+ scale=0.7,
+ second channel=1,
+ sample rate=1000,
+ time div=100,
+ func one={triangle(2,0.2,0,0)},
+ func two={square(2,0.2,0,0)},
+ smooth one = 1,
+ smooth two = 0,
+]
+\end{tcblisting}
+
+\begin{tcblisting}{enhanced,colback=white,colframe=black,width=\textwidth, title=\bfseries Vertical and horizontal cursors (values displayed with two digits),sidebyside}
+\osci[%
+ scale=0.7,
+ second channel=0,
+ time div=100,
+ voltage div one=1,
+ sample rate=200,
+ func one={sin(2*180*x)},
+ vertical cursor one=-2.5,
+ vertical cursor two=2.5,
+ horizontal cursor one=1,
+ horizontal cursor two=-1,
+ cursor precision=2
+]
\end{tcblisting}
\section{License}
@@ -234,8 +292,12 @@ This package requires the following packages :
\section{Changelog}
\begin{itemize}
+ \item \textbf{0.4.0} (2023/10/24) :
+ \subitem Added cursor and smooth options.
+ \subitem Added square and triangle plot examples.
+ \subitem Fixed the pgf keys declaration.
\item \textbf{0.3.0} (2023/10/08) :
- \subitem Implemented XY mode and math (add, subtract, multiply, divide) functionality.
+ \subitem Implemented XY mode and math (add, subtract, multiply, divide) functionalities.
\item \textbf{0.2.0} (2023/10/07) :
\subitem Added \texttt{color text one}, \texttt{color text two} and \texttt{color text xy} options.
\subitem Added \texttt{indicators} option.
diff --git a/graphics/pgf/contrib/tikz-osci/doc/tikz-osci-example.pdf b/graphics/pgf/contrib/tikz-osci/doc/tikz-osci-example.pdf
index 0d698a8bf1..e10955a70d 100644
--- a/graphics/pgf/contrib/tikz-osci/doc/tikz-osci-example.pdf
+++ b/graphics/pgf/contrib/tikz-osci/doc/tikz-osci-example.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/tikz-osci/doc/tikz-osci-example.tex b/graphics/pgf/contrib/tikz-osci/doc/tikz-osci-example.tex
index 182ef488ed..c1924ae736 100644
--- a/graphics/pgf/contrib/tikz-osci/doc/tikz-osci-example.tex
+++ b/graphics/pgf/contrib/tikz-osci/doc/tikz-osci-example.tex
@@ -156,6 +156,36 @@
grid color=CCCCCC,
]
+ \vspace*{0.3cm}
+
+
+ % Square wave function
+ \pgfmathdeclarefunction{square}{4}{%
+ \pgfmathparse{(sin(2*180*x/#2+#4)+#3>0?#1:-#1)}%
+ }
+
+ % Triangle wave function
+ \pgfmathdeclarefunction{triangle}{4}{%
+ \pgfmathparse{#1*asin(sin(2*180/#2*x+#4))/90}%
+ }
+
+ \osci[%
+ scale=0.7,
+ second channel=1,
+ time div=50,
+ voltage div one=1,
+ voltage div two=1,
+ sample rate=1000,
+ func one={triangle(2,0.2,0,0)},
+ func two={square(2,0.2,0,-60)},
+ smooth one = 1,
+ smooth two = 0,
+ vertical cursor one = 2,
+ vertical cursor two = 2.67,
+ cursor precision = 1
+ ]
+
+
\end{center}
diff --git a/graphics/pgf/contrib/tikz-osci/tikz-osci.sty b/graphics/pgf/contrib/tikz-osci/tikz-osci.sty
index 73ab24f5da..4c83f6c743 100644
--- a/graphics/pgf/contrib/tikz-osci/tikz-osci.sty
+++ b/graphics/pgf/contrib/tikz-osci/tikz-osci.sty
@@ -8,92 +8,116 @@
% tained anymore.
%
% Author: Thibault Giauffret
-% Date: 2013/10/08
-% Version: 0.3.0
+% Date: 2023/10/24
+% Version: 0.4.0
% Licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf
% Not an expert... Just doing it for fun.
% -----------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tikz-osci}[2023/10/08 0.3.0 Tikz Osci package]
+\ProvidesPackage{tikz-osci}[2023/10/24 0.4.0 Tikz Osci package]
% Required packages
\RequirePackage[dvipsnames]{xcolor}
\RequirePackage{pgfkeys}
\RequirePackage{pgfplots}
\RequirePackage{tikz}
-\usetikzlibrary{arrows,shapes,positioning}
-\usetikzlibrary{decorations.markings,decorations.pathmorphing,
- decorations.pathreplacing}
-\usetikzlibrary{calc,patterns,shapes.geometric}
-
-
-% Init the keys and get the values
-\pgfkeys{
- /osci/.cd,
- scale/.store in=\scale,
- scale=1,
- rounded corners/.store in=\roundedCorners,
- rounded corners=10,
- second channel/.store in=\secondChannel,
- second channel=0,
- screen offset one/.store in=\screenOffsetOne,
- screen offset one=0,
- screen offset two/.store in=\screenOffsetTwo,
- screen offset two=-0,
- time div/.store in=\timeDiv,
- time div=20,
- voltage div one/.store in=\voltageDivOne,
- voltage div one=1,
- voltage div two/.store in=\voltageDivTwo,
- voltage div two=1,
- sample rate/.store in=\sampleRate,
- sample rate=200,
- xy mode/.store in=\xyMode,
- xy mode=0,
- math mode/.store in=\mathMode,
- math mode=0,
- math mode hide source/.store in=\mathModeHideSource,
- math mode hide source=0,
- func one/.store in=\funcOne,
- func one=2*sin(2*180/0.020*x),
- func two/.store in=\funcTwo,
- func two=0.6*sin(2*180/0.020*x)+0.2*sin(2*180/0.040*x),
- indicators/.store in=\indicators,
- indicators=1,
- color one/.store in=\colorOne,
- color one=D62626,
- color text one/.store in=\colorTextOne,
- color text one=FFFFFF,
- color two/.store in=\colorTwo,
- color two=1053AF,
- color text two/.store in=\colorTextTwo,
- color text two=FFFFFF,
- color three/.store in=\colorThree,
- color three=2E8B73,
- color text three/.store in=\colorTextThree,
- color text three=FFFFFF,
- graph back color/.store in=\graphBackColor,
- graph back color=FFFFFF,
- info back color/.store in=\infoBackColor,
- info back color=D6D6D6,
- info text color/.store in=\infoTextColor,
- info text color=000000,
- main axis color/.store in=\mainAxisColor,
- main axis color=000000,
- grid color/.store in=\gridColor,
- grid color=AAAAAA,
+\usetikzlibrary{arrows,shapes,positioning,decorations.markings,decorations.pathmorphing,
+ decorations.pathreplacing,calc,patterns,shapes.geometric}
+
+% Raised text
+\newcommand*{\raisedtext}[1]{%
+ \begingroup
+ \leavevmode
+ \rlap{\kern-.2pt\raise.2pt\hbox{\color{white}#1}}%
+ \rlap{\kern.2pt\raise-.2pt\hbox{\color{black!30}#1}}%
+ \hbox{#1}%
+ \endgroup
}
% The main command
\newcommand\osci[1][]{
- % Get the values
+ % Init the keys and get the values and add the user's values
\pgfkeys{
/osci/.cd,
- #1,
+ scale/.store in=\scale,
+ scale=1,
+ rounded corners/.store in=\roundedCorners,
+ rounded corners=10,
+ second channel/.store in=\secondChannel,
+ second channel=0,
+ screen offset one/.store in=\screenOffsetOne,
+ screen offset one=0,
+ screen offset two/.store in=\screenOffsetTwo,
+ screen offset two=-0,
+ time div/.store in=\timeDiv,
+ time div=20,
+ voltage div one/.store in=\voltageDivOne,
+ voltage div one=1,
+ voltage div two/.store in=\voltageDivTwo,
+ voltage div two=1,
+ sample rate/.store in=\sampleRate,
+ sample rate=200,
+ xy mode/.store in=\xyMode,
+ xy mode=0,
+ math mode/.store in=\mathMode,
+ math mode=0,
+ math mode hide source/.store in=\mathModeHideSource,
+ math mode hide source=0,
+ func one/.store in=\funcOne,
+ func one=2*sin(2*180/0.020*x),
+ func two/.store in=\funcTwo,
+ func two=0.6*sin(2*180/0.020*x)+0.2*sin(2*180/0.040*x),
+ indicators/.store in=\indicators,
+ indicators=1,
+ vertical cursor one/.store in=\verticalCursorOne,
+ vertical cursor one=false,
+ vertical cursor two/.store in=\verticalCursorTwo,
+ vertical cursor two=false,
+ horizontal cursor one/.store in=\horizontalCursorOne,
+ horizontal cursor one=false,
+ horizontal cursor two/.store in=\horizontalCursorTwo,
+ horizontal cursor two=false,
+ cursor precision/.store in=\cursorPrecision,
+ cursor precision=1,
+ color one/.store in=\colorOne,
+ color one=D62626,
+ color text one/.store in=\colorTextOne,
+ color text one=FFFFFF,
+ color two/.store in=\colorTwo,
+ color two=1053AF,
+ color text two/.store in=\colorTextTwo,
+ color text two=FFFFFF,
+ color three/.store in=\colorThree,
+ color three=2E8B73,
+ color text three/.store in=\colorTextThree,
+ color text three=FFFFFF,
+ graph back color/.store in=\graphBackColor,
+ graph back color=FFFFFF,
+ info back color/.store in=\infoBackColor,
+ info back color=D6D6D6,
+ info text color/.store in=\infoTextColor,
+ info text color=000000,
+ main axis color/.store in=\mainAxisColor,
+ main axis color=000000,
+ grid color/.store in=\gridColor,
+ grid color=AAAAAA,
+ horizontal cursor color/.store in=\horizontalCursorColor,
+ horizontal cursor color=FFA500,
+ vertical cursor color/.store in=\verticalCursorColor,
+ vertical cursor color=800080,
+ smooth one/.store in=\smoothOne,
+ smooth one=0,
+ smooth two/.store in=\smoothTwo,
+ smooth two=0,
+ smooth three/.store in=\smoothThree,
+ smooth three=0,
+ #1
}
+
+ % Set the scale of the picture
\scalebox{\scale}{
% Begin the picture
\begin{tikzpicture}
@@ -110,6 +134,8 @@
\definecolor{colorTextOne}{HTML}{\colorTextOne}
\definecolor{colorTextTwo}{HTML}{\colorTextTwo}
\definecolor{colorTextThree}{HTML}{\colorTextThree}
+ \definecolor{verticalCursorColor}{HTML}{\verticalCursorColor}
+ \definecolor{horizontalCursorColor}{HTML}{\horizontalCursorColor}
% Draw the info box
\draw[black,thick, fill= infoBackColor]
@@ -123,6 +149,33 @@
% Add time/div label
\draw (5,-0.15) node[anchor=north, color= infoTextColor] {\timeDiv\ ms/div};
+ % Test if smoothOne is enabled
+ \ifnum\smoothOne=1
+ % set \smoothOne to smooth
+ \def\smoothOne{smooth}
+ \else
+ % set \smoothOne to empty
+ \def\smoothOne{}
+ \fi
+
+ % Test if smoothTwo is enabled
+ \ifnum\smoothTwo=1
+ % set \smoothTwo to smooth
+ \def\smoothTwo{smooth}
+ \else
+ % set \smoothTwo to empty
+ \def\smoothTwo{}
+ \fi
+
+ % Test if smoothThree is enabled
+ \ifnum\smoothThree=1
+ % set \smoothThree to smooth
+ \def\smoothThree{smooth}
+ \else
+ % set \smoothThree to empty
+ \def\smoothThree{}
+ \fi
+
% Add XY mode indicator
% Lissajou mode
\ifnum\xyMode=1
@@ -218,28 +271,27 @@
\pgfplotsset{ every non boxed x axis/.append style={x axis line style=-},
every non boxed y axis/.append style={y axis line style=-}}
- % Lissajou mode
+ % Lissajous mode
\ifnum\xyMode=1
-
\addplot
[domain=0:360,variable=\x,
- samples=200,smooth,very thick,color=thirdcolor]
+ samples=200,very thick,color=thirdcolor, \smoothThree]
({(\funcOne)/\voltageDivOne},{(\funcTwo)/\voltageDivTwo});
\draw[thirdcolor,fill=thirdcolor] (4,-0.78) rectangle (6,-1.28);
\draw (5,-0.75) node[anchor=north, color=white] {XY mode};
\else
+ % Show source signals
\ifnum\mathModeHideSource=0
% Draw each channel separately
% First channel plot
- \addplot[color=firstcolor,very thick,domain=-5*(\timeDiv/1000):5*(\timeDiv/1000),
- smooth, samples=\sampleRate]{(\funcOne)/\voltageDivOne+\screenOffsetOne};
+ \addplot[color=firstcolor,very thick,domain=-5*(\timeDiv/1000):5*(\timeDiv/1000),samples=\sampleRate,\smoothOne]{(\funcOne)/\voltageDivOne+\screenOffsetOne};
% If the second channel is enabled, draw it
\ifnum\secondChannel=1
% Draw the second channel
- \addplot[color=secondcolor,very thick,domain=-5*(\timeDiv/1000):5*(\timeDiv/1000), smooth, samples=\sampleRate]{(\funcTwo)/\voltageDivTwo+\screenOffsetTwo};
+ \addplot[color=secondcolor,very thick,domain=-5*(\timeDiv/1000):5*(\timeDiv/1000), samples=\sampleRate,\smoothTwo]{(\funcTwo)/\voltageDivTwo+\screenOffsetTwo};
\fi
\fi
@@ -247,14 +299,13 @@
% Add mode
\ifnum\mathMode=1
\addplot[color=thirdcolor,very thick,domain=-5*(\timeDiv/1000):5*(\timeDiv/1000),
- smooth, samples=\sampleRate]{(\funcOne)/\voltageDivOne + (\funcTwo)/\voltageDivTwo};
+ smooth, samples=\sampleRate, \smoothThree]{(\funcOne)/\voltageDivOne + (\funcTwo)/\voltageDivTwo};
\else
% Substract mode
\ifnum\mathMode=2
- \addplot[color=thirdcolor,very thick,domain=-5*(\timeDiv/1000):5*(\timeDiv/1000),
- smooth, samples=\sampleRate]{(\funcOne)/\voltageDivOne - (\funcTwo)/\voltageDivTwo};
+ \addplot[color=thirdcolor,very thick,domain=-5*(\timeDiv/1000):5*(\timeDiv/1000), samples=\sampleRate, \smoothThree]{(\funcOne)/\voltageDivOne - (\funcTwo)/\voltageDivTwo};
\draw[thirdcolor,fill=thirdcolor] (4,-0.78) rectangle (6,-1.28);
\draw (5,-0.75) node[anchor=north, color=white] {Substract};
@@ -262,8 +313,7 @@
% Multiply mode
\ifnum\mathMode=3
- \addplot[color=thirdcolor,very thick,domain=-5*(\timeDiv/1000):5*(\timeDiv/1000),
- smooth, samples=\sampleRate]{(\funcOne)/\voltageDivOne * (\funcTwo)/\voltageDivTwo};
+ \addplot[color=thirdcolor,very thick,domain=-5*(\timeDiv/1000):5*(\timeDiv/1000) ,samples=\sampleRate, \smoothThree]{(\funcOne)/\voltageDivOne * (\funcTwo)/\voltageDivTwo};
\draw[thirdcolor,fill=thirdcolor] (4,-0.78) rectangle (6,-1.28);
\draw (5,-0.75) node[anchor=north, color=white] {Multiply};
@@ -271,8 +321,7 @@
% Divide mode
\ifnum\mathMode=4
- \addplot[color=thirdcolor,very thick,domain=-5*(\timeDiv/1000):5*(\timeDiv/1000),
- smooth, samples=\sampleRate]{(\funcOne)/\voltageDivOne / (\funcTwo)/\voltageDivTwo};
+ \addplot[color=thirdcolor,very thick,domain=-5*(\timeDiv/1000):5*(\timeDiv/1000), samples=\sampleRate, \smoothThree]{(\funcOne)/\voltageDivOne / (\funcTwo)/\voltageDivTwo};
\draw[thirdcolor,fill=thirdcolor] (4,-0.78) rectangle (6,-1.28);
\draw (5,-0.75) node[anchor=north, color=white] {Divide};
\fi
@@ -285,6 +334,7 @@
\ifnum\xyMode=1
\else
+ % Show the channel indicators
\ifnum\indicators=1
% Draw the first channel's screen marker
\draw[firstcolor,fill=firstcolor] (0.4, \screenOffsetOne+4) -- (0, \screenOffsetOne+4+0.3) -- (0, \screenOffsetOne+4-0.3) -- cycle;
@@ -297,6 +347,107 @@
\draw (-0.04, \screenOffsetTwo+4) node[anchor=west, color=colorTextTwo,font=\fontsize{8}{10}\selectfont] {2};
\fi
\fi
+
+
+ % Draw the vertical cursors
+
+ % Define the false value
+ \def\false{false}
+
+ % Set the value of \verticalCursorOne
+ \pgfmathsetmacro{\verticalCursorOneValue}{\verticalCursorOne*\timeDiv}
+
+
+ % If the first vertical cursor is enabled
+ \ifx\verticalCursorOne\false
+ \else
+ % Draw the first vertical cursor with \verticalCursorOne value
+ \draw[verticalCursorColor,very thick,dashed] (\verticalCursorOne+5,0) -- (\verticalCursorOne+5,8);
+ \draw[verticalCursorColor,very thick,fill=verticalCursorColor] (\verticalCursorOne+5-0.25,7.5) rectangle (\verticalCursorOne+5+0.25,8);
+
+ % Draw the indicator
+ \draw[white,very thick] (\verticalCursorOne+5,7.45) node[anchor=south, color=white,font=\fontsize{10}{12}\selectfont] {A};
+
+ % Draw the legend
+ \draw[verticalCursorColor,very thick] (0.25,0.5) node[anchor=west, color=verticalCursorColor,font=\fontsize{10}{12}\selectfont] {\raisedtext{CurA \pgfmathprintnumber[precision=\cursorPrecision, assume math mode=true,fixed zerofill]{\verticalCursorOneValue}\ ms}};
+
+ % If the second vertical cursor is enabled
+ \ifx\verticalCursorTwo\false
+ \else
+ % Draw the time difference between the two vertical cursors
+ \pgfmathsetmacro{\verticalCursorDiff}{\verticalCursorTwo-\verticalCursorOne}
+ \pgfmathsetmacro{\verticalCursorDiffValue}{\verticalCursorDiff*\timeDiv}
+ \draw[verticalCursorColor,very thick] (0.25,1.5) node[anchor=west, color=verticalCursorColor,font=\fontsize{10}{12}\selectfont] {\raisedtext{CurB - CurA \pgfmathprintnumber[precision=\cursorPrecision, assume math mode=true,fixed zerofill]{\verticalCursorDiffValue}\ ms}};
+ \fi
+
+ \fi
+
+ % Set the value of \verticalCursorTwo
+ \pgfmathsetmacro{\verticalCursorTwoValue}{\verticalCursorTwo*\timeDiv}
+
+ % If the second vertical cursor is enabled
+ \ifx\verticalCursorTwo\false
+ \else
+ % Draw the second vertical cursor with \verticalCursorTwo value
+ \draw[verticalCursorColor,very thick,dashed] (\verticalCursorTwo+5,0) -- (\verticalCursorTwo+5,8);
+ \draw[verticalCursorColor,very thick,fill=verticalCursorColor] (\verticalCursorTwo+5-0.25,7.5) rectangle (\verticalCursorTwo+5+0.25,8);
+
+ % Draw the indicator
+ \draw[white,very thick] (\verticalCursorTwo+5,7.45) node[anchor=south, color=white,font=\fontsize{10}{12}\selectfont] {B};
+
+ % Draw the legend
+ \draw[verticalCursorColor,very thick] (0.25,1) node[anchor=west, color=verticalCursorColor,font=\fontsize{10}{12}\selectfont] {\raisedtext{CurB \pgfmathprintnumber[precision=\cursorPrecision, assume math mode=true,fixed zerofill]{\verticalCursorTwoValue}\ ms}};
+
+ \fi
+
+
+ % Draw the horizontal cursors
+
+ % Set the value of \horizontalCursorOne
+ \pgfmathsetmacro{\horizontalCursorOneValue}{\horizontalCursorOne*\voltageDivOne}
+
+ % If the first horizontal cursor is enabled
+ \ifx\horizontalCursorOne\false
+ \else
+ % Draw the first horizontal cursor with \horizontalCursorOne value
+ \draw[horizontalCursorColor,very thick,dashed] (0,\horizontalCursorOne+4) -- (10,\horizontalCursorOne+4);
+ \draw[horizontalCursorColor,very thick,fill=horizontalCursorColor] (9.5,\horizontalCursorOne+4-0.25) rectangle (10.5,\horizontalCursorOne+4+0.25);
+
+ % Draw the indicator
+ \draw[white,very thick] (10,\horizontalCursorOne+4) node[anchor=east, color=white,font=\fontsize{10}{12}\selectfont] {A};
+
+ % Draw the legend
+ \draw[horizontalCursorColor,very thick] (5.25,0.5) node[anchor=west, color=horizontalCursorColor,font=\fontsize{10}{12}\selectfont] {\raisedtext{CurA \pgfmathprintnumber[precision=\cursorPrecision, assume math mode=true,fixed zerofill]{\horizontalCursorOneValue}\ V}};
+
+ % If the second horizontal cursor is enabled
+ \ifx\horizontalCursorTwo\false
+ \else
+ % Draw the voltage difference between the two horizontal cursors
+ \pgfmathsetmacro{\horizontalCursorDiff}{\horizontalCursorTwo-\horizontalCursorOne}
+ \pgfmathsetmacro{\horizontalCursorDiffValue}{\horizontalCursorDiff*\voltageDivOne}
+ \draw[horizontalCursorColor,very thick] (5.25,1.5) node[anchor=west, color=horizontalCursorColor,font=\fontsize{10}{12}\selectfont] {\raisedtext{CurB - CurA \pgfmathprintnumber[precision=\cursorPrecision, assume math mode=true,fixed zerofill]{\horizontalCursorDiffValue}\ V}};
+ \fi
+ \fi
+
+ % Set the value of \horizontalCursorTwo
+ \pgfmathsetmacro{\horizontalCursorTwoValue}{\horizontalCursorTwo*\voltageDivOne}
+
+ % If the second horizontal cursor is enabled
+ \ifx\horizontalCursorTwo\false
+ \else
+ % Draw the second horizontal cursor with \horizontalCursorTwo value
+ \draw[horizontalCursorColor,very thick,dashed] (0,\horizontalCursorTwo+4) -- (10,\horizontalCursorTwo+4);
+ \draw[horizontalCursorColor,very thick,fill=horizontalCursorColor] (9.5,\horizontalCursorTwo+4-0.25) rectangle (10.5,\horizontalCursorTwo+4+0.25);
+
+ % Draw the indicator
+ \draw[white,very thick] (10,\horizontalCursorTwo+4) node[anchor=east, color=white,font=\fontsize{10}{12}\selectfont] {B};
+
+ % Draw the legend
+ \draw[horizontalCursorColor,very thick] (5.25,1) node[anchor=west, color=horizontalCursorColor,font=\fontsize{10}{12}\selectfont] {\raisedtext{CurB \pgfmathprintnumber[precision=\cursorPrecision, assume math mode=true,fixed zerofill]{\horizontalCursorTwoValue}\ V}};
+
+ \fi
+
+ % End xyMode test
\fi
\end{scope}
diff --git a/macros/latex/contrib/customenvs/doc/customenvs-doc-en.pdf b/macros/latex/contrib/customenvs/doc/customenvs-doc-en.pdf
index 49dd9c958e..820109987c 100644
--- a/macros/latex/contrib/customenvs/doc/customenvs-doc-en.pdf
+++ b/macros/latex/contrib/customenvs/doc/customenvs-doc-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/customenvs/doc/customenvs-doc-en.tex b/macros/latex/contrib/customenvs/doc/customenvs-doc-en.tex
index e1bbbe1918..da20b128bc 100644
--- a/macros/latex/contrib/customenvs/doc/customenvs-doc-en.tex
+++ b/macros/latex/contrib/customenvs/doc/customenvs-doc-en.tex
@@ -34,8 +34,8 @@
\usepackage[margin=1.5cm]{geometry}
\setlength{\parindent}{0pt}
-\def\TPversion{0.1.0}
-\def\TPdate{22/10/2023}
+\def\TPversion{0.1.1}
+\def\TPdate{25/10/2023}
\usepackage{tcolorbox}
\sethlcolor{lightgray!25}
\NewDocumentCommand\MontreCode{ m }{%
@@ -111,6 +111,8 @@
\section{History}
+\verb|v0.1.1|~:~~~~Skills table (only french for the moment...)
+
\verb|v0.1.0|~:~~~~Initial version
\vspace*{5mm}
@@ -121,12 +123,13 @@
\subsection{Idea}
-The idea is to propose some classics environments with customizations :
+The idea is to propose some classics environments with customizations (some are, for the moment, only in french) :
\begin{itemize}
\item write in \textit{multicols}, with spacings enhancements ;
\item present answers for a \textit{MCQ} ;
- \item create a list with \textit{choosen items} (randomly or by numbers).
+ \item create a list with \textit{choosen items} (randomly or by numbers) ;
+ \item present a skill table.
\end{itemize}
\smallskip
@@ -143,15 +146,17 @@ Loaded packages are
\item \MontreCode{xstring}, \MontreCode{simplekv}, \MontreCode{listofitems}, \MontreCode{randomlist} and \MontreCode{xintexpr} ;
\item \MontreCode{enumitem} ;
\item \MontreCode{multicol} ;
- \item \MontreCode{tabularray}.
+ \item \MontreCode{tabularray} ;
+ \item \MontreCode{fontawesome5} ;
\end{itemize}
-Due to limitations, \MontreCode{enumitem} or \MontreCode{multicol} or \MontreCode{tabularray} can be \textit{un}loaded by \MontreCode{customenvs} (user must load them manually) via options :
+Due to limitations, \MontreCode{enumitem}/\MontreCode{multicol}/\MontreCode{tabularray}\MontreCode{fontawesome5} can be \textit{un}loaded by \MontreCode{customenvs} (user must load them manually) via options :
\begin{itemize}
\item \MontreCode{$\mathtt{\langle}$noenum$\mathtt{\rangle}$} ;
\item \MontreCode{$\mathtt{\langle}$nomulticol$\mathtt{\rangle}$} ;
- \item \MontreCode{$\mathtt{\langle}$notblr$\mathtt{\rangle}$}.
+ \item \MontreCode{$\mathtt{\langle}$notblr$\mathtt{\rangle}$} ;
+ \item \MontreCode{$\mathtt{\langle}$nofa$\mathtt{\rangle}$} ;
\end{itemize}
\begin{codehigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25]
diff --git a/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.pdf b/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.pdf
index 8729772ec0..0b7ef6f8b4 100644
--- a/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.pdf
+++ b/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.pdf
Binary files differ
diff --git a/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.tex b/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.tex
index 5e610ba0dc..969dde4575 100644
--- a/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.tex
+++ b/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.tex
@@ -39,8 +39,8 @@
\usepackage[margin=1.5cm]{geometry}
\setlength{\parindent}{0pt}
-\def\TPversion{0.1.0}
-\def\TPdate{22 octobre 2023}
+\def\TPversion{0.1.1}
+\def\TPdate{25 octobre 2023}
\usepackage[most]{tcolorbox}
\tcbuselibrary{listingsutf8}
\newtcblisting{DemoCode}[1]{%
@@ -57,19 +57,19 @@
commentstyle={\itshape\color{gray}},
keywordstyle={\color{blue}},%
classoffset=0,%
- keywords={usepackage,displaystyle,frac,infty,begin,end,lipsum,centering,par,baselineskip,item,bullet,int,color},%
+ keywords={usepackage,displaystyle,frac,infty,begin,end,lipsum,centering,par,baselineskip,item,bullet,int,color,NewDocumentCommand},%
alsoletter={-},%
keywordstyle={\color{blue}},%
classoffset=1,%
alsoletter={-},%
- morekeywords={center,justify},%
+ morekeywords={center,justify,\LstDeuxNiv,\LstTroisNiv,\LstQuatreNiv,\NoticeDeuxNiv,\NoticeTroisNiv,\NoticeQuatreNiv,\DeuxNivBatterie,\TroisNivBatterie,\QuatreNivBatterie,\DeuxNivSmiley,\TroisNivSmiley,\QuatreNivSmiley,\vcenterfa,\faIcon},%
keywordstyle={\color{violet}},%
classoffset=2,%
alsoletter={-},%
- morekeywords={\ReponsesQCM,MultiCols,\CreerListeItems,\ListeChoixItems},%
+ morekeywords={\ReponsesQCM,MultiCols,\CreerListeItems,\ListeChoixItems,\TableauCompetences},%
keywordstyle={\color{green!50!black}},%
classoffset=3,%
- morekeywords={Largeur,Filets,EspacesCL,NbCols,Labels,PoliceLabels,EspaceLabels,Swap,Type,CoeffEspVert,EpTrait,Alea},%
+ morekeywords={Largeur,Filets,EspacesCL,NbCols,Labels,PoliceLabels,EspaceLabels,Swap,Type,CoeffEspVert,EpTrait,Alea,LargeurNivs,Niveaux,NoticeNiveaux,Titre,PolTitre,PolNotice,PolComp,LigneSep,CouleurNotice,CouleurNiveaux,CouleurFond,Note,Notice},%
keywordstyle={\color{orange}}
},%
#1
@@ -149,6 +149,8 @@
\section{Historique}
+\verb|v0.1.1|~:~~~~Tableaux de compétences
+
\verb|v0.1.0|~:~~~~Version initiale
\vspace*{5mm}
@@ -166,7 +168,8 @@ L'idée est de proposer des commandes ou environnements classiques avec quelques
\item \textit{centrer} avec gestion des espacements autour ;
\item Ă©crire en \textit{multi-colonnes} avec gestion des espacements autour ;
\item mettre en forme des réponses à des \textit{QCM} ;
- \item créer une liste avec \textit{choix des items} (de manière aléatoire ou par saisie directe).
+ \item créer une liste avec \textit{choix des items} (de manière aléatoire ou par saisie directe) ;
+ \item créer un tableau de \textit{compétences}.
\end{itemize}
\smallskip
@@ -192,15 +195,19 @@ Les packages chargés sont :
\item \MontreCode{xstring}, \MontreCode{simplekv}, \MontreCode{listofitems}, \MontreCode{randomlist} et \MontreCode{xintexpr} ;
\item \MontreCode{enumitem} ;
\item \MontreCode{multicol} ;
- \item \MontreCode{tabularray}.
+ \item \MontreCode{tabularray} ;
+ \item \MontreCode{xcolor} ;
+ \item \MontreCode{fontawesome5}.
\end{itemize}
-À noter que, pour des raisons de compatibilité (ou d'incompatibilité), les packages \MontreCode{enumitem} ou \MontreCode{multicol} ou \MontreCode{tabularray} peuvent ne pas être chargés par \MontreCode{customenvs} (auxquels cas l'utilisateur devra les avoir chargés pour faire fonctionner certains environnements) via les options :
+À noter que, pour des raisons de compatibilité (ou d'incompatibilité), les packages \MontreCode{enumitem}/\MontreCode{multicol}/\MontreCode{tabularray}/\MontreCode{xcolor}/\MontreCode{fontawesome5} peuvent ne pas être chargés par \MontreCode{customenvs} (auxquels cas l'utilisateur devra les avoir chargés pour faire fonctionner certains environnements) via les options :
\begin{itemize}
\item \MontreCode{$\mathtt{\langle}$nonenum$\mathtt{\rangle}$} ;
\item \MontreCode{$\mathtt{\langle}$nonmulticol$\mathtt{\rangle}$} ;
- \item \MontreCode{$\mathtt{\langle}$nontblr$\mathtt{\rangle}$}.
+ \item \MontreCode{$\mathtt{\langle}$nontblr$\mathtt{\rangle}$} ;
+ \item \MontreCode{$\mathtt{\langle}$nonxcolor$\mathtt{\rangle}$} ;
+ \item \MontreCode{$\mathtt{\langle}$nonfa$\mathtt{\rangle}$}.
\end{itemize}
\begin{DemoCode}{listing only}
@@ -556,4 +563,138 @@ Le dernier argument, optionnel et entre \MontreCode{<...>} correspond Ă  des opt
\ListeChoixItems[Type=item]{\malisteditemsb}{ListeItemsB}(7,2,1,5,3)<label=$\bullet$>
\end{DemoCode}
+\pagebreak
+
+\section{Tableau de compétences}
+
+\subsection{Principe et fonctionnement}
+
+L'idée est de proposer un environnement pour créer un tableau de compétences, via 2/3/4 niveaux :
+
+\begin{itemize}
+ \item basé sur \MontreCode{tblr}, qui doit donc être chargé (par défaut il l'est) ;
+ \item basé sur \MontreCode{xcolor}, qui doit donc être chargé (par défaut il l'est) ;
+ \item avec personnalisations possibles.
+\end{itemize}
+
+Si \MontreCode{xcolor} est déjà chargé, avec des options particulières, le package peut ne pas le charger, grâce à l'option \MontreCode{nonxcolor}.
+
+\begin{DemoCode}{listing only}
+\TableauCompetences[clés]{listecompétences}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+\TableauCompetences{Compétence A § Compétence B}
+\end{DemoCode}
+
+\subsection{Éléments prédéfinis}
+
+Pour simplifier la saisie de certains paramètres, certaines macros ont été définies en interne, et pourront être utilisées, ou redéfinies si besoin.
+
+\begin{DemoCode}{listing only}
+%patch fa vcenter
+\NewDocumentCommand{\vcenterfa}{ O{} m }{$\vcenter{\hbox{\faIcon[#1]{#2}}}$}
+%labelnote
+\def\LabelNoteComp{Note}
+%listeniveaux
+\def\LstDeuxNiv{NA § A}
+\def\LstTroisNiv{NA § ECA § A}
+\def\LstQuatreNiv{NA § PA § ECA § A}
+%noticeniveaux
+\def\NoticeDeuxNiv{Non acquis § Acquis}
+\def\NoticeTroisNiv{Non acquis § En cours d'acquis. § Acquis}
+\def\NoticeQuatreNiv{Non acquis § Part. acquis § En cours d'acquis. § Acquis}
+\end{DemoCode}
+
+\begin{DemoCode}{text only}
+Niveaux par \og batterie \fg :
+
+\MontreCode{\textbackslash DeuxNivBatterie} : \DeuxNivBatterie\\
+\MontreCode{\textbackslash TroisNivBatterie} : \TroisNivBatterie \\
+\MontreCode{\textbackslash QuatreNivBatterie} : \QuatreNivBatterie\\
+
+Niveaux par \og smiley \fg :
+
+\MontreCode{\textbackslash DeuxNivSmiley} : \DeuxNivSmiley\\
+\MontreCode{\textbackslash TroisNivSmiley} : \TroisNivSmiley\\
+\MontreCode{\textbackslash QuatreNivSmiley} : \QuatreNivSmiley
+\end{DemoCode}
+
+\pagebreak
+
+Les \MontreCode{clés} disponibles sont :
+
+\begin{itemize}
+ \item \MontreCode{Largeur} : largeur globale du tableau ; \MontreCode{0.95\textbackslash linewidth} par défaut
+ \item \MontreCode{LargeurNivs} : largeur des colonnes Niv + Note (séparées par \MontreCode{§}) ; \MontreCode{0.75cm § 1.25cm} par défaut
+ \item \MontreCode{Niveaux} : liste des niveaux (séparés par \MontreCode{§}) ; \MontreCode{NA § ECA § A} par défaut
+ \item \MontreCode{NoticeNiveaux} : notice des niveaux (séparés par \MontreCode{§}) ; \MontreCode{Non acquis § En cours d'acquisition § Acquis} par défaut ;
+ \item \MontreCode{Titre} : titre du tableau ; \MontreCode{DS01} par défaut
+ \item \MontreCode{PolTitre} : police de la 1\up{ere} ligne ; \MontreCode{\textbackslash small\textbackslash sffamily\textbackslash bfseries} par défaut
+ \item \MontreCode{PolNotice} : police de la notice (dernière ligne) ; \MontreCode{\textbackslash small\textbackslash sffamily\textbackslash bfseries} par défaut
+ \item \MontreCode{PolComp} : police des lignes des compétences ; \MontreCode{\textbackslash small\textbackslash sffamily} par défaut
+ \item \MontreCode{LigneSep} : séparation entre les lignes ; \MontreCode{2pt} par défaut
+ \item \MontreCode{CouleurNotice} : couleur de la notice ; \MontreCode{black} par défaut
+ \item \MontreCode{CouleurNiveaux} : couleur de la première ligne ; \MontreCode{black} par défaut
+ \item \MontreCode{CouleurFond} : fond de la première ligne; \MontreCode{lightgray!25} par défaut
+ \item \MontreCode{Note} : booléen pour afficher la colonne note ; \MontreCode{true} par défaut
+ \item \MontreCode{Notice} : booléen pour afficher la ligne notice; \MontreCode{true} par défaut.
+\end{itemize}
+
+L'argument, obligatoire et entre \MontreCode{\{...\}} est la liste des compétences, sous la forme \MontreCode{Comp A § Comp B § ...}.
+
+À noter que les clés \MontreCode{Niveaux} et \MontreCode{NoticeNiveaux} doivent avoir le même nombre d'éléments.
+
+\subsection{Exemples}
+
+\begin{DemoCode}{}
+%Note + Notice
+\TableauCompetences{Utiliser le compas § Utiliser l'équerre}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%- Note + Notice
+\TableauCompetences[Note=false]{Utiliser le compas § Utiliser l'équerre}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%Note - Notice
+\TableauCompetences[Notice=false]{Utiliser le compas § Utiliser l'équerre}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%- Note - Notice
+\TableauCompetences[Note=false,Notice=false]{Utiliser le compas § Utiliser l'équerre}
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%Personnalisations
+\TableauCompetences[Titre=Eval n°01,Niveaux=\TroisNivBatterie]{Utiliser le compas § Utiliser l'équerre}\par
+\TableauCompetences[Titre={},Niveaux=\TroisNivSmiley]{Utiliser le compas § Utiliser l'équerre}\par
+\TableauCompetences[Largeur=10cm,Notice=false,Titre={},Niveaux=\TroisNivSmiley]{Utiliser le compas § Utiliser l'équerre}\par
+\end{DemoCode}
+
+\begin{DemoCode}{}
+%deux niveaux
+\TableauCompetences[Niveaux=\LstDeuxNiv,NoticeNiveaux=\NoticeDeuxNiv]{Utiliser le compas § Utiliser l'équerre}\par
+\TableauCompetences[Largeur=10cm,Titre={},Niveaux=\DeuxNivBatterie, NoticeNiveaux=\NoticeDeuxNiv]{Utiliser le compas § Utiliser l'équerre}
+\end{DemoCode}
+
+\pagebreak
+
+\begin{DemoCode}{}
+%quatre niveaux, personnalisation 'complète'
+\def\LabelNoteComp{Appréc.}
+\TableauCompetences[%
+ Largeur=14cm,%
+ LargeurNivs={1cm§3.5cm},%
+ Niveaux={N0§N1§N2§N3},
+ NoticeNiveaux={Très bof§Bof§Moyen§Bien},
+ CouleurNotice=orange,%
+ CouleurNiveaux=blue,%
+ PolTitre=\large\ttfamily\itshape\bfseries
+ ]%
+ {Utiliser la règle § Utiliser le compas § Utiliser l'équerre}
+\end{DemoCode}
+
\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/customenvs/tex/customenvs.sty b/macros/latex/contrib/customenvs/tex/customenvs.sty
index e444e4e1f0..b58ff0ca36 100644
--- a/macros/latex/contrib/customenvs/tex/customenvs.sty
+++ b/macros/latex/contrib/customenvs/tex/customenvs.sty
@@ -2,9 +2,10 @@
% licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{customenvs}[2023/10/22 0.1.0 Custom classic environments]
+\ProvidesPackage{customenvs}[2023/10/25 0.1.1 Custom classic environments]
%====HISTORIQUE
+% v 0.1.1 Ajout de tableaux de compétences
% v 0.1.0 Version initiale
%====OPTIONS FR ET EN
@@ -17,10 +18,22 @@
\newif\if@multicol\@multicoltrue%
\DeclareOption{nonmulticol}{\@multicolfalse}%
\DeclareOption{nomulticol}{\@multicolfalse}%
+\newif\if@xcolor\@xcolortrue%
+\DeclareOption{nonxcolor}{\@xcolorfalse}%
+\DeclareOption{noxcolor}{\@xcolorfalse}%
+\newif\if@fa\@fatrue%
+\DeclareOption{nonfa}{\@fafalse}%
+\DeclareOption{nofa}{\@fafalse}%
\DeclareOption*{}
\ProcessOptions\relax
%====PACKAGES UTILES À CHARGER
+\if@xcolor
+ \RequirePackage{xcolor}
+\fi
+\if@fa
+ \RequirePackage{fontawesome5}
+\fi
\if@enum
\RequirePackage{enumitem}
\fi
@@ -264,6 +277,310 @@
}%
}
+%====TABLEAU DE COMPÉTENCES
+%patch fa vcenter
+\NewDocumentCommand{\vcenterfa}{ O{} m }{$\vcenter{\hbox{\faIcon[#1]{#2}}}$}
+
+%labelnote
+\def\LabelNoteComp{Note}
+%listeniveaux
+\def\LstDeuxNiv{NA § A}
+\def\LstTroisNiv{NA § ECA § A}
+\def\LstQuatreNiv{NA § PA § ECA § A}
+%noticeniveaux
+\def\NoticeDeuxNiv{Non acquis § Acquis}
+\def\NoticeTroisNiv{Non acquis § En cours d'acquis. § Acquis}
+\def\NoticeQuatreNiv{Non acquis § Part. acquis § En cours d'acquis. § Acquis}
+%nivparbatteries
+\def\DeuxNivBatterie{\vcenterfa[solid]{battery-quarter} § \vcenterfa[solid]{battery-full}}
+\def\TroisNivBatterie{\vcenterfa[solid]{battery-quarter} § \vcenterfa[solid]{battery-half} § \vcenterfa[solid]{battery-full}}
+\def\QuatreNivBatterie{\vcenterfa[solid]{battery-empty} § \vcenterfa[solid]{battery-quarter} § \vcenterfa[solid]{battery-half} § \vcenterfa[solid]{battery-full}}
+%nivparsmileys
+\def\DeuxNivSmiley{\vcenterfa[regular]{angry} § \vcenterfa[regular]{smile}}
+\def\TroisNivSmiley{\vcenterfa[regular]{angry} § \vcenterfa[regular]{frown} § \vcenterfa[regular]{smile}}
+\def\QuatreNivSmiley{\vcenterfa[regular]{angry} § \vcenterfa[regular]{frown} § \vcenterfa[regular]{smile} § \vcenterfa[regular]{grin}}
+
+% ========================tableau compétences
+\defKV[tblcomp]{%
+ Largeur=\def\COMPETlargeur{#1},%
+ LargeurNivs=\def\COMPETlargeurs{#1},%
+ Niveaux=\def\COMPETniveaux{#1},%
+ NoticeNiveaux=\def\COMPETnoticeniveaux{#1},%
+ Titre=\def\COMPETtitre{#1},%
+ PolTitre=\def\COMPETlegende{#1},%
+ PolComp=\def\COMPETcomp{#1},%
+ PolNotice=\def\COMPETnotice{#1},%
+ LigneSep=\def\COMPETsep{#1}
+}
+
+\setKVdefault[tblcomp]{%
+ Largeur=0.95\linewidth,%
+ LargeurNivs={0.75cm § 1.25cm},%niv + note
+ Niveaux={NA § ECA § A},%
+ NoticeNiveaux={Non acquis § En cours d'acquisition § Acquis},%
+ Titre=DS01,%
+ PolTitre=\small\sffamily\bfseries,%
+ PolNotice=\small\sffamily\bfseries,%
+ PolComp=\small\sffamily,%
+ LigneSep=2pt,%
+ CouleurNotice=black,%
+ CouleurNiveaux=black,%
+ CouleurFond=lightgray!25,%
+ Note=true,%
+ Notice=true
+}
+
+%pour créer le body du tableau (j'ai encore du mal avec ça...)
+\long\def\tblcompaddto#1#2{\expandafter\def\expandafter#1\expandafter{#1#2}}
+
+\NewDocumentCommand{\TableauCompetences}{ O{} m }{%1=options,2=liste compétences
+ \useKVdefault[tblcomp]%
+ \setKV[tblcomp]{#1}% on paramètres les nouvelles clés et on les simplifie
+ \setsepchar{§}%
+ \readlist*\ListeCompetences{#2}%
+ \readlist*\ListeNiveaux{\COMPETniveaux}%
+ \readlist*\ListeLargeurs{\COMPETlargeurs}%
+ \readlist*\ListeNoticeNiveaux{\COMPETnoticeniveaux}%
+ \def\CPtabledatacomp{}%
+ \xintifboolexpr{\ListeNiveauxlen == 2}%avec 3 niveaux de compétences
+ {%
+ \ifboolKV[tblcomp]{Note}%
+ {%
+ \tblcompaddto\CPtabledatacomp{\COMPETtitre & \ListeNiveaux[1] & \ListeNiveaux[2] & \LabelNoteComp \\}%
+ \xintFor* ##1 in {\xintSeq{1}{\ListeCompetenceslen}}\do{%
+ \tblcompaddto\CPtabledatacomp{\ListeCompetences[\the\numexpr\therownum-1\relax] & & & \\}%
+ }%
+ \ifboolKV[tblcomp]{Notice}%
+ {%
+ \tblcompaddto\CPtabledatacomp{{\ListeNiveaux[1]} : {\ListeNoticeNiveaux[1]} / {\ListeNiveaux[2]} : {\ListeNoticeNiveaux[2]} & & & \\}
+ %creation du tableau note+notice
+ \begin{tblr}[expand=\CPtabledatacomp]%
+ {%
+ width={\COMPETlargeur},%
+ hlines,vlines,colspec={X[l,b]*{2}{Q[c,b,\ListeLargeurs[1]]}Q[c,b,\ListeLargeurs[2]]},%
+ rowsep=\COMPETsep,%
+ row{1}={font=\COMPETlegende,fg=\useKV[tblcomp]{CouleurNiveaux},bg=\useKV[tblcomp]{CouleurFond}},%
+ row{2-Y}={font=\COMPETcomp},%
+ row{Z}={font=\COMPETnotice,fg=\useKV[tblcomp]{CouleurNotice}},%
+ cell{2}{Z}={r=\the\numexpr\ListeCompetenceslen+1\relax}{},%
+ cell{Z}{1}={c=3}{}
+ }%
+ \CPtabledatacomp
+ \end{tblr}%
+ }%
+ {%
+ %creation du tableau note-notice
+ \begin{tblr}[expand=\CPtabledatacomp]%
+ {%
+ width={\COMPETlargeur},%
+ hlines,vlines,colspec={X[l,b]*{2}{Q[c,b,\ListeLargeurs[1]]}Q[c,b,\ListeLargeurs[2]]},%
+ rowsep=\COMPETsep,%
+ row{1}={font=\COMPETlegende,fg=\useKV[tblcomp]{CouleurNiveaux},bg=\useKV[tblcomp]{CouleurFond}},%
+ row{2-Z}={font=\COMPETcomp},%
+ cell{2}{Z}={r=\the\numexpr\ListeCompetenceslen\relax}{}
+ }%
+ \CPtabledatacomp
+ \end{tblr}%
+ }%
+ }%
+ {%
+ \tblcompaddto\CPtabledatacomp{\COMPETtitre & \ListeNiveaux[1] & \ListeNiveaux[2] \\}%
+ \xintFor* ##1 in {\xintSeq{1}{\ListeCompetenceslen}}\do{%
+ \tblcompaddto\CPtabledatacomp{\ListeCompetences[\the\numexpr\therownum-1\relax] & & \\}%
+ }%
+ \ifboolKV[tblcomp]{Notice}%
+ {%
+ \tblcompaddto\CPtabledatacomp{{\ListeNiveaux[1]} : {\ListeNoticeNiveaux[1]} / {\ListeNiveaux[2]} : {\ListeNoticeNiveaux[2]} & & \\}
+ %creation du tableau -note+notice
+ \begin{tblr}[expand=\CPtabledatacomp]%
+ {%
+ width={\COMPETlargeur},%
+ hlines,vlines,colspec={X[l,b]*{2}{Q[c,b,\ListeLargeurs[1]]}},%
+ rowsep=\COMPETsep,%
+ row{1}={font=\COMPETlegende,fg=\useKV[tblcomp]{CouleurNiveaux},bg=\useKV[tblcomp]{CouleurFond}},%
+ row{2-Y}={font=\COMPETcomp},%
+ row{Z}={font=\COMPETnotice,fg=\useKV[tblcomp]{CouleurNotice}},%
+ cell{Z}{1}={c=3}{}
+ }%
+ \CPtabledatacomp
+ \end{tblr}%
+ }%
+ {%
+ %creation du tableau -note-notice
+ \begin{tblr}[expand=\CPtabledatacomp]%
+ {%
+ width={\COMPETlargeur},%
+ hlines,vlines,colspec={X[l,b]*{2}{Q[c,b,\ListeLargeurs[1]]}},%
+ rowsep=\COMPETsep,%
+ row{1}={font=\COMPETlegende,fg=\useKV[tblcomp]{CouleurNiveaux},bg=\useKV[tblcomp]{CouleurFond}},%
+ row{2-Z}={font=\COMPETcomp}
+ }%
+ \CPtabledatacomp
+ \end{tblr}%
+ }%
+ }%
+ }%
+ {}%
+ \xintifboolexpr{\ListeNiveauxlen == 3}%avec 3 niveaux de compétences
+ {%
+ \ifboolKV[tblcomp]{Note}%
+ {%
+ \tblcompaddto\CPtabledatacomp{\COMPETtitre & \ListeNiveaux[1] & \ListeNiveaux[2] & \ListeNiveaux[3] & \LabelNoteComp \\}%
+ \xintFor* ##1 in {\xintSeq{1}{\ListeCompetenceslen}}\do{%
+ \tblcompaddto\CPtabledatacomp{\ListeCompetences[\the\numexpr\therownum-1\relax] & & & & \\}%
+ }%
+ \ifboolKV[tblcomp]{Notice}%
+ {%
+ \tblcompaddto\CPtabledatacomp{{\ListeNiveaux[1]} : {\ListeNoticeNiveaux[1]} / {\ListeNiveaux[2]} : {\ListeNoticeNiveaux[2]} / {\ListeNiveaux[3]} : {\ListeNoticeNiveaux[3]} & & & & \\}
+ %creation du tableau note+notice
+ \begin{tblr}[expand=\CPtabledatacomp]%
+ {%
+ width={\COMPETlargeur},%
+ hlines,vlines,colspec={X[l,b]*{3}{Q[c,b,\ListeLargeurs[1]]}Q[c,b,\ListeLargeurs[2]]},%
+ rowsep=\COMPETsep,%
+ row{1}={font=\COMPETlegende,fg=\useKV[tblcomp]{CouleurNiveaux},bg=\useKV[tblcomp]{CouleurFond}},%
+ row{2-Y}={font=\COMPETcomp},%
+ row{Z}={font=\COMPETnotice,fg=\useKV[tblcomp]{CouleurNotice}},%
+ cell{2}{Z}={r=\the\numexpr\ListeCompetenceslen+1\relax}{},%
+ cell{Z}{1}={c=4}{}
+ }%
+ \CPtabledatacomp
+ \end{tblr}%
+ }%
+ {%
+ %creation du tableau note-notice
+ \begin{tblr}[expand=\CPtabledatacomp]%
+ {%
+ width={\COMPETlargeur},%
+ hlines,vlines,colspec={X[l,b]*{3}{Q[c,b,\ListeLargeurs[1]]}Q[c,b,\ListeLargeurs[2]]},%
+ rowsep=\COMPETsep,%
+ row{1}={font=\COMPETlegende,fg=\useKV[tblcomp]{CouleurNiveaux},bg=\useKV[tblcomp]{CouleurFond}},%
+ row{2-Z}={font=\COMPETcomp},%
+ cell{2}{Z}={r=\the\numexpr\ListeCompetenceslen\relax}{}
+ }%
+ \CPtabledatacomp
+ \end{tblr}%
+ }%
+ }%
+ {%
+ \tblcompaddto\CPtabledatacomp{\COMPETtitre & \ListeNiveaux[1] & \ListeNiveaux[2] & \ListeNiveaux[3] \\}%
+ \xintFor* ##1 in {\xintSeq{1}{\ListeCompetenceslen}}\do{%
+ \tblcompaddto\CPtabledatacomp{\ListeCompetences[\the\numexpr\therownum-1\relax] & & & \\}%
+ }%
+ \ifboolKV[tblcomp]{Notice}%
+ {%
+ \tblcompaddto\CPtabledatacomp{{\ListeNiveaux[1]} : {\ListeNoticeNiveaux[1]} / {\ListeNiveaux[2]} : {\ListeNoticeNiveaux[2]} / {\ListeNiveaux[3]} : {\ListeNoticeNiveaux[3]} & & & \\}
+ %creation du tableau -note+notice
+ \begin{tblr}[expand=\CPtabledatacomp]%
+ {%
+ width={\COMPETlargeur},%
+ hlines,vlines,colspec={X[l,b]*{3}{Q[c,b,\ListeLargeurs[1]]}},%
+ rowsep=\COMPETsep,%
+ row{1}={font=\COMPETlegende,fg=\useKV[tblcomp]{CouleurNiveaux},bg=\useKV[tblcomp]{CouleurFond}},%
+ row{2-Y}={font=\COMPETcomp},%
+ row{Z}={font=\COMPETnotice,fg=\useKV[tblcomp]{CouleurNotice}},%
+ cell{Z}{1}={c=4}{}
+ }%
+ \CPtabledatacomp
+ \end{tblr}%
+ }%
+ {%
+ %creation du tableau -note-notice
+ \begin{tblr}[expand=\CPtabledatacomp]%
+ {%
+ width={\COMPETlargeur},%
+ hlines,vlines,colspec={X[l,b]*{3}{Q[c,b,\ListeLargeurs[1]]}},%
+ rowsep=\COMPETsep,%
+ row{1}={font=\COMPETlegende,fg=\useKV[tblcomp]{CouleurNiveaux},bg=\useKV[tblcomp]{CouleurFond}},%
+ row{2-Z}={font=\COMPETcomp}
+ }%
+ \CPtabledatacomp
+ \end{tblr}%
+ }%
+ }%
+ }%
+ {}%
+ \xintifboolexpr{\ListeNiveauxlen == 4}%maintenant avec 4 niveaux de compétences
+ {%
+ \ifboolKV[tblcomp]{Note}%
+ {%
+ \tblcompaddto\CPtabledatacomp{\COMPETtitre & \ListeNiveaux[1] & \ListeNiveaux[2] & \ListeNiveaux[3] & \ListeNiveaux[4] & \LabelNoteComp \\}%
+ \xintFor* ##1 in {\xintSeq{1}{\ListeCompetenceslen}}\do{%
+ \tblcompaddto\CPtabledatacomp{\ListeCompetences[\the\numexpr\therownum-1\relax] & & & & & \\}%
+ }%
+ \ifboolKV[tblcomp]{Notice}%
+ {%
+ \tblcompaddto\CPtabledatacomp{{\ListeNiveaux[1]} : {\ListeNoticeNiveaux[1]} / {\ListeNiveaux[2]} : {\ListeNoticeNiveaux[2]} / {\ListeNiveaux[3]} : {\ListeNoticeNiveaux[3]} / {\ListeNiveaux[4]} : {\ListeNoticeNiveaux[4]} & & & & & \\}
+ %creation du tableau note+notice
+ \begin{tblr}[expand=\CPtabledatacomp]%
+ {%
+ width={\COMPETlargeur},%
+ hlines,vlines,colspec={X[l,b]*{4}{Q[c,b,\ListeLargeurs[1]]}Q[c,b,\ListeLargeurs[2]]},%
+ rowsep=\COMPETsep,%
+ row{1}={font=\COMPETlegende,fg=\useKV[tblcomp]{CouleurNiveaux},bg=\useKV[tblcomp]{CouleurFond}},%
+ row{2-Y}={font=\COMPETcomp},%
+ row{Z}={font=\COMPETnotice,fg=\useKV[tblcomp]{CouleurNotice}},%
+ cell{2}{Z}={r=\the\numexpr\ListeCompetenceslen+1\relax}{},%
+ cell{Z}{1}={c=5}{}
+ }%
+ \CPtabledatacomp
+ \end{tblr}%
+ }%
+ {%
+ %creation du tableau note-notice
+ \begin{tblr}[expand=\CPtabledatacomp]%
+ {%
+ width={\COMPETlargeur},%
+ hlines,vlines,colspec={X[l,b]*{4}{Q[c,b,\ListeLargeurs[1]]}Q[c,b,\ListeLargeurs[2]]},%
+ rowsep=\COMPETsep,%
+ row{1}={font=\COMPETlegende,fg=\useKV[tblcomp]{CouleurNiveaux},bg=\useKV[tblcomp]{CouleurFond}},%
+ row{2-Z}={font=\COMPETcomp},%
+ cell{2}{Z}={r=\the\numexpr\ListeCompetenceslen\relax}{}
+ }%
+ \CPtabledatacomp
+ \end{tblr}%
+ }%
+ }%
+ {%
+ \tblcompaddto\CPtabledatacomp{\COMPETtitre & \ListeNiveaux[1] & \ListeNiveaux[2] & \ListeNiveaux[3] & \ListeNiveaux[4] \\}%
+ \xintFor* ##1 in {\xintSeq{1}{\ListeCompetenceslen}}\do{%
+ \tblcompaddto\CPtabledatacomp{\ListeCompetences[\the\numexpr\therownum-1\relax] & & & & \\}%
+ }%
+ \ifboolKV[tblcomp]{Notice}%
+ {%
+ \tblcompaddto\CPtabledatacomp{{\ListeNiveaux[1]} : {\ListeNoticeNiveaux[1]} / {\ListeNiveaux[2]} : {\ListeNoticeNiveaux[2]} / {\ListeNiveaux[3]} : {\ListeNoticeNiveaux[3]} / {\ListeNiveaux[4]} : {\ListeNoticeNiveaux[4]} & & & & \\}
+ %creation du tableau -note+notice
+ \begin{tblr}[expand=\CPtabledatacomp]%
+ {%
+ width={\COMPETlargeur},%
+ hlines,vlines,colspec={X[l,b]*{4}{Q[c,b,\ListeLargeurs[1]]}},%
+ rowsep=\COMPETsep,%
+ row{1}={font=\COMPETlegende,fg=\useKV[tblcomp]{CouleurNiveaux},bg=\useKV[tblcomp]{CouleurFond}},%
+ row{2-Y}={font=\COMPETcomp},%
+ row{Z}={font=\COMPETnotice,fg=\useKV[tblcomp]{CouleurNotice}},%
+ cell{Z}{1}={c=5}{}
+ }%
+ \CPtabledatacomp
+ \end{tblr}%
+ }%
+ {%
+ %creation du tableau -note-notice
+ \begin{tblr}[expand=\CPtabledatacomp]%
+ {%
+ width={\COMPETlargeur},%
+ hlines,vlines,colspec={X[l,b]*{4}{Q[c,b,\ListeLargeurs[1]]}},%
+ rowsep=\COMPETsep,%
+ row{1}={font=\COMPETlegende,fg=\useKV[tblcomp]{CouleurNiveaux},bg=\useKV[tblcomp]{CouleurFond}},%
+ row{2-Z}={font=\COMPETcomp}
+ }%
+ \CPtabledatacomp
+ \end{tblr}%
+ }%
+ }%
+ }%
+ {}%
+}
+
%%----COMMANDES EN
%====QCMs
diff --git a/macros/latex/contrib/hereapplies/ChangeLog.md b/macros/latex/contrib/hereapplies/ChangeLog.md
index ce47739407..bc1fb69352 100644
--- a/macros/latex/contrib/hereapplies/ChangeLog.md
+++ b/macros/latex/contrib/hereapplies/ChangeLog.md
@@ -2,6 +2,13 @@ Change Log
==========
+## 1.0.2 (2022-10-24)
+
+Changes:
+
+* Documentation
+
+
## 1.0.1 (2022-12-11)
Changes:
diff --git a/macros/latex/contrib/hereapplies/README.md b/macros/latex/contrib/hereapplies/README.md
index 6767f52376..eb6b7c6814 100644
--- a/macros/latex/contrib/hereapplies/README.md
+++ b/macros/latex/contrib/hereapplies/README.md
@@ -14,14 +14,14 @@ that share something in common.
The package offers two commands: `\hereapplies` and `\whereapplies` (plus their
“starred” versions `\hereapplies*` and `\whereapplies*`). In both cases an
-identifier is passed as argument – and this can be any string invented in the
+identifier is passed as argument, and this can be any string invented in the
moment (`\hereapplies` additionally supports more than one identifier in the
form of a comma-separated list).
Every time `\hereapplies` is invoked with known identifiers, the document is
made aware that the place shares some kind of connection with other places in
which the same identifiers were used. And so, every time the `\whereapplies`
-command is invoked with a known identifier, all the occurrences of the latter
+command is invoked with a known identifier, all occurrences of the latter
within the entire document will be printed in the form of a linkable page list
(e.g. “pp. 1, 5, 8–9, 14–20…”).
diff --git a/macros/latex/contrib/hereapplies/hereapplies-doc.lyx b/macros/latex/contrib/hereapplies/hereapplies-doc.lyx
index 6cb338307e..f17f96c174 100644
--- a/macros/latex/contrib/hereapplies/hereapplies-doc.lyx
+++ b/macros/latex/contrib/hereapplies/hereapplies-doc.lyx
@@ -192,7 +192,7 @@ hereapplies*
whereapplies*
\family default
).
- In both cases an identifier is passed as argument – and this can be any
+ In both cases an identifier is passed as argument, and this can be any
string invented in the moment (
\family typewriter
@@ -219,9 +219,9 @@ hereapplies
\backslash
whereapplies
\family default
- command is invoked with a known identifier, all the occurrences of the
- latter within the entire document will be printed in the form of a linkable
- page list (e.g.
+ command is invoked with a known identifier, all occurrences of the latter
+ within the entire document will be printed in the form of a linkable page
+ list (e.g.
\begin_inset Quotes eld
\end_inset
diff --git a/macros/latex/contrib/hereapplies/hereapplies-doc.pdf b/macros/latex/contrib/hereapplies/hereapplies-doc.pdf
index 56747de4a0..aa672327e2 100644
--- a/macros/latex/contrib/hereapplies/hereapplies-doc.pdf
+++ b/macros/latex/contrib/hereapplies/hereapplies-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/hereapplies/hereapplies-doc.tex b/macros/latex/contrib/hereapplies/hereapplies-doc.tex
index 01a7ceeb7a..04a42f7cb4 100644
--- a/macros/latex/contrib/hereapplies/hereapplies-doc.tex
+++ b/macros/latex/contrib/hereapplies/hereapplies-doc.tex
@@ -1,4 +1,4 @@
-%% LyX 2.3.6.1 created this file. For more info, see http://www.lyx.org/.
+%% LyX 2.3.7 created this file. For more info, see http://www.lyx.org/.
%% Do not edit unless you really know what you are doing.
\documentclass[english]{article}
\usepackage[T1]{fontenc}
@@ -65,8 +65,8 @@ or simply mentioning multiple pages that share something in common.
The package offers two commands: \texttt{\textbackslash hereapplies}
and \texttt{\textbackslash whereapplies} (plus their ``starred''
versions \texttt{\textbackslash hereapplies{*}} and \texttt{\textbackslash whereapplies{*}}).
-In both cases an identifier is passed as argument -- and this can
-be any string invented in the moment (\texttt{\textbackslash hereapplies}
+In both cases an identifier is passed as argument, and this can be
+any string invented in the moment (\texttt{\textbackslash hereapplies}
additionally supports more than one identifier in the form of a comma-separated
list).
@@ -74,9 +74,9 @@ Every time \texttt{\textbackslash hereapplies} is invoked with known
identifiers, the document is made aware that the place shares some
kind of connection with other places in which the same identifiers
were used. And so, every time the \texttt{\textbackslash whereapplies}
-command is invoked with a known identifier, all the occurrences of
-the latter within the entire document will be printed in the form
-of a linkable page list (e.g. ``pp.\ 1, 5, 8--9, 14--20\dots '').
+command is invoked with a known identifier, all occurrences of the
+latter within the entire document will be printed in the form of a
+linkable page list (e.g. ``pp.\ 1, 5, 8--9, 14--20\dots '').
As \texttt{\textbackslash hereapplies} is designed to be invoked
in the middle of a chapter or a section and that location must be
diff --git a/macros/latex/contrib/hereapplies/hereapplies-example.pdf b/macros/latex/contrib/hereapplies/hereapplies-example.pdf
index e2f286dbb2..5262adfbd7 100644
--- a/macros/latex/contrib/hereapplies/hereapplies-example.pdf
+++ b/macros/latex/contrib/hereapplies/hereapplies-example.pdf
Binary files differ
diff --git a/macros/latex/contrib/hereapplies/hereapplies.sty b/macros/latex/contrib/hereapplies/hereapplies.sty
index 222858bc0b..b622be2e12 100644
--- a/macros/latex/contrib/hereapplies/hereapplies.sty
+++ b/macros/latex/contrib/hereapplies/hereapplies.sty
@@ -8,7 +8,7 @@
%
% https://github.com/madmurphy/hereapplies.sty
%
-% Version 1.0.1
+% Version 1.0.2
%
% Copyright (C) 2022 madmurphy <madmurphy333@gmail.com>
%
@@ -66,7 +66,7 @@
% \end{document}
%
%
-\ProvidesPackage{hereapplies}[2022/12/11 Here Applies]
+\ProvidesPackage{hereapplies}[2023/10/24 Here Applies]
\RequirePackage{hyperref}
\RequirePackage{refcount}
%
@@ -90,7 +90,8 @@
% ABSTRACT UTILITIES
% ==================
%
-% These macros are not strictly related to this package, but are required.
+% The following macros are not strictly related to this package, but the latter
+% requires them.
%
%
% Macro: `\@ha@ifcomma text to check,\@then{if yes}{if no}`
@@ -136,8 +137,8 @@
% PRIVATE ENVIRONMENT
% ===================
%
-% These macros regulate the internal functioning of the package and should not
-% be invoked directly.
+% The following macros regulate the internal functioning of the package and
+% should not be invoked directly.
%
%
% Assign a unique number to each unlabeled occurrence of an identifier
@@ -350,8 +351,8 @@
% LIBRARY ENVIRONMENT
% ===================
%
-% These macros are not directly available to the user, but are callable by
-% other packages, if needed.
+% The following macros are not directly available to the user, but are callable
+% by other packages, if needed.
%
%
% Macro: `\starred@nochecks@hereapplies{label}{identifiers}`
@@ -469,7 +470,7 @@
% USER ENVIRONMENT
% ================
%
-% These macros are directly available to the user.
+% The following macros are available to the user.
%
%
% Macro: `\hereapplies[label]{identifiers}`
@@ -500,7 +501,7 @@
% Macro: `\whereapplies{identifier}`
% *****************************************************************************
%
-% Print all the occurrences of an identifier in the form "p. ..." or "pp. ..."
+% Print all occurrences of an identifier in the form "p. ..." or "pp. ..."
% (with page range support)
%
% The `identifier` argument remains confined within the internal scope of the
diff --git a/macros/latex/contrib/hereapplies/package.json b/macros/latex/contrib/hereapplies/package.json
index 8949cd7300..18ee9bf032 100644
--- a/macros/latex/contrib/hereapplies/package.json
+++ b/macros/latex/contrib/hereapplies/package.json
@@ -1,6 +1,6 @@
{
"name": "hereapplies.sty",
- "version": "1.0.1",
+ "version": "1.0.2",
"description": "A LaTeX package for referencing groups of pages that share something in common",
"homepage": "https://www.ctan.org/pkg/hereapplies",
"author": "madmurphy",
diff --git a/macros/latex/contrib/nicematrix/nicematrix-code.dtx b/macros/latex/contrib/nicematrix/nicematrix-code.dtx
index 8246cffbd8..4605970134 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-code.dtx
+++ b/macros/latex/contrib/nicematrix/nicematrix-code.dtx
@@ -17,8 +17,8 @@
%
% \fi
% \iffalse
-\def\myfileversion{6.24}
-\def\myfiledate{2023/09/28}
+\def\myfileversion{6.25}
+\def\myfiledate{2023/10/24}
%
%
%<*batchfile>
@@ -62,6 +62,9 @@ version 2005/12/01 or later.
\def\interitem{\vspace{7mm plus 2 mm minus 3mm}}
\fvset{commandchars=\~\#\@,formatcom=\color{gray}}
+
+\usepackage{upquote}
+
\usepackage{titlesec}
\titlespacing*{\section}{0pt}{6.5ex plus 1ex minus .2ex}{4.3ex plus .2ex}
\titlespacing*{\subsection}{0pt}{4.5ex plus 1ex minus .2ex}{2ex plus .2ex}
@@ -166,7 +169,7 @@ version 2005/12/01 or later.
\cs_new_protected:Npn \@@_error:n { \msg_error:nn { nicematrix } }
\cs_new_protected:Npn \@@_warning:n { \msg_warning:nn { nicematrix } }
\cs_new_protected:Npn \@@_error:nn { \msg_error:nnn { nicematrix } }
-\cs_generate_variant:Nn \@@_error:nn { n x }
+\cs_generate_variant:Nn \@@_error:nn { n e }
\cs_new_protected:Npn \@@_error:nnn { \msg_error:nnnn { nicematrix } }
\cs_new_protected:Npn \@@_fatal:n { \msg_fatal:nn { nicematrix } }
\cs_new_protected:Npn \@@_fatal:nn { \msg_fatal:nnn { nicematrix } }
@@ -376,7 +379,6 @@ version 2005/12/01 or later.
%
% \begin{macrocode}
\cs_generate_variant:Nn \seq_set_split:Nnn { N V n }
-\cs_generate_variant:Nn \keys_define:nn { n x }
\cs_generate_variant:Nn \str_lowercase:n { V }
% \end{macrocode}
%
@@ -412,14 +414,14 @@ version 2005/12/01 or later.
%
% We test whether the current class is \cls{revtex4-1} (deprecated) or
% \cls{revtex4-2} because these classes redefines |\array| (of \pkg{array}) in a
-% way incompatible with our programmation. At the date March 2023, the current
-% version \cls{revtex4-2} is 4.2e (compatible with \pkg{booktabs}).
+% way incompatible with our programmation. At the date May 2023, the current
+% version \cls{revtex4-2} is 4.2f (compatible with \pkg{booktabs}).
%
% \begin{macrocode}
-\@ifclassloaded { revtex4-1 }
+\IfClassLoadedTF { revtex4-1 }
{ \bool_const:Nn \c_@@_revtex_bool \c_true_bool }
{
- \@ifclassloaded { revtex4-2 }
+ \IfClassLoadedTF { revtex4-2 }
{ \bool_const:Nn \c_@@_revtex_bool \c_true_bool }
{
% \end{macrocode}
@@ -438,12 +440,6 @@ version 2005/12/01 or later.
\cs_generate_variant:Nn \tl_if_single_token_p:n { V }
% \end{macrocode}
%
-% \bigskip
-% The following regex will be used to modify the preamble of the array when the
-% key |color-inside| is used.
-% \begin{macrocode}
-\regex_const:Nn \c_@@_columncolor_regex { \c { columncolor } }
-% \end{macrocode}
%
% \bigskip
% If the final user uses \pkg{nicematrix}, PGF/Tikz will write instruction
@@ -573,7 +569,7 @@ version 2005/12/01 or later.
\cs_set:Npn \@@_standard_cline #1 { \@@_standard_cline:w #1 \q_stop }
\cs_set:Npn \@@_standard_cline:w #1-#2 \q_stop
{
- \int_compare:nNnT \l_@@_first_col_int = 0 { \omit & }
+ \int_if_zero:nT \l_@@_first_col_int { \omit & }
\int_compare:nNnT { #1 } > 1 { \multispan { \int_eval:n { #1 - 1 } } & }
\multispan { \int_eval:n { #2 - #1 + 1 } }
{
@@ -722,6 +718,98 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \bigskip
+% Since we will do ourself the expansion of the preamble of the array, we will
+% modify |\@mkpream| of \pkg{array} in order to skip the operation of expansion
+% done by |\@mkpream|.
+% \begin{macrocode}
+\cs_set_eq:NN \@@_old_mkpream: \@mkpream
+\cs_set_protected:Npn \@@_mkpream: #1
+ {
+% \end{macrocode}
+% The command |\@@_mkpream_colortbl:| will be empty when \pkg{colortbl} is not loaded.
+% \begin{macrocode}
+ \@@_mkpream_colortbl:
+ \gdef\@preamble{} \@lastchclass 4 \@firstamptrue
+ \let\@sharp\relax
+ \def\@startpbox##1{\unexpanded\expandafter{\expandafter
+ \@startpbox\expandafter{##1}}}\let\@endpbox\relax
+ \let\do@row@strut\relax
+ \let\ar@align@mcell\relax
+ \@temptokena{#1} % \@tempswatrue
+ % \@whilesw\if@tempswa\fi{\@tempswafalse\the\NC@list}%
+ \count@\m@ne
+ \let\the@toks\relax
+ \prepnext@tok
+% \end{macrocode}
+% We have slightly modified the code of the original version of |\@mkpream| in
+% order to have something compatible with |\ExplSyntaxOn|.
+% \begin{macrocode}
+ \exp_args:NV \tl_map_variable:NNn \@temptokena \@nextchar
+ {\@testpach
+ \ifcase \@chclass \@classz \or \@classi \or \@classii
+ \or \save@decl \or \or \@classv \or \@classvi
+ \or \@classvii \or \@classviii
+ \or \@classx
+ \or \@classx \fi
+ \@lastchclass\@chclass}%
+ \ifcase\@lastchclass
+ \@acol \or
+ \or
+ \@acol \or
+ \@preamerr \thr@@ \or
+ \@preamerr \tw@ \@addtopreamble\@sharp \or
+ \or
+ \else \@preamerr \@ne \fi
+ \def\the@toks{\the\toks}
+% \end{macrocode}
+% After an utilisation of the modified version of |\@mkpream|, we come back to
+% the original version because there may be occurrences of the classical
+% |{array}| in the cells of our array (of \pkg{nicematrix}).
+% \begin{macrocode}
+ \cs_gset_eq:NN \@mkpream \@@_old_mkpream:
+ }
+% \end{macrocode}
+% The classes of REVTeX do their own redefinition of |\array| and that's why the
+% previous mechanisme is not compatible with REVTeX. However, it would probably
+% be possible to do something similar for REVTeX...
+% \begin{macrocode}
+\bool_if:NTF \c_@@_revtex_bool
+ { \cs_new_protected:Npn \@@_redefine_mkpream: { } }
+ {
+ \cs_new_protected:Npn \@@_redefine_mkpream:
+ { \cs_set_eq:NN \@mkpream \@@_mkpream: }
+ }
+% \end{macrocode}
+%
+% \bigskip
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_mkpream_colortbl: { }
+\hook_gput_code:nnn { begindocument } { . }
+ {
+ \IfPackageLoadedTF { colortbl }
+ {
+ \cs_set_protected:Npn \@@_mkpream_colortbl:
+ {
+% \end{macrocode}
+% The following lines are a patch added to |\@mkpream| by \pkg{colortbl} (by
+% storing the version of |\@mkpream| provided by \pkg{array} in
+% |\@mkpreamarray|). Since you do a redefinition of |\@mkpream|, you have to add
+% the following lines in our redefinition when \pkg{colortbl} is loaded.
+% \begin{macrocode}
+ \cs_set_eq:NN \CT@setup \relax
+ \cs_set_eq:NN \CT@color \relax
+ \cs_set_eq:NN \CT@do@color \relax
+ \cs_set_eq:NN \color \relax
+ \cs_set_eq:NN \CT@column@color \relax
+ \cs_set_eq:NN \CT@row@color \relax
+ \cs_set_eq:NN \CT@cell@color \relax
+ }
+ }
+ { }
+ }
+% \end{macrocode}
+%
+% \bigskip
% \section{Parameters}
%
% \bigskip
@@ -779,7 +867,7 @@ version 2005/12/01 or later.
%
% \medskip
% The following boolean will be equal to |true| in the environments which have
-% an environment (provided by the final user): |{NiceTabular}|, |{NiceArray}|,
+% a preamble (provided by the final user): |{NiceTabular}|, |{NiceArray}|,
% |{pNiceArray}|, etc.
% \begin{macrocode}
\bool_new:N \l_@@_preamble_bool
@@ -979,7 +1067,7 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \bigskip
-% In particuler, in that |aux| file, there will, for each environment of
+% In particuler, in that |aux| file, there will be, for each environment of
% \pkg{nicematrix}, an affectation for the the following sequence that will
% contain informations about the size of the array.
% \begin{macrocode}
@@ -1029,6 +1117,13 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \bigskip
+% We will store in the following sequence informations provided by the
+% instructions |\rowlistcolors| in the main array (not in the |\CodeBefore|).
+% \begin{macrocode}
+\seq_new:N \g_@@_rowlistcolors_seq
+% \end{macrocode}
+%
+% \bigskip
% \begin{macrocode}
\cs_new_protected:Npn \@@_test_if_math_mode:
{
@@ -1038,12 +1133,6 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
-% \bigskip
-% The letter used for the vlines which will be drawn only in the sub-matrices.
-% |vlism| stands for \emph{vertical lines in sub-matrices}.
-% \begin{macrocode}
-\tl_new:N \l_@@_letter_vlism_tl
-% \end{macrocode}
%
% The list of the columns where vertical lines in sub-matrices (vlism) must be
% drawn. Of course, the actual value of this sequence will be known after the
@@ -1579,7 +1668,8 @@ version 2005/12/01 or later.
% but we don't know its value because the user has used the option |last-col|
% without value. A value of $0$ means that the option |last-col| has been used
% in an environment with preamble (like |{pNiceArray}|): in this case, the key
-% was necessary without argument.
+% was necessary without argument. The command |\NiceMatrixOptions| also sets
+% |\l_@@_last_col_int| to~$0$.
% \begin{macrocode}
\int_new:N \l_@@_last_col_int
\int_set:Nn \l_@@_last_col_int { -2 }
@@ -1882,10 +1972,10 @@ version 2005/12/01 or later.
\seq_map_break:
}
}
- \int_compare:nNnF \l_tmpa_int = \c_zero_int
+ \int_if_zero:nF \l_tmpa_int
{ \int_add:Nn \l_tmpa_int \g_@@_notes_caption_int }
}
- \int_compare:nNnT \l_tmpa_int = \c_zero_int
+ \int_if_zero:nT \l_tmpa_int
{
\seq_gput_right:Nn \g_@@_notes_seq { { #1 } { #2 } }
\tl_if_novalue:nT { #1 } { \int_gincr:N \c@tabularnote }
@@ -1898,7 +1988,7 @@ version 2005/12/01 or later.
{
\int_eval:n
{
- \int_compare:nNnTF \l_tmpa_int = \c_zero_int
+ \int_if_zero:nTF \l_tmpa_int
\c@tabularnote
\l_tmpa_int
}
@@ -2478,7 +2568,15 @@ version 2005/12/01 or later.
vlines-in-sub-matrix .code:n =
{
\tl_if_single_token:nTF { #1 }
- { \tl_set:Nn \l_@@_letter_vlism_tl { #1 } }
+ {
+ \tl_if_in:NnTF \c_@@_forbidden_letters_tl { #1 }
+ { \@@_error:nn { Forbidden~letter } { #1 } }
+% \end{macrocode}
+% We write directly a command for the automata which reads the preamble provided
+% by the final user.
+% \begin{macrocode}
+ { \cs_set_eq:cN { @@ _ #1 } \@@_make_preamble_vlism:n }
+ }
{ \@@_error:n { One~letter~allowed } }
} ,
vlines-in-sub-matrix .value_required:n = true ,
@@ -2596,13 +2694,11 @@ version 2005/12/01 or later.
code-after .value_required:n = true ,
bottomrule .bool_set:N = \l_@@_notes_bottomrule_bool ,
bottomrule .default:n = true ,
- style .code:n = \cs_set:Nn \@@_notes_style:n { #1 } ,
+ style .cs_set:Np = \@@_notes_style:n #1 ,
style .value_required:n = true ,
- label-in-tabular .code:n =
- \cs_set:Nn \@@_notes_label_in_tabular:n { #1 } ,
+ label-in-tabular .cs_set:Np = \@@_notes_label_in_tabular:n #1 ,
label-in-tabular .value_required:n = true ,
- label-in-list .code:n =
- \cs_set:Nn \@@_notes_label_in_list:n { #1 } ,
+ label-in-list .cs_set:Np = \@@_notes_label_in_list:n #1 ,
label-in-list .value_required:n = true ,
enumitem-keys .code:n =
{
@@ -2702,7 +2798,7 @@ version 2005/12/01 or later.
delimiters / max-width .default:n = true ,
delimiters .code:n = \keys_set:nn { NiceMatrix / delimiters } { #1 } ,
delimiters .value_required:n = true ,
- width .code:n = \dim_set:Nn \l_@@_width_dim { #1 } ,
+ width .dim_set:N = \l_@@_width_dim ,
width .value_required:n = true ,
last-col .code:n =
\tl_if_empty:nF { #1 }
@@ -2780,7 +2876,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\keys_define:nn { NiceMatrix / NiceMatrix }
{
- last-col .code:n = \tl_if_empty:nTF {#1}
+ last-col .code:n = \tl_if_empty:nTF { #1 }
{
\bool_set_true:N \l_@@_last_col_without_value_bool
\int_set:Nn \l_@@_last_col_int { -1 }
@@ -2968,7 +3064,7 @@ version 2005/12/01 or later.
% The codes |\l_@@_code_for_first_row_tl| and \emph{al} don't apply in the
% corners of the matrix.
% \begin{macrocode}
- \int_compare:nNnTF \c@iRow = 0
+ \int_if_zero:nTF \c@iRow
{
\int_compare:nNnT \c@jCol > 0
{
@@ -3023,7 +3119,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_update_for_first_and_last_row:
{
- \int_compare:nNnTF \c@iRow = 0
+ \int_if_zero:nTF \c@iRow
{
\dim_gset:Nn \g_@@_dp_row_zero_dim
{ \dim_max:nn \g_@@_dp_row_zero_dim { \box_dp:N \l_@@_cell_box } }
@@ -3126,8 +3222,7 @@ version 2005/12/01 or later.
% of the array (except the cells of the ``first column'' and the ``last
% column'').
% \begin{macrocode}
- \dim_gset:Nn \g_@@_max_cell_width_dim
- { \dim_max:nn \g_@@_max_cell_width_dim { \box_wd:N \l_@@_cell_box } }
+ \@@_update_max_cell_width:
% \end{macrocode}
%
% The following computations are for the ``first row'' and the ``last row''.
@@ -3178,6 +3273,16 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \bigskip
+% The following command will be nullified in our redefinition of |\multicolumn|.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_update_max_cell_width:
+ {
+ \dim_gset:Nn \g_@@_max_cell_width_dim
+ { \dim_max:nn \g_@@_max_cell_width_dim { \box_wd:N \l_@@_cell_box } }
+ }
+% \end{macrocode}
+%
+% \bigskip
% The following variant of |\@@_cell_end:| is only for the columns of type
% |w{s}{...}| or |W{s}{...}| (which use the horizontal alignement key |s| of
% |\makebox|).
@@ -3343,11 +3448,17 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
-%
+% \bigskip
% \begin{macrocode}
-\cs_new_protected:Npn \@@_array:n
+\cs_new_protected:Npn \@@_array:
{
- % modified 05-08-23
+% \end{macrocode}
+% The following line is only a speed-up: it's a redefinition of |\@mkpream|
+% of \pkg{array} in order to speed up the compilation by deleting one line of
+% code in |\@mkpream| (the expansion of the preamble). In the classes of REVTeX,
+% that command |\@@_redefine_mkpream:| will be nullified (no speed-up).
+% \begin{macrocode}
+ \@@_redefine_mkpream:
\dim_set:Nn \col@sep
{ \bool_if:NTF \l_@@_tabular_bool \tabcolsep \arraycolsep }
\dim_compare:nNnTF \l_@@_tabular_width_dim = \c_zero_dim
@@ -3366,7 +3477,6 @@ version 2005/12/01 or later.
% \begin{macrocode}
[ \str_if_eq:VnTF \l_@@_baseline_tl c c t ]
}
-\cs_generate_variant:Nn \@@_array:n { V }
% \end{macrocode}
%
% \medskip
@@ -3448,7 +3558,7 @@ version 2005/12/01 or later.
{
\tl_if_eq:NnF \l_@@_hlines_clist { all }
{
- \exp_args:NNx
+ \exp_args:NNe
\clist_if_in:NnT
\l_@@_hlines_clist
{ \int_eval:n { \c@iRow + 1 } }
@@ -3493,19 +3603,63 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
+%
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_test_color_inside:
+ {
+ \bool_if:NF \l_@@_color_inside_bool
+ {
+% \end{macrocode}
+% We will issue an error only during the first run.
+% \begin{macrocode}
+ \bool_if:NF \g_@@_aux_found_bool
+ { \@@_error:n { without~color-inside } }
+ }
+ }
+% \end{macrocode}
+%
% \bigskip
-% When the key |color-inside| is used, the following code will be executed.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_colortbl_like:
+\cs_new_protected:Npn \@@_redefine_everycr: { \everycr { \@@_everycr: } }
+\hook_gput_code:nnn { begindocument } { . }
{
- \cs_set_eq:NN \cellcolor \@@_cellcolor_tabular
- \cs_set_eq:NN \rowcolor \@@_rowcolor_tabular
- \cs_set_eq:NN \columncolor \@@_columncolor_preamble
- \cs_set_eq:NN \rowcolors \@@_rowcolors_tabular
- \cs_set_eq:NN \rowlistcolors \@@_rowlistcolors_tabular
+ \IfPackageLoadedTF { colortbl }
+ {
+ \cs_set_protected:Npn \@@_redefine_everycr:
+ {
+ \CT@everycr
+ {
+ \noalign { \cs_gset_eq:NN \CT@row@color \prg_do_nothing: }
+ \@@_everycr:
+ }
+ }
+ }
+ { }
}
% \end{macrocode}
%
+% If \pkg{booktabs} is loaded, we have to patch the macro |\@BTnormal| which is
+% a macro of \pkg{booktabs}. The macro |\@BTnormal| draws an horizontal rule but
+% it occurs after a vertical skip done by a low level TeX command. When this
+% macro |\@BTnormal| occurs, the |row| node has yet been inserted by
+% \pkg{nicematrix} \emph{before} the vertical skip (and thus, at a wrong place).
+% That why we decide to create a new |row| node (for the same row). We patch the
+% macro |\@BTnormal| to create this |row| node. This new |row| node will
+% overwrite the previous definition of that |row| node and we have managed to
+% avoid the error messages of that redefinition
+% \footnote{cf. |\nicematrix@redefine@check@rerun|}.
+% \begin{macrocode}
+\hook_gput_code:nnn { begindocument } { . }
+ {
+ \IfPackageLoadedTF { booktabs }
+ {
+ \cs_new_protected:Npn \@@_patch_booktabs:
+ { \tl_put_left:Nn \@BTnormal \@@_create_row_node_i: }
+ }
+ { \cs_new_protected:Npn \@@_patch_booktabs: { } }
+ }
+% \end{macrocode}
+%
% \bigskip
% The following code |\@@_pre_array_ii:| is used in |{NiceArrayWithDelims}|. It
% exists as a standalone macro only for legibility.
@@ -3523,22 +3677,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\@@_expand_clist:N \l_@@_hlines_clist
\@@_expand_clist:N \l_@@_vlines_clist
-% \end{macrocode}
-%
-% If \pkg{booktabs} is loaded, we have to patch the macro |\@BTnormal| which is
-% a macro of \pkg{booktabs}. The macro |\@BTnormal| draws an horizontal rule but
-% it occurs after a vertical skip done by a low level TeX command. When this
-% macro |\@BTnormal| occurs, the |row| node has yet been inserted by
-% \pkg{nicematrix} \emph{before} the vertical skip (and thus, at a wrong place).
-% That why we decide to create a new |row| node (for the same row). We patch the
-% macro |\@BTnormal| to create this |row| node. This new |row| node will
-% overwrite the previous definition of that |row| node and we have managed to
-% avoid the error messages of that redefinition
-% \footnote{cf. |\nicematrix@redefine@check@rerun|}.
-% \begin{macrocode}
- \IfPackageLoadedTF { booktabs }
- { \tl_put_left:Nn \@BTnormal \@@_create_row_node_i: }
- { }
+ \@@_patch_booktabs:
\box_clear_new:N \l_@@_cell_box
\normalbaselines
% \end{macrocode}
@@ -3575,15 +3714,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_set_nopar:Npn \ialign
{
- \IfPackageLoadedTF { colortbl }
- {
- \CT@everycr
- {
- \noalign { \cs_gset_eq:NN \CT@row@color \prg_do_nothing: }
- \@@_everycr:
- }
- }
- { \everycr { \@@_everycr: } }
+ \@@_redefine_everycr:
\tabskip = \c_zero_skip
% \end{macrocode}
%
@@ -3651,7 +3782,10 @@ version 2005/12/01 or later.
\cs_set_eq:NN \RowStyle \@@_RowStyle:n
\seq_map_inline:Nn \l_@@_custom_line_commands_seq
{ \cs_set_eq:cc { ##1 } { nicematrix - ##1 } }
- \bool_if:NT \l_@@_color_inside_bool \@@_colortbl_like:
+ \cs_set_eq:NN \cellcolor \@@_cellcolor_tabular
+ \cs_set_eq:NN \rowcolor \@@_rowcolor_tabular
+ \cs_set_eq:NN \rowcolors \@@_rowcolors_tabular
+ \cs_set_eq:NN \rowlistcolors \@@_rowlistcolors_tabular
\bool_if:NT \l_@@_renew_dots_bool \@@_renew_dots:
% \end{macrocode}
% We redefine |\multicolumn| and, since we want |\multicolumn| to be available
@@ -3863,7 +3997,6 @@ version 2005/12/01 or later.
\dim_set:Nn \l_@@_right_delim_dim { \box_wd:N \l_tmpa_box }
}
{
- % modified 05-08-23
\dim_gset:Nn \l_@@_left_delim_dim
{ 2 \bool_if:NTF \l_@@_tabular_bool \tabcolsep \arraycolsep }
\dim_gset_eq:NN \l_@@_right_delim_dim \l_@@_left_delim_dim
@@ -4315,7 +4448,7 @@ version 2005/12/01 or later.
% Now, we prepare the token list for the instructions that we will have to write
% on the |aux| file at the end of the environment.
% \begin{macrocode}
- \tl_gclear:N \g_@@_aux_tl
+ \tl_build_gbegin:N \g_@@_aux_tl
% \end{macrocode}
%
% \begin{macrocode}
@@ -4374,7 +4507,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\bool_if:NT \l_@@_width_used_bool
{
- \int_compare:nNnT \g_@@_total_X_weight_int = 0
+ \int_if_zero:nT \g_@@_total_X_weight_int
{ \@@_error_or_warning:n { width~without~X~columns } }
}
% \end{macrocode}
@@ -4388,7 +4521,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\int_compare:nNnT \g_@@_total_X_weight_int > 0
{
- \tl_gput_right:Nx \g_@@_aux_tl
+ \tl_build_gput_right:Nx \g_@@_aux_tl
{
\bool_set_true:N \l_@@_X_columns_aux_bool
\dim_set:Nn \l_@@_X_columns_dim
@@ -4462,7 +4595,7 @@ version 2005/12/01 or later.
% computed its width in |\g_@@_width_first_col_dim|: see
% p.~\pageref{overlap-left}).
% \begin{macrocode}
- \int_compare:nNnT \l_@@_first_col_int = 0
+ \int_if_zero:nT \l_@@_first_col_int
{
% \skip_horizontal:N \col@sep % 05-08-23
\skip_horizontal:N \g_@@_width_first_col_dim
@@ -4488,7 +4621,7 @@ version 2005/12/01 or later.
% |first-row| is used).
% \begin{macrocode}
{
- \int_compare:nNnTF \l_@@_first_row_int = 0
+ \int_if_zero:nTF \l_@@_first_row_int
{
\dim_set_eq:NN \l_tmpa_dim \g_@@_dp_row_zero_dim
\dim_add:Nn \l_tmpa_dim \g_@@_ht_row_zero_dim
@@ -4592,6 +4725,7 @@ version 2005/12/01 or later.
% We write on the |aux| file all the informations corresponding to the
% current environment.
% \begin{macrocode}
+ \tl_build_gend:N \g_@@_aux_tl
\iow_now:Nn \@mainaux { \ExplSyntaxOn }
\iow_now:Nn \@mainaux { \char_set_catcode_space:n { 32 } }
\iow_now:Nx \@mainaux
@@ -4631,7 +4765,6 @@ version 2005/12/01 or later.
\cs_new_protected:Npn \@@_transform_preamble_i:
{
\int_gzero:N \c@jCol
- \group_begin:
% \end{macrocode}
% The sequence |\g_@@_cols_vlsim_seq| will contain the numbers of the columns
% where you will to have to draw vertical lines in the potential sub-matrices
@@ -4668,29 +4801,40 @@ version 2005/12/01 or later.
}
}
% \end{macrocode}
+%
+% \bigskip
% Now, we actually make the preamble (which will be given to |{array}|). It will
% be stored in |\g_@@_array_preamble_tl|.
% \begin{macrocode}
- \exp_last_unbraced:NV \@@_make_preamble:n \g_@@_user_preamble_tl \q_stop
+ \exp_last_unbraced:NV \@@_rec_preamble:n \g_@@_user_preamble_tl \stop
\int_gset_eq:NN \g_@@_static_num_of_col_int \c@jCol
% \end{macrocode}
%
% \medskip
-% Now, we replace |\columncolor| by |\@@_columncolor_preamble|.
% \begin{macrocode}
- \bool_if:NT \l_@@_color_inside_bool
- {
- \regex_replace_all:NnN
- \c_@@_columncolor_regex
- { \c { @@_columncolor_preamble } }
- \g_@@_array_preamble_tl
- }
+ \@@_replace_columncolor:
+ }
% \end{macrocode}
%
-% \medskip
-% We are not sure that the following TeX group is still necessary.
+% \bigskip
% \begin{macrocode}
- \group_end:
+\hook_gput_code:nnn { begindocument } { . }
+ {
+ \IfPackageLoadedTF { colortbl }
+ {
+ \regex_const:Nn \c_@@_columncolor_regex { \c { columncolor } }
+ \cs_new_protected:Npn \@@_replace_columncolor:
+ {
+ \regex_replace_all:NnN
+ \c_@@_columncolor_regex
+ { \c { @@_columncolor_preamble } }
+ \g_@@_array_preamble_tl
+ }
+ }
+ {
+ \cs_new_protected:Npn \@@_replace_columncolor:
+ { \cs_set_eq:NN \columncolor \@@_columncolor_preamble }
+ }
}
% \end{macrocode}
%
@@ -4701,7 +4845,7 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \medskip
-% If there was delimiters at the beginning or at the end of the preamble, the
+% If there were delimiters at the beginning or at the end of the preamble, the
% environment |{NiceArray}| is transformed into an environment |{xNiceMatrix}|.
% \begin{macrocode}
\bool_lazy_or:nnT
@@ -4719,7 +4863,7 @@ version 2005/12/01 or later.
% \bigskip
% We complete the preamble with the potential ``exterior columns'' (on both sides).
% \begin{macrocode}
- \int_compare:nNnTF \l_@@_first_col_int = 0
+ \int_if_zero:nTF \l_@@_first_col_int
{ \tl_gput_left:NV \g_@@_array_preamble_tl \c_@@_preamble_first_col_tl }
{
\bool_lazy_all:nT
@@ -4758,97 +4902,47 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \bigskip
-% The command |\@@_make_preamble:n| is the main function for the creation
-% of the preamble. It is recursive.
+% The preamble provided by the final user will be read by a finite
+% automata. The following function |\@@_rec_preamble:n| will read that preamble
+% (usually letter by letter) in a recursive way (hence the name of that function).
+% in the preamble and
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble:n #1
+\cs_new_protected:Npn \@@_rec_preamble:n #1
{
- \str_if_eq:nnF { #1 } { \q_stop }
- {
- \cs_if_exist:cTF { @@ \token_to_str:N #1 }
- { \use:c { @@ \token_to_str:N #1 } { #1 } }
- {
- \str_if_eq:nVTF { #1 } \l_@@_letter_vlism_tl
- {
- \seq_gput_right:Nx \g_@@_cols_vlism_seq
- { \int_eval:n { \c@jCol + 1 } }
- \tl_gput_right:Nx \g_@@_array_preamble_tl
- { \exp_not:N ! { \skip_horizontal:N \arrayrulewidth } }
- \@@_make_preamble:n
- }
% \end{macrocode}
-% Now the case of a letter set by the final user for a customized rule. Such
-% customized rule is defined by using the key |custom-line| in
-% |\NiceMatrixOptions|. That key takes in as value a list of \textsl{key=value}
-% pairs. Among the keys avalaible in that list, there is the key |letter|. All
-% the letters defined by this way by the final user for such customized rules
-% are added in the set of keys |{NiceMatrix/ColumnTypes}|. That set of keys is
-% used to store the characteristics of those types of rules for convenience: the
-% keys of that set of keys won't never be used as keys by the final user (he
-% will use, instead, letters in the preamble of its array).
+% For the majority of the letters, we will trigger the corresponding action by
+% calling directly a function in the main hashtable of TeX (thanks to the
+% mechanism |\csname...\endcsname|. Be careful: all these functions take in as
+% first argument the letter (or token) itself.\footnote{We do that because it's
+% a easy way to insert the letter at some places in the code that we will add to
+% |\g_@@_array_preamble_tl|.}
% \begin{macrocode}
- {
- \keys_if_exist:nnTF { NiceMatrix / ColumnTypes } { #1 }
- {
- \keys_set:nn { NiceMatrix / ColumnTypes } { #1 }
- \@@_make_preamble:n
- }
- {
- \cs_if_exist:cTF { NC @ find @ #1 }
- {
- \tl_set_eq:Nc \l_tmpb_tl { NC @ rewrite @ #1 }
- \exp_last_unbraced:NV \@@_make_preamble:n \l_tmpb_tl
- }
- {
- \tl_if_eq:nnT { #1 } { S }
- { \@@_fatal:n { unknown~column~type~S } }
- { \@@_fatal:nn { unknown~column~type } { #1 } }
- }
- }
- }
+ \cs_if_exist:cTF { @@ _ \token_to_str:N #1 }
+ { \use:c { @@ _ \token_to_str:N #1 } { #1 } }
+ {
+% \end{macrocode}
+% Now, the columns defined by |\newcolumntype| of \pkg{array}.
+% \begin{macrocode}
+ \cs_if_exist:cTF { NC @ find @ #1 }
+ {
+ \tl_set_eq:Nc \l_tmpb_tl { NC @ rewrite @ #1 }
+ \exp_last_unbraced:NV \@@_rec_preamble:n \l_tmpb_tl
+ }
+ {
+ \tl_if_eq:nnT { #1 } { S }
+ { \@@_fatal:n { unknown~column~type~S } }
+ { \@@_fatal:nn { unknown~column~type } { #1 } }
}
}
}
% \end{macrocode}
%
-% \bigskip
-% Now, we will list all the auxiliary functions for the different types of
-% entries in the preamble of the array.
-% \begin{macrocode}
-\cs_new:cpn { @@ \string c } { \@@_make_preamble_i:n }
-\cs_new:cpn { @@ \string l } { \@@_make_preamble_i:n }
-\cs_new:cpn { @@ \string r } { \@@_make_preamble_i:n }
-\cs_new:cpn { @@ \string > } { \@@_make_preamble_xiv:nn }
-\cs_new:cpn { @@ \string ! } { \@@_make_preamble_ii:nn }
-\cs_new:cpn { @@ \string @ } { \@@_make_preamble_ii:nn }
-\cs_new:cpn { @@ \string | } { \@@_make_preamble_iii:n }
-\cs_new:cpn { @@ \string p } { \@@_make_preamble_iv:n }
-\cs_new:cpn { @@ \string b } { \@@_make_preamble_iv:n }
-\cs_new:cpn { @@ \string m } { \@@_make_preamble_iv:n }
-\cs_new:cpn { @@ \string V } { \@@_make_preamble_v:nn }
-\cs_new:cpn { @@ \string w } { \@@_make_preamble_vi:nnnn { } }
-\cs_new:cpn { @@ \string W } { \@@_make_preamble_vi:nnnn { \@@_special_W: } }
-\cs_new:cpn { @@ \string S } { \@@_make_preamble_vii:nn }
-\cs_new:cpn { @@ \string ( } { \@@_make_preamble_viii:nn }
-\cs_new:cpn { @@ \string [ } { \@@_make_preamble_viii:nn }
-\cs_new:cpn { @@ \string \{ } { \@@_make_preamble_viii:nn }
-\cs_new:cpn { @@ \string \left } { \@@_make_preamble_viii_ii:n }
-\cs_new:cpn { @@ \string ) } { \@@_make_preamble_ix:nn }
-\cs_new:cpn { @@ \string ] } { \@@_make_preamble_ix:nn }
-\cs_new:cpn { @@ \string \} } { \@@_make_preamble_ix:nn }
-\cs_new:cpn { @@ \string \right } { \@@_make_preamble_ix_ii:n }
-\cs_new:cpn { @@ \string X } { \@@_make_preamble_x:nn }
-\cs_new:cpn { @@ \string * } { \@@_make_preamble_xvi:nnn }
-\cs_new:cpn { @@ \string \NC@find } { \@@_make_preamble_xx:n }
-% \end{macrocode}
-% The token |\NC@find| is at the head of the definition of the columns type done
-% by |\newcolumntype|. We wan't that token to be no-op here.
%
%
% \bigskip
% For |c|, |l| and |r|
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_i:n #1
+\cs_new:Npn \@@_c #1
{
\tl_gput_right:NV \g_@@_array_preamble_tl \g_@@_pre_cell_tl
\tl_gclear:N \g_@@_pre_cell_tl
@@ -4863,56 +4957,59 @@ version 2005/12/01 or later.
% We increment the counter of columns and then we test for the presence of a |<|.
% \begin{macrocode}
\int_gincr:N \c@jCol
- \@@_make_preamble_xi:n
+ \@@_rec_preamble_after_col:n
}
+\cs_set_eq:NN \@@_l \@@_c
+\cs_set_eq:NN \@@_r \@@_c
% \end{macrocode}
%
% \medskip
-% For |>|, |!| and |@|
+% For |!| and |@|
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_ii:nn #1 #2
+\cs_new:cpn { @@ _ \token_to_str:N ! } #1 #2
{
\tl_gput_right:Nn \g_@@_array_preamble_tl { #1 { #2 } }
- \@@_make_preamble:n
+ \@@_rec_preamble:n
}
+\cs_set_eq:cc { @@ _ \token_to_str:N @ } { @@ _ \token_to_str:N ! }
% \end{macrocode}
%
%
% \medskip
% For \verb+|+
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_iii:n #1
+\cs_new:cpn { @@ _ | } #1
{
% \end{macrocode}
% |\l_tmpa_int| is the number of successive occurrences of \verb+|+
% \begin{macrocode}
\int_incr:N \l_tmpa_int
- \@@_make_preamble_iii_i:n
+ \@@_make_preamble_i_i:n
}
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_iii_i:n #1
+\cs_new_protected:Npn \@@_make_preamble_i_i:n #1
{
\str_if_eq:nnTF { #1 } |
{ \@@_make_preamble_iii:n | }
- { \@@_make_preamble_iii_ii:nn { } #1 }
+ { \@@_make_preamble_i_ii:nn { } #1 }
}
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_iii_ii:nn #1 #2
+\cs_new_protected:Npn \@@_make_preamble_i_ii:nn #1 #2
{
\str_if_eq:nnTF { #2 } [
- { \@@_make_preamble_iii_ii:nw { #1 } [ }
- { \@@_make_preamble_iii_iii:nn { #2 } { #1 } }
+ { \@@_make_preamble_i_ii:nw { #1 } [ }
+ { \@@_make_preamble_i_iii:nn { #2 } { #1 } }
}
-\cs_new_protected:Npn \@@_make_preamble_iii_ii:nw #1 [ #2 ]
- { \@@_make_preamble_iii_ii:nn { #1 , #2 } }
+\cs_new_protected:Npn \@@_make_preamble_i_ii:nw #1 [ #2 ]
+ { \@@_make_preamble_i_ii:nn { #1 , #2 } }
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_iii_iii:nn #1 #2
+\cs_new_protected:Npn \@@_make_preamble_i_iii:nn #1 #2
{
\@@_compute_rule_width:n { multiplicity = \l_tmpa_int , #2 }
\tl_gput_right:Nx \g_@@_array_preamble_tl
@@ -4938,16 +5035,17 @@ version 2005/12/01 or later.
% \begin{macrocode}
}
\int_zero:N \l_tmpa_int
- \str_if_eq:nnT { #1 } { \q_stop } { \bool_gset_true:N \g_tmpb_bool }
- \@@_make_preamble:n #1
+ \str_if_eq:nnT { #1 } { \stop } { \bool_gset_true:N \g_tmpb_bool }
+ \@@_rec_preamble:n #1
}
% \end{macrocode}
%
+% \bigskip
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_xiv:nn #1 #2
+\cs_new:cpn { @@ _ > } #1 #2
{
\tl_gput_right:Nn \g_@@_pre_cell_tl { > { #2 } }
- \@@_make_preamble:n
+ \@@_rec_preamble:n
}
% \end{macrocode}
%
@@ -5006,31 +5104,33 @@ version 2005/12/01 or later.
%
%
% \medskip
-% For |p|, |b| and |m|. The argument |#1| is that value : |p|, |b| or |m|.
+% For |p|, |b| and |m|.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_iv:n #1
+\cs_new:Npn \@@_p #1
{
\str_set:Nn \l_@@_vpos_col_str { #1 }
% \end{macrocode}
% Now, you look for a potential character |[| after the letter of the specifier
% (for the options).
% \begin{macrocode}
- \@@_make_preamble_iv_i:n
+ \@@_make_preamble_ii_i:n
}
+\cs_set_eq:NN \@@_b \@@_p
+\cs_set_eq:NN \@@_m \@@_p
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_iv_i:n #1
+\cs_new_protected:Npn \@@_make_preamble_ii_i:n #1
{
\str_if_eq:nnTF { #1 } { [ }
- { \@@_make_preamble_iv_ii:w [ }
- { \@@_make_preamble_iv_ii:w [ ] { #1 } }
+ { \@@_make_preamble_ii_ii:w [ }
+ { \@@_make_preamble_ii_ii:w [ ] { #1 } }
}
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_iv_ii:w [ #1 ]
- { \@@_make_preamble_iv_iii:nn { #1 } }
+\cs_new_protected:Npn \@@_make_preamble_ii_ii:w [ #1 ]
+ { \@@_make_preamble_ii_iii:nn { #1 } }
% \end{macrocode}
%
% \medskip
@@ -5039,7 +5139,7 @@ version 2005/12/01 or later.
%
% |#2| is the mandatory argument of the specifier: the width of the column.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_iv_iii:nn #1 #2
+\cs_new_protected:Npn \@@_make_preamble_ii_iii:nn #1 #2
{
% \end{macrocode}
% The possible values of |\l_@@_hpos_col_str| are |j| (for \emph{justified} which is
@@ -5049,7 +5149,7 @@ version 2005/12/01 or later.
\str_set:Nn \l_@@_hpos_col_str { j }
\tl_set:Nn \l_tmpa_tl { #1 }
\@@_keys_p_column:V \l_tmpa_tl
- \@@_make_preamble_iv_iv:nn { #2 } { minipage }
+ \@@_make_preamble_ii_iv:nn { #2 } { minipage }
}
% \end{macrocode}
%
@@ -5063,11 +5163,11 @@ version 2005/12/01 or later.
% The first argument is the width of the column. The second is the type of
% environment: |minipage| or |varwidth|.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_iv_iv:nn #1 #2
+\cs_new_protected:Npn \@@_make_preamble_ii_iv:nn #1 #2
{
- \use:x
+ \use:e
{
- \@@_make_preamble_iv_v:nnnnnnnn
+ \@@_make_preamble_ii_v:nnnnnnnn
{ \str_if_eq:VnTF \l_@@_vpos_col_str { p } { t } { b } }
{ \dim_eval:n { #1 } }
{
@@ -5114,7 +5214,7 @@ version 2005/12/01 or later.
% We increment the counter of columns, and then we test for the presence of a |<|.
% \begin{macrocode}
\int_gincr:N \c@jCol
- \@@_make_preamble_xi:n
+ \@@_rec_preamble_after_col:n
}
% \end{macrocode}
%
@@ -5143,7 +5243,7 @@ version 2005/12/01 or later.
% |#8| is the letter |c| or |r| or |l| which is the basic specificier of column
% which is used \emph{in fine}.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_iv_v:nnnnnnnn #1 #2 #3 #4 #5 #6 #7 #8
+\cs_new_protected:Npn \@@_make_preamble_ii_v:nnnnnnnn #1 #2 #3 #4 #5 #6 #7 #8
{
\str_if_eq:VnTF \l_@@_hpos_col_str { si }
{ \tl_gput_right:Nn \g_@@_array_preamble_tl { > { \@@_test_if_empty_for_S: } } }
@@ -5278,31 +5378,35 @@ version 2005/12/01 or later.
% \medskip
% For |V| (similar to the |V| of \pkg{varwidth}).
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_v:nn #1 #2
+\cs_new:Npn \@@_V #1 #2
{
\str_if_eq:nnTF { #2 } { [ }
- { \@@_make_preamble_v_i:w [ }
- { \@@_make_preamble_v_i:w [ ] { #2 } }
+ { \@@_make_preamble_V_i:w [ }
+ { \@@_make_preamble_V_i:w [ ] { #2 } }
}
-\cs_new_protected:Npn \@@_make_preamble_v_i:w [ #1 ]
- { \@@_make_preamble_v_ii:nn { #1 } }
-\cs_new_protected:Npn \@@_make_preamble_v_ii:nn #1 #2
+\cs_new_protected:Npn \@@_make_preamble_V_i:w [ #1 ]
+ { \@@_make_preamble_V_ii:nn { #1 } }
+\cs_new_protected:Npn \@@_make_preamble_V_ii:nn #1 #2
{
\str_set:Nn \l_@@_vpos_col_str { p }
\str_set:Nn \l_@@_hpos_col_str { j }
\tl_set:Nn \l_tmpa_tl { #1 }
\@@_keys_p_column:V \l_tmpa_tl
\IfPackageLoadedTF { varwidth }
- { \@@_make_preamble_iv_iv:nn { #2 } { varwidth } }
+ { \@@_make_preamble_ii_iv:nn { #2 } { varwidth } }
{
\@@_error_or_warning:n { varwidth~not~loaded }
- \@@_make_preamble_iv_iv:nn { #2 } { minipage }
+ \@@_make_preamble_ii_iv:nn { #2 } { minipage }
}
}
% \end{macrocode}
%
% \medskip
% For |w| and |W|
+% \begin{macrocode}
+\cs_new:Npn \@@_w { \@@_make_preamble_w:nnnn { } }
+\cs_new:Npn \@@_W { \@@_make_preamble_w:nnnn { \@@_special_W: } }
+% \end{macrocode}
%
% |#1| is a special argument: empty for |w| and equal to |\@@_special_W:| for |W|;
%
@@ -5313,11 +5417,11 @@ version 2005/12/01 or later.
% |#4| is the width of the column.
%
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_vi:nnnn #1 #2 #3 #4
+\cs_new_protected:Npn \@@_make_preamble_w:nnnn #1 #2 #3 #4
{
\str_if_eq:nnTF { #3 } { s }
- { \@@_make_preamble_vi_i:nnnn { #1 } { #4 } }
- { \@@_make_preamble_vi_ii:nnnn { #1 } { #2 } { #3 } { #4 } }
+ { \@@_make_preamble_w_i:nnnn { #1 } { #4 } }
+ { \@@_make_preamble_w_ii:nnnn { #1 } { #2 } { #3 } { #4 } }
}
% \end{macrocode}
%
@@ -5329,7 +5433,7 @@ version 2005/12/01 or later.
%
% |#2| is the width of the column.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_vi_i:nnnn #1 #2
+\cs_new_protected:Npn \@@_make_preamble_w_i:nnnn #1 #2
{
\tl_gput_right:NV \g_@@_array_preamble_tl \g_@@_pre_cell_tl
\tl_gclear:N \g_@@_pre_cell_tl
@@ -5349,7 +5453,7 @@ version 2005/12/01 or later.
}
}
\int_gincr:N \c@jCol
- \@@_make_preamble_xi:n
+ \@@_rec_preamble_after_col:n
}
% \end{macrocode}
%
@@ -5357,7 +5461,7 @@ version 2005/12/01 or later.
% Then, the most important version, for the horizontal alignments types of |c|,
% |l| and |r| (and not |s|).
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_vi_ii:nnnn #1 #2 #3 #4
+\cs_new_protected:Npn \@@_make_preamble_w_ii:nnnn #1 #2 #3 #4
{
\tl_gput_right:NV \g_@@_array_preamble_tl \g_@@_pre_cell_tl
\tl_gclear:N \g_@@_pre_cell_tl
@@ -5387,7 +5491,7 @@ version 2005/12/01 or later.
% We increment the counter of columns and then we test for the presence of a |<|.
% \begin{macrocode}
\int_gincr:N \c@jCol
- \@@_make_preamble_xi:n
+ \@@_rec_preamble_after_col:n
}
% \end{macrocode}
%
@@ -5403,43 +5507,39 @@ version 2005/12/01 or later.
% \medskip
% For |S| (of \pkg{siunitx}).
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_vii:nn #1 #2
+\cs_new:Npn \@@_S #1 #2
{
\str_if_eq:nnTF { #2 } { [ }
- { \@@_make_preamble_vii_i:w [ }
- { \@@_make_preamble_vii_i:w [ ] { #2 } }
+ { \@@_make_preamble_S:w [ }
+ { \@@_make_preamble_S:w [ ] { #2 } }
}
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_vii_i:w [ #1 ]
- { \@@_make_preamble_vii_ii:n { #1 } }
+\cs_new_protected:Npn \@@_make_preamble_S:w [ #1 ]
+ { \@@_make_preamble_S_i:n { #1 } }
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_vii_ii:n #1
+\cs_new_protected:Npn \@@_make_preamble_S_i:n #1
{
- \IfPackageAtLeastTF { siunitx } { 2022/01/01 }
+ \tl_gput_right:NV \g_@@_array_preamble_tl \g_@@_pre_cell_tl
+ \tl_gclear:N \g_@@_pre_cell_tl
+ \tl_gput_right:Nn \g_@@_array_preamble_tl
{
- \tl_gput_right:NV \g_@@_array_preamble_tl \g_@@_pre_cell_tl
- \tl_gclear:N \g_@@_pre_cell_tl
- \tl_gput_right:Nn \g_@@_array_preamble_tl
- {
- > {
- \@@_cell_begin:w
- \keys_set:nn { siunitx } { #1 }
- \siunitx_cell_begin:w
- }
- c
- < { \siunitx_cell_end: \@@_cell_end: }
+ > {
+ \@@_cell_begin:w
+ \keys_set:nn { siunitx } { #1 }
+ \siunitx_cell_begin:w
}
+ c
+ < { \siunitx_cell_end: \@@_cell_end: }
+ }
% \end{macrocode}
% We increment the counter of columns and then we test for the presence of a |<|.
% \begin{macrocode}
- \int_gincr:N \c@jCol
- \@@_make_preamble_xi:n
- }
- { \@@_fatal:n { Version~of~siunitx~too~old } }
+ \int_gincr:N \c@jCol
+ \@@_rec_preamble_after_col:n
}
% \end{macrocode}
%
@@ -5447,14 +5547,14 @@ version 2005/12/01 or later.
% \medskip
% For |(|, |[| and |\{|.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_viii:nn #1 #2
+\cs_new:cpn { @@ _ \token_to_str:N ( } #1 #2
{
\bool_if:NT \l_@@_small_bool { \@@_fatal:n { Delimiter~with~small } }
% \end{macrocode}
% If we are before the column 1 and not in |{NiceArray}|, we reserve space for
% the left delimiter.
% \begin{macrocode}
- \int_compare:nNnTF \c@jCol = \c_zero_int
+ \int_if_zero:nTF \c@jCol
{
\str_if_eq:VnTF \g_@@_left_delim_tl { . }
{
@@ -5464,34 +5564,36 @@ version 2005/12/01 or later.
% \begin{macrocode}
\tl_gset:Nn \g_@@_left_delim_tl { #1 }
\tl_gset:Nn \g_@@_right_delim_tl { . }
- \@@_make_preamble:n #2
+ \@@_rec_preamble:n #2
}
{
\tl_gput_right:Nn \g_@@_array_preamble_tl { ! { \enskip } }
- \@@_make_preamble_viii_i:nn { #1 } { #2 }
+ \@@_make_preamble_iv:nn { #1 } { #2 }
}
}
- { \@@_make_preamble_viii_i:nn { #1 } { #2 } }
+ { \@@_make_preamble_iv:nn { #1 } { #2 } }
}
+\cs_set_eq:cc { @@ _ \token_to_str:N [ } { @@ _ \token_to_str:N ( }
+\cs_set_eq:cc { @@ _ \token_to_str:N \{ } { @@ _ \token_to_str:N ( }
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_viii_i:nn #1 #2
+\cs_new_protected:Npn \@@_make_preamble_iv:nn #1 #2
{
\tl_gput_right:Nx \g_@@_pre_code_after_tl
{ \@@_delimiter:nnn #1 { \int_eval:n { \c@jCol + 1 } } \c_true_bool }
\tl_if_in:nnTF { ( [ \{ ) ] \} \left \right } { #2 }
{
\@@_error:nn { delimiter~after~opening } { #2 }
- \@@_make_preamble:n
+ \@@_rec_preamble:n
}
- { \@@_make_preamble:n #2 }
+ { \@@_rec_preamble:n #2 }
}
% \end{macrocode}
%
+% In fact, if would be possible to define |\left| and |\right| as no-op.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_viii_ii:n #1
- { \@@_make_preamble_viii:nn }
+\cs_new:cpn { @@ _ \token_to_str:N \left } #1 { \use:c { @@ _ \token_to_str:N ( } }
% \end{macrocode}
%
% \bigskip
@@ -5502,13 +5604,13 @@ version 2005/12/01 or later.
% considered as the right delimiter of the environment if the environment is
% |{NiceArray}|).
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_ix:nn #1 #2
+\cs_new:cpn { @@ _ \token_to_str:N ) } #1 #2
{
\bool_if:NT \l_@@_small_bool { \@@_fatal:n { Delimiter~with~small } }
\tl_if_in:nnTF { ) ] \} } { #2 }
- { \@@_make_preamble_ix_i:nnn #1 #2 }
+ { \@@_make_preamble_v:nnn #1 #2 }
{
- \tl_if_eq:nnTF { \q_stop } { #2 }
+ \tl_if_eq:nnTF { \stop } { #2 }
{
\str_if_eq:VnTF \g_@@_right_delim_tl { . }
{ \tl_gset:Nn \g_@@_right_delim_tl { #1 } }
@@ -5516,7 +5618,7 @@ version 2005/12/01 or later.
\tl_gput_right:Nn \g_@@_array_preamble_tl { ! { \enskip } }
\tl_gput_right:Nx \g_@@_pre_code_after_tl
{ \@@_delimiter:nnn #1 { \int_use:N \c@jCol } \c_false_bool }
- \@@_make_preamble:n #2
+ \@@_rec_preamble:n #2
}
}
{
@@ -5524,16 +5626,18 @@ version 2005/12/01 or later.
{ \tl_gput_right:Nn \g_@@_array_preamble_tl { ! { \enskip } } }
\tl_gput_right:Nx \g_@@_pre_code_after_tl
{ \@@_delimiter:nnn #1 { \int_use:N \c@jCol } \c_false_bool }
- \@@_make_preamble:n #2
+ \@@_rec_preamble:n #2
}
}
}
+\cs_set_eq:cc { @@ _ \token_to_str:N ] } { @@ _ \token_to_str:N ] }
+\cs_set_eq:cc { @@ _ \token_to_str:N \} } { @@ _ \token_to_str:N \} }
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_ix_i:nnn #1 #2 #3
+\cs_new_protected:Npn \@@_make_preamble_v:nnn #1 #2 #3
{
- \tl_if_eq:nnTF { \q_stop } { #3 }
+ \tl_if_eq:nnTF { \stop } { #3 }
{
\str_if_eq:VnTF \g_@@_right_delim_tl { . }
{
@@ -5553,14 +5657,98 @@ version 2005/12/01 or later.
\tl_gput_right:Nx \g_@@_pre_code_after_tl
{ \@@_delimiter:nnn #1 { \int_use:N \c@jCol } \c_false_bool }
\@@_error:nn { double~closing~delimiter } { #2 }
- \@@_make_preamble:n #3
+ \@@_rec_preamble:n #3
+ }
+ }
+% \end{macrocode}
+%
+% \medskip
+% \begin{macrocode}
+\cs_new:cpn { @@ _ \token_to_str:N \right } #1
+ { \use:c { @@ _ \token_to_str:N ) } }
+% \end{macrocode}
+%
+%
+% \bigskip
+% After a specifier of column, we have to test whether there is one or several
+% |<{..}| because, after those potential |<{...}|, we have to insert
+% |!{\skip_horizontal:N ...}| when the key |vlines| is used. In fact, we have
+% also to test whether there is, after the |<{...}|, a |@{...}|.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_rec_preamble_after_col:n #1
+ {
+ \str_if_eq:nnTF { #1 } { < }
+ \@@_rec_preamble_after_col_i:n
+ {
+ \str_if_eq:nnTF { #1 } { @ }
+ \@@_rec_preamble_after_col_ii:n
+ {
+ \tl_if_eq:NnTF \l_@@_vlines_clist { all }
+ {
+ \tl_gput_right:Nn \g_@@_array_preamble_tl
+ { ! { \skip_horizontal:N \arrayrulewidth } }
+ }
+ {
+ \exp_args:NNe
+ \clist_if_in:NnT \l_@@_vlines_clist { \int_eval:n { \c@jCol + 1 } }
+ {
+ \tl_gput_right:Nn \g_@@_array_preamble_tl
+ { ! { \skip_horizontal:N \arrayrulewidth } }
+ }
+ }
+ \@@_rec_preamble:n { #1 }
+ }
}
}
% \end{macrocode}
+%
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_rec_preamble_after_col_i:n #1
+ {
+ \tl_gput_right:Nn \g_@@_array_preamble_tl { < { #1 } }
+ \@@_rec_preamble_after_col:n
+ }
+% \end{macrocode}
+%
+% We have to catch a |@{...}| after a specifier of column because, if we have to
+% draw a vertical rule, we have to add in that |@{...}| a |\hskip| corresponding
+% to the width of the vertical rule.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_rec_preamble_after_col_ii:n #1
+ {
+ \tl_if_eq:NnTF \l_@@_vlines_clist { all }
+ {
+ \tl_gput_right:Nn \g_@@_array_preamble_tl
+ { @ { #1 \skip_horizontal:N \arrayrulewidth } }
+ }
+ {
+ \exp_args:NNe
+ \clist_if_in:NnTF \l_@@_vlines_clist { \int_eval:n { \c@jCol + 1 } }
+ {
+ \tl_gput_right:Nn \g_@@_array_preamble_tl
+ { @ { #1 \skip_horizontal:N \arrayrulewidth } }
+ }
+ { \tl_gput_right:Nn \g_@@_array_preamble_tl { @ { #1 } } }
+ }
+ \@@_rec_preamble:n
+ }
+% \end{macrocode}
+%
+% \bigskip
+% \begin{macrocode}
+\cs_new:cpn { @@ _ * } #1 #2 #3
+ {
+ \tl_clear:N \l_tmpa_tl
+ \int_step_inline:nn { #2 } { \tl_put_right:Nn \l_tmpa_tl { #3 } }
+ \exp_last_unbraced:NV \@@_rec_preamble:n \l_tmpa_tl
+ }
+% \end{macrocode}
%
+% \bigskip
+% The token |\NC@find| is at the head of the definition of the columns type done
+% by |\newcolumntype|. We wan't that token to be no-op here.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_ix_ii:n #1
- { \@@_make_preamble_ix:nn }
+\cs_new:cpn { @@ _ \token_to_str:N \NC@find } #1 { \@@_rec_preamble:n }
% \end{macrocode}
%
% \bigskip
@@ -5568,17 +5756,17 @@ version 2005/12/01 or later.
% (between square brackets). That's why we test whether there is a |[| after the
% letter |X|.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_x:nn #1 #2
+\cs_new:Npn \@@_X #1 #2
{
\str_if_eq:nnTF { #2 } { [ }
- { \@@_make_preamble_x_i:w [ }
- { \@@_make_preamble_x_i:w [ ] #2 }
+ { \@@_make_preamble_X:w [ }
+ { \@@_make_preamble_X:w [ ] #2 }
}
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_x_i:w [ #1 ]
- { \@@_make_preamble_x_ii:n { #1 } }
+\cs_new_protected:Npn \@@_make_preamble_X:w [ #1 ]
+ { \@@_make_preamble_X_i:n { #1 } }
% \end{macrocode}
% |#1| is the optional argument of the |X| specifier (a list of
% \emph{key}-\emph{value} pairs).
@@ -5597,7 +5785,7 @@ version 2005/12/01 or later.
% \medskip
% In the following command, |#1| is the list of the options of the specifier |X|.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_x_ii:n #1
+\cs_new_protected:Npn \@@_make_preamble_X_i:n #1
{
% \end{macrocode}
% The possible values of |\l_@@_hpos_col_str| are |j| (for \emph{justified} which is
@@ -5638,8 +5826,8 @@ version 2005/12/01 or later.
% \begin{macrocode}
\bool_if:NTF \l_@@_X_columns_aux_bool
{
- \exp_args:Nnx
- \@@_make_preamble_iv_iv:nn
+ \exp_args:Nne
+ \@@_make_preamble_ii_iv:nn
{ \l_@@_weight_int \l_@@_X_columns_dim }
{ minipage }
}
@@ -5675,93 +5863,43 @@ version 2005/12/01 or later.
}
}
\int_gincr:N \c@jCol
- \@@_make_preamble_xi:n
+ \@@_rec_preamble_after_col:n
}
}
% \end{macrocode}
%
-%
-% \bigskip
-% After a specifier of column, we have to test whether there is one or several
-% |<{..}| because, after those potential |<{...}|, we have to insert
-% |!{\skip_horizontal:N ...}| when the key |vlines| is used. In fact, we have
-% also to test whether there is, after the |<{...}|, a |@{...}|.
-% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_xi:n #1
- {
- \str_if_eq:nnTF { #1 } { < }
- \@@_make_preamble_xiii:n
- {
- \str_if_eq:nnTF { #1 } { @ }
- \@@_make_preamble_xv:n
- {
- \tl_if_eq:NnTF \l_@@_vlines_clist { all }
- {
- \tl_gput_right:Nn \g_@@_array_preamble_tl
- { ! { \skip_horizontal:N \arrayrulewidth } }
- }
- {
- \exp_args:NNx
- \clist_if_in:NnT \l_@@_vlines_clist { \int_eval:n { \c@jCol + 1 } }
- {
- \tl_gput_right:Nn \g_@@_array_preamble_tl
- { ! { \skip_horizontal:N \arrayrulewidth } }
- }
- }
- \@@_make_preamble:n { #1 }
- }
- }
- }
-% \end{macrocode}
-%
+% \medskip
+% For the letter set by the user with |vlines-in-sub-matrix| (vlism).
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_xiii:n #1
+\cs_new_protected:Npn \@@_make_preamble_vlism:n #1
{
- \tl_gput_right:Nn \g_@@_array_preamble_tl { < { #1 } }
- \@@_make_preamble_xi:n
+ \seq_gput_right:Nx \g_@@_cols_vlism_seq
+ { \int_eval:n { \c@jCol + 1 } }
+ \tl_gput_right:Nx \g_@@_array_preamble_tl
+ { \exp_not:N ! { \skip_horizontal:N \arrayrulewidth } }
+ \@@_rec_preamble:n
}
% \end{macrocode}
%
-% We have to catch a |@{...}| after a specifier of column because, if we have to
-% draw a vertical rule, we have to add in that |@{...}| a |\hskip| corresponding
-% to the width of the vertical rule.
+% \medskip
+% The token |\stop| is a marker that we have inserted to mark the end of the
+% preamble (as provided by the final user) that we have inserted in the TeX flow.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_xv:n #1
- {
- \tl_if_eq:NnTF \l_@@_vlines_clist { all }
- {
- \tl_gput_right:Nn \g_@@_array_preamble_tl
- { @ { #1 \skip_horizontal:N \arrayrulewidth } }
- }
- {
- \exp_args:NNx
- \clist_if_in:NnTF \l_@@_vlines_clist { \int_eval:n { \c@jCol + 1 } }
- {
- \tl_gput_right:Nn \g_@@_array_preamble_tl
- { @ { #1 \skip_horizontal:N \arrayrulewidth } }
- }
- { \tl_gput_right:Nn \g_@@_array_preamble_tl { @ { #1 } } }
- }
- \@@_make_preamble:n
- }
+\cs_set_eq:cN { @@ _ \token_to_str:N \stop } \use_none:n
% \end{macrocode}
%
+% \medskip
+% The following lines try to catch some errors (when the final user has
+% forgotten the preamble of its environment).
% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_xx:n #1 { \@@_make_preamble:n }
+\cs_new_protected:cpn { @@ _ \token_to_str:N \hline }
+ { \@@_fatal:n { Preamble~forgotten } }
+\cs_set_eq:cc { @@ _ \token_to_str:N \Hline } { @@ _ \token_to_str:N \hline }
+\cs_set_eq:cc { @@ _ \token_to_str:N \toprule } { @@ _ \token_to_str:N \hline }
+\cs_set_eq:cc { @@ _ \token_to_str:N \CodeBefore } { @@ _ \token_to_str:N \hline }
% \end{macrocode}
%
% \bigskip
-% \begin{macrocode}
-\cs_new_protected:Npn \@@_make_preamble_xvi:nnn #1 #2 #3
- {
- \tl_clear:N \l_tmpa_tl
- \int_step_inline:nn { #2 } { \tl_put_right:Nn \l_tmpa_tl { #3 } }
- \exp_last_unbraced:NV \@@_make_preamble:n \l_tmpa_tl
- }
-% \end{macrocode}
-%
-%
-% \bigskip
% \section{The redefinition of \textbackslash multicolumn}
%
% \medskip
@@ -5777,6 +5915,7 @@ version 2005/12/01 or later.
% |\multicolumn|.
% \begin{macrocode}
\multispan { #1 }
+ \cs_set_eq:NN \@@_update_max_cell_width: \prg_do_nothing: % added 2023-10-04
\begingroup
\cs_set:Npn \@addamp { \if@firstamp \@firstampfalse \else \@preamerr 5 \fi }
% \end{macrocode}
@@ -5799,7 +5938,7 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \medskip
-% Now, you do a treatment specific to \pkg{nicematrix} which has no equivalent
+% Now, we do a treatment specific to \pkg{nicematrix} which has no equivalent
% in the original definition of |\multicolumn|.
% \begin{macrocode}
\int_compare:nNnT { #1 } > 1
@@ -5810,13 +5949,13 @@ version 2005/12/01 or later.
\seq_gput_right:Nx \g_@@_pos_of_blocks_seq
{
{
- \int_compare:nNnTF \c@jCol = 0
+ \int_if_zero:nTF \c@jCol
{ \int_eval:n { \c@iRow + 1 } }
{ \int_use:N \c@iRow }
}
{ \int_eval:n { \c@jCol + 1 } }
{
- \int_compare:nNnTF \c@jCol = 0
+ \int_if_zero:nTF \c@jCol
{ \int_eval:n { \c@iRow + 1 } }
{ \int_use:N \c@iRow }
}
@@ -5867,11 +6006,6 @@ version 2005/12/01 or later.
w { \@@_make_m_preamble_v:nnnn { } #1 }
W { \@@_make_m_preamble_v:nnnn { \@@_special_W: } #1 }
\q_stop { }
-% \end{macrocode}
-% The token |\NC@find| is at the head of the definition of the columns type done
-% by |\newcolumntype|. We wan't that token to no-op here.
-% \begin{macrocode}
- \NC@find { \@@_make_preamble:n }
}
{
\cs_if_exist:cTF { NC @ find @ #1 }
@@ -6127,7 +6261,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\int_compare:nNnT \g_@@_notes_caption_int > 0
{
- \tl_gput_right:Nx \g_@@_aux_tl
+ \tl_build_gput_right:Nx \g_@@_aux_tl
{
\tl_set:Nn \exp_not:N \l_@@_note_in_caption_tl
{ \int_use:N \g_@@_notes_caption_int }
@@ -6337,7 +6471,7 @@ version 2005/12/01 or later.
\dim_gsub:Nn \g_tmpa_dim \pgf@y
\endpgfpicture
\dim_gadd:Nn \g_tmpa_dim \arrayrulewidth
- \int_compare:nNnT \l_@@_first_row_int = 0
+ \int_if_zero:nT \l_@@_first_row_int
{
\dim_gadd:Nn \g_tmpa_dim \g_@@_ht_row_zero_dim
\dim_gadd:Nn \g_tmpa_dim \g_@@_dp_row_zero_dim
@@ -6388,7 +6522,7 @@ version 2005/12/01 or later.
\dim_gsub:Nn \g_tmpa_dim \pgf@y
\endpgfpicture
\dim_gadd:Nn \g_tmpa_dim \arrayrulewidth
- \int_compare:nNnT \l_@@_first_row_int = 0
+ \int_if_zero:nT \l_@@_first_row_int
{
\dim_gadd:Nn \g_tmpa_dim \g_@@_ht_row_zero_dim
\dim_gadd:Nn \g_tmpa_dim \g_@@_dp_row_zero_dim
@@ -6475,10 +6609,10 @@ version 2005/12/01 or later.
{
\@@_transform_preamble:
% \end{macrocode}
-% Here is the call to |\array| (we have a dedicated macro |\@@_array:n| because
+% Here is the call to |\array| (we have a dedicated macro |\@@_array:| because
% of compatibility with the classes \cls{revtex4-1} and \cls{revtex4-2}).
% \begin{macrocode}
- \@@_array:V \g_@@_array_preamble_tl
+ \exp_args:NV \@@_array: \g_@@_array_preamble_tl
}
}
}
@@ -6570,11 +6704,10 @@ version 2005/12/01 or later.
% \bigskip
% The new value of the body (that is to say after replacement of the separators
% of rows and columns by |\\| and |&|) of the environment will be stored in
-% |\l_@@_new_body_tl| (that part of the implementation has been changed in the
-% version 6.11 of \pkg{nicematrix} in order to allow the use of commands such as
+% |\l_@@_new_body_tl| in order to allow the use of commands such as
% |\hline| or |\hdottedline| with the key |light-syntax|).
% \begin{macrocode}
- \tl_clear_new:N \l_@@_new_body_tl
+ \tl_build_begin:N \l_@@_new_body_tl
\int_zero_new:N \l_@@_nb_cols_int
% \end{macrocode}
% First, we treat the first row.
@@ -6587,9 +6720,10 @@ version 2005/12/01 or later.
% \begin{macrocode}
\seq_map_inline:Nn \l_@@_rows_seq
{
- \tl_put_right:Nn \l_@@_new_body_tl { \\ }
+ \tl_build_put_right:Nn \l_@@_new_body_tl { \\ }
\@@_line_with_light_syntax:n { ##1 }
}
+ \tl_build_end:N \l_@@_new_body_tl
% \end{macrocode}
%
% \begin{macrocode}
@@ -6606,14 +6740,13 @@ version 2005/12/01 or later.
% \begin{macrocode}
\@@_transform_preamble:
% \end{macrocode}
-%
-%
+% \bigskip
%
% The call to |\array| is in the following command (we have a dedicated macro
-% |\@@_array:n| because of compatibility with the classes \cls{revtex4-1} and
+% |\@@_array:| because of compatibility with the classes \cls{revtex4-1} and
% \cls{revtex4-2}).
% \begin{macrocode}
- \@@_array:V \g_@@_array_preamble_tl \l_@@_new_body_tl
+ \exp_args:NV \@@_array: \g_@@_array_preamble_tl \l_@@_new_body_tl
}
% \end{macrocode}
%
@@ -6629,9 +6762,9 @@ version 2005/12/01 or later.
{ \seq_count:N \l_@@_cells_seq }
}
\seq_pop_left:NN \l_@@_cells_seq \l_tmpa_tl
- \tl_put_right:NV \l_@@_new_body_tl \l_tmpa_tl
+ \exp_args:NNV \tl_build_put_right:Nn \l_@@_new_body_tl \l_tmpa_tl
\seq_map_inline:Nn \l_@@_cells_seq
- { \tl_put_right:Nn \l_@@_new_body_tl { & ##1 } }
+ { \tl_build_put_right:Nn \l_@@_new_body_tl { & ##1 } }
}
\cs_generate_variant:Nn \@@_line_with_light_syntax:n { V }
% \end{macrocode}
@@ -6663,7 +6796,7 @@ version 2005/12/01 or later.
\cs_new:Npn \@@_create_col_nodes:
{
\crcr
- \int_compare:nNnT \l_@@_first_col_int = 0
+ \int_if_zero:nT \l_@@_first_col_int
{
\omit
\hbox_overlap_left:n
@@ -6690,7 +6823,7 @@ version 2005/12/01 or later.
% First, we put a |col| node on the left of the first column (of course, we
% have to do that \emph{after} the |\omit|).
% \begin{macrocode}
- \int_compare:nNnTF \l_@@_first_col_int = 0
+ \int_if_zero:nTF \l_@@_first_col_int
{
\bool_if:NT \l_@@_code_before_bool
{
@@ -7155,6 +7288,12 @@ version 2005/12/01 or later.
{
\bool_gset_true:N \g_@@_delims_bool
\str_gset:Nn \g_@@_name_env_str { #1 NiceMatrix }
+ % added 2023/10/01
+ \int_if_zero:nT \l_@@_last_col_int
+ {
+ \bool_set_true:N \l_@@_last_col_without_value_bool
+ \int_set:Nn \l_@@_last_col_int { -1 }
+ }
\keys_set:nn { NiceMatrix / NiceMatrix } { ##1 }
\@@_begin_of_NiceMatrix:nV { #1 } \l_@@_columns_type_tl
}
@@ -7168,6 +7307,12 @@ version 2005/12/01 or later.
\NewDocumentEnvironment { NiceMatrix } { ! O { } }
{
\str_gset:Nn \g_@@_name_env_str { NiceMatrix }
+ % added 2023/10/01
+ \int_if_zero:nT \l_@@_last_col_int
+ {
+ \bool_set_true:N \l_@@_last_col_without_value_bool
+ \int_set:Nn \l_@@_last_col_int { -1 }
+ }
\keys_set:nn { NiceMatrix / NiceMatrix } { #1 }
\bool_lazy_or:nnT
{ \clist_if_empty_p:N \l_@@_vlines_clist }
@@ -7244,7 +7389,7 @@ version 2005/12/01 or later.
}
{
\endNiceArray
- \int_compare:nNnT \g_@@_total_X_weight_int = \c_zero_int
+ \int_if_zero:nT \g_@@_total_X_weight_int
{ \@@_error:n { NiceTabularX~without~X } }
}
% \end{macrocode}
@@ -7334,7 +7479,7 @@ version 2005/12/01 or later.
%
% \medskip
% \begin{macrocode}
- \tl_gput_right:Nx \g_@@_aux_tl
+ \tl_build_gput_right:Nx \g_@@_aux_tl
{
\seq_gset_from_clist:Nn \exp_not:N \g_@@_size_seq
{
@@ -7353,7 +7498,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\seq_if_empty:NF \g_@@_pos_of_blocks_seq
{
- \tl_gput_right:Nx \g_@@_aux_tl
+ \tl_build_gput_right:Nx \g_@@_aux_tl
{
\seq_gset_from_clist:Nn \exp_not:N \g_@@_pos_of_blocks_seq
{ \seq_use:Nnnn \g_@@_pos_of_blocks_seq , , , }
@@ -7361,7 +7506,7 @@ version 2005/12/01 or later.
}
\seq_if_empty:NF \g_@@_multicolumn_cells_seq
{
- \tl_gput_right:Nx \g_@@_aux_tl
+ \tl_build_gput_right:Nx \g_@@_aux_tl
{
\seq_gset_from_clist:Nn \exp_not:N \g_@@_multicolumn_cells_seq
{ \seq_use:Nnnn \g_@@_multicolumn_cells_seq , , , }
@@ -7566,9 +7711,10 @@ version 2005/12/01 or later.
% force). These instructions will be written on the |aux| file to be added to
% the |code-before| in the next run.
% \begin{macrocode}
+ \seq_if_empty:NF \g_@@_rowlistcolors_seq { \@@_clear_rowlistcolors_seq: }
\tl_if_empty:NF \g_@@_pre_code_before_tl
{
- \tl_gput_right:Nx \g_@@_aux_tl
+ \tl_build_gput_right:Nx \g_@@_aux_tl
{
\tl_gset:Nn \exp_not:N \g_@@_pre_code_before_tl
{ \exp_not:V \g_@@_pre_code_before_tl }
@@ -7577,7 +7723,7 @@ version 2005/12/01 or later.
}
\tl_if_empty:NF \g_nicematrix_code_before_tl
{
- \tl_gput_right:Nx \g_@@_aux_tl
+ \tl_build_gput_right:Nx \g_@@_aux_tl
{
\tl_gset:Nn \exp_not:N \g_@@_code_before_tl
{ \exp_not:V \g_nicematrix_code_before_tl }
@@ -7735,7 +7881,7 @@ version 2005/12/01 or later.
\pgftransformshift { \pgfpoint \l_tmpa_dim \l_tmpb_dim }
% \end{macrocode}
% Now, |\l_tmpa_dim| and |\l_tmpb_dim| become the width and the height of the
-% node (of shape |@Ă _diag_node|) that we will construct.
+% node (of shape |@@_diag_node|) that we will construct.
% \begin{macrocode}
\dim_set:Nn \l_tmpa_dim { ( \l_@@_tmpc_dim - \l_tmpa_dim ) / 2 }
\dim_set:Nn \l_tmpb_dim { ( \l_@@_tmpd_dim - \l_tmpb_dim ) / 2 }
@@ -7937,7 +8083,7 @@ version 2005/12/01 or later.
\int_compare:nNnTF { #3 } = 1
{ \bool_set_true:N \l_@@_initial_open_bool }
{
- \int_compare:nNnT \l_@@_initial_j_int = { \l_@@_col_min_int -1 }
+ \int_compare:nNnT \l_@@_initial_j_int = { \l_@@_col_min_int - 1 }
{ \bool_set_true:N \l_@@_initial_open_bool }
}
}
@@ -8192,7 +8338,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\group_begin:
\@@_open_shorten:
- \int_compare:nNnTF { #1 } = 0
+ \int_if_zero:nTF { #1 }
{ \color { nicematrix-first-row } }
{
% \end{macrocode}
@@ -8287,7 +8433,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\group_begin:
\@@_open_shorten:
- \int_compare:nNnTF { #1 } = 0
+ \int_if_zero:nTF { #1 }
{ \color { nicematrix-first-row } }
{
% \end{macrocode}
@@ -8422,7 +8568,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\group_begin:
\@@_open_shorten:
- \int_compare:nNnTF { #2 } = 0
+ \int_if_zero:nTF { #2 }
{ \color { nicematrix-first-col } }
{
\int_compare:nNnT { #2 } = \l_@@_last_col_int
@@ -8465,7 +8611,7 @@ version 2005/12/01 or later.
{
\@@_open_y_initial_dim:
\@@_open_y_final_dim:
- \int_compare:nNnTF \l_@@_initial_j_int = \c_zero_int
+ \int_if_zero:nTF \l_@@_initial_j_int
% \end{macrocode}
% We have a dotted line open on both sides in the ``first column''.
% \begin{macrocode}
@@ -9142,7 +9288,7 @@ version 2005/12/01 or later.
{ \@@_collect_options:n { \@@_Ldots_i } }
\exp_args:NNV \NewDocumentCommand \@@_Ldots_i \l_@@_argspec_tl
{
- \int_compare:nNnTF \c@jCol = 0
+ \int_if_zero:nTF \c@jCol
{ \@@_error:nn { in~first~col } \Ldots }
{
\int_compare:nNnTF \c@jCol = \l_@@_last_col_int
@@ -9164,7 +9310,7 @@ version 2005/12/01 or later.
{ \@@_collect_options:n { \@@_Cdots_i } }
\exp_args:NNV \NewDocumentCommand \@@_Cdots_i \l_@@_argspec_tl
{
- \int_compare:nNnTF \c@jCol = 0
+ \int_if_zero:nTF \c@jCol
{ \@@_error:nn { in~first~col } \Cdots }
{
\int_compare:nNnTF \c@jCol = \l_@@_last_col_int
@@ -9186,7 +9332,7 @@ version 2005/12/01 or later.
{ \@@_collect_options:n { \@@_Vdots_i } }
\exp_args:NNV \NewDocumentCommand \@@_Vdots_i \l_@@_argspec_tl
{
- \int_compare:nNnTF \c@iRow = 0
+ \int_if_zero:nTF \c@iRow
{ \@@_error:nn { in~first~row } \Vdots }
{
\int_compare:nNnTF \c@iRow = \l_@@_last_row_int
@@ -9308,8 +9454,8 @@ version 2005/12/01 or later.
\cs_new:Npn \@@_Hdotsfor:
{
\bool_lazy_and:nnTF
- { \int_compare_p:nNn \c@jCol = 0 }
- { \int_compare_p:nNn \l_@@_first_col_int = 0 }
+ { \int_if_zero_p:n \c@jCol }
+ { \int_if_zero_p:n \l_@@_first_col_int }
{
\bool_if:NTF \g_@@_after_col_zero_bool
{
@@ -9420,11 +9566,8 @@ version 2005/12/01 or later.
%
% \begin{macrocode}
\group_begin:
-
\@@_open_shorten:
-
-
- \int_compare:nNnTF { #1 } = 0
+ \int_if_zero:nTF { #1 }
{ \color { nicematrix-first-row } }
{
\int_compare:nNnT { #1 } = \g_@@_row_total_int
@@ -9531,11 +9674,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\group_begin:
\@@_open_shorten:
-
-
-
-
- \int_compare:nNnTF { #2 } = 0
+ \int_if_zero:nTF { #2 }
{ \color { nicematrix-first-col } }
{
\int_compare:nNnT { #2 } = \g_@@_col_total_int
@@ -9896,7 +10035,7 @@ version 2005/12/01 or later.
\seq_map_indexed_inline:Nn \g_@@_colors_seq
{ \tl_if_eq:nnT { #1 } { ##2 } { \int_set:Nn \l_tmpa_int { ##1 } } }
}
- \int_compare:nNnTF \l_tmpa_int = \c_zero_int
+ \int_if_zero:nTF \l_tmpa_int
% \end{macrocode}
% First, the case where the color is a \emph{new} color (not in the sequence).
% \begin{macrocode}
@@ -9913,8 +10052,8 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \begin{macrocode}
-\cs_generate_variant:Nn \@@_add_to_colors_seq:nn { x n }
-\cs_generate_variant:Nn \@@_add_to_colors_seq:nn { x x }
+\cs_generate_variant:Nn \@@_add_to_colors_seq:nn { e n }
+\cs_generate_variant:Nn \@@_add_to_colors_seq:nn { e e }
% \end{macrocode}
%
% \bigskip
@@ -10036,7 +10175,7 @@ version 2005/12/01 or later.
\tl_if_empty:NF \l_tmpa_tl { \exp_args:NV \pgfsetfillopacity \l_tmpa_tl }
\tl_if_empty:NTF \l_tmpb_tl
{ \@declaredcolor }
- { \use:x { \exp_not:N \@undeclaredcolor [ \l_tmpb_tl ] } }
+ { \use:e { \exp_not:N \@undeclaredcolor [ \l_tmpb_tl ] } }
}
% \end{macrocode}
%
@@ -10067,7 +10206,7 @@ version 2005/12/01 or later.
{
\tl_if_blank:nF { #2 }
{
- \@@_add_to_colors_seq:xn
+ \@@_add_to_colors_seq:en
{ \tl_if_blank:nF { #1 } { [ #1 ] } { #2 } }
{ \@@_cartesian_color:nn { #3 } { - } }
}
@@ -10081,7 +10220,7 @@ version 2005/12/01 or later.
{
\tl_if_blank:nF { #2 }
{
- \@@_add_to_colors_seq:xn
+ \@@_add_to_colors_seq:en
{ \tl_if_blank:nF { #1 } { [ #1 ] } { #2 } }
{ \@@_cartesian_color:nn { - } { #3 } }
}
@@ -10095,7 +10234,7 @@ version 2005/12/01 or later.
{
\tl_if_blank:nF { #2 }
{
- \@@_add_to_colors_seq:xn
+ \@@_add_to_colors_seq:en
{ \tl_if_blank:nF { #1 } { [ #1 ] } { #2 } }
{ \@@_rectanglecolor:nnn { #3 } { #4 } { 0 pt } }
}
@@ -10109,7 +10248,7 @@ version 2005/12/01 or later.
{
\tl_if_blank:nF { #2 }
{
- \@@_add_to_colors_seq:xn
+ \@@_add_to_colors_seq:en
{ \tl_if_blank:nF { #1 } { [ #1 ] } { #2 } }
{ \@@_rectanglecolor:nnn { #3 } { #4 } { #5 } }
}
@@ -10199,12 +10338,12 @@ version 2005/12/01 or later.
%
% Here is an example: |\rowcolors{1}{blue!10}{}[respect-blocks]|.
%
-% In \pkg{nicematrix}, the commmand |\@@_rowcolors| apperas as a special case of
+% In \pkg{nicematrix}, the commmand |\@@_rowcolors| appears as a special case of
% |\@@_rowlistcolors|.
%
-% |#1| (optional) is the color space ;
-% |#2| is a list of intervals of rows ;
-% |#3| is the list of colors ;
+% |#1| (optional) is the color space;
+% |#2| is a list of intervals of rows;
+% |#3| is the list of colors;
% |#4| is for the optional list of pairs \textsl{key=value}.
% \begin{macrocode}
\NewDocumentCommand \@@_rowlistcolors { O { } m m O { } }
@@ -10293,7 +10432,7 @@ version 2005/12/01 or later.
}
\tl_if_empty:NF \l_@@_color_tl
{
- \@@_add_to_colors_seq:xx
+ \@@_add_to_colors_seq:ee
{ \tl_if_blank:nF { #1 } { [ #1 ] } { \l_@@_color_tl } }
{ \@@_cartesian_color:nn { \l_@@_rows_tl } { \l_@@_cols_tl } }
}
@@ -10321,12 +10460,13 @@ version 2005/12/01 or later.
%
% \bigskip
% The command |\rowcolors| (available in the |\CodeBefore|) is a specialisation
-% of the most general command |\rowlistcolors|. The last argument, which is a
+% of the more general command |\rowlistcolors|. The last argument, which is a
% optional argument between square brackets is provided by curryfication.
% \begin{macrocode}
\NewDocumentCommand \@@_rowcolors { O { } m m m }
{ \@@_rowlistcolors [ #1 ] { #2 } { { #3 } , { #4 } } }
% \end{macrocode}
+% The braces around |#3| and |#4| are mandatory.
%
% \bigskip
% \begin{macrocode}
@@ -10343,7 +10483,7 @@ version 2005/12/01 or later.
\prg_new_conditional:Nnn \@@_not_in_exterior:nnnnn p
{
\bool_lazy_or:nnTF
- { \int_compare_p:nNn { #4 } = \c_zero_int }
+ { \int_if_zero_p:n { #4 } }
{ \int_compare_p:nNn { #2 } = { \int_eval:n { \c@jCol + 1 } } }
\prg_return_false:
\prg_return_true:
@@ -10503,6 +10643,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\NewDocumentCommand \@@_cellcolor_tabular { O { } m }
{
+ \@@_test_color_inside:
\tl_gput_right:Nx \g_@@_pre_code_before_tl
{
% \end{macrocode}
@@ -10523,6 +10664,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\NewDocumentCommand \@@_rowcolor_tabular { O { } m }
{
+ \@@_test_color_inside:
\tl_gput_right:Nx \g_@@_pre_code_before_tl
{
\@@_rectanglecolor [ #1 ] { \exp_not:n { #2 } }
@@ -10539,8 +10681,9 @@ version 2005/12/01 or later.
% argument between square brackets is taken by curryfication).
% \begin{macrocode}
\NewDocumentCommand { \@@_rowcolors_tabular } { O { } m m }
- { \@@_rowlistcolors_tabular [ #1 ] { #2 , #3 } }
+ { \@@_rowlistcolors_tabular [ #1 ] { { #2 } , { #3 } } }
% \end{macrocode}
+% The braces around |#2| and |#3| are mandatory.
%
% \bigskip
% When the user uses the key |color-inside|, the following command will
@@ -10548,19 +10691,113 @@ version 2005/12/01 or later.
% \begin{macrocode}
\NewDocumentCommand { \@@_rowlistcolors_tabular } { O { } m O { } }
{
+ \@@_test_color_inside:
\peek_remove_spaces:n
+ { \@@_rowlistcolors_tabular:nnn { #1 } { #2 } { #3 } }
+ }
+% \end{macrocode}
+%
+% \bigskip
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_rowlistcolors_tabular:nnn #1 #2 #3
+ {
+% \end{macrocode}
+% A use of |\rowlistcolors| in the tabular erases the instructions
+% |\rowlistcolors| which are in force. However, it's possible to put \emph{several}
+% instructions |\rowlistcolors| in the same row of a tabular: it may be useful
+% when those instructions |\rowlistcolors| concerns different columns of the
+% tabular (thanks to the key |cols| of |\rowlistcolors|). That's why we store
+% the different instructions |\rowlistcolors| which are in force in a sequence
+% |\g_@@_rowlistcolors_seq|. Now, we will filter that sequence to keep only the
+% elements which have been issued on the actual row. We will store the elements
+% to keep in the |\g_tmpa_seq|.
+% \begin{macrocode}
+ \seq_gclear:N \g_tmpa_seq
+ \seq_map_inline:Nn \g_@@_rowlistcolors_seq
+ { \@@_rowlistcolors_tabular_i:nnnn ##1 }
+ \seq_gset_eq:NN \g_@@_rowlistcolors_seq \g_tmpa_seq
+% \end{macrocode}
+% Now, we add to the sequence |\g_@@_rowlistcolors_seq| (which is the list of
+% the commands |\rowlistcolors| which are in force) the current instruction
+% |\rowlistcolors|.
+% \begin{macrocode}
+ \seq_gput_right:Nx \g_@@_rowlistcolors_seq
+ {
+ { \int_use:N \c@iRow }
+ { \exp_not:n { #1 } }
+ { \exp_not:n { #2 } }
+ { restart , cols = \int_use:N \c@jCol - , \exp_not:n { #3 } }
+ }
+ }
+% \end{macrocode}
+%
+%
+% \bigskip
+% The following command will be applied to each component of
+% |\g_@@_rowlistcolors_seq|. Each component of that sequence is a kind of 4-uple
+% of the form |{#1}{#2}{#3}{#4}|.
+%
+% |#1| is the number of the row where the command |\rowlistcolors| has been
+% issued.
+%
+% |#2| is the colorimetric space (optional argument of the |\rowlistcolors|).
+%
+% |#3| is the list of colors (mandatory argument of |\rowlistcolors|).
+%
+% |#4| is the list of \textsl{key=value} pairs (last optional argument of
+% |\rowlistcolors|).
+%
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_rowlistcolors_tabular_i:nnnn #1 #2 #3 #4
+ {
+ \int_compare:nNnTF { #1 } = \c@iRow
+% \end{macrocode}
+% We (temporary) keep in memory in |\g_tmpa_seq| the instructions which will
+% still be in force after the current instruction (because they have been issued
+% in the same row of the tabular).
+% \begin{macrocode}
+ { \seq_gput_right:Nn \g_tmpa_seq { { #1 } { #2 } { #3 } { #4 } } }
{
\tl_gput_right:Nx \g_@@_pre_code_before_tl
{
\@@_rowlistcolors
- [ #1 ] { \int_use:N \c@iRow } { #2 }
- [ restart, cols = \int_use:N \c@jCol - , #3 ]
+ [ \exp_not:n { #2 } ]
+ { #1 - \int_eval:n { \c@iRow - 1 } }
+ { \exp_not:n { #3 } }
+ [ \exp_not:n { #4 } ]
}
}
}
% \end{macrocode}
%
% \bigskip
+% The following command will be used at the end of the tabular, just before the
+% execution of the |\g_@@_pre_code_before_tl|. It clears the sequence
+% |\g_@@_rowlistcolors_seq| of all the commands |\rowlistcolors| which are
+% (still) in force.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_clear_rowlistcolors_seq:
+ {
+ \seq_map_inline:Nn \g_@@_rowlistcolors_seq
+ { \@@_rowlistcolors_tabular_ii:nnnn ##1 }
+ \seq_gclear:N \g_@@_rowlistcolors_seq
+ }
+% \end{macrocode}
+%
+% \medskip
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_rowlistcolors_tabular_ii:nnnn #1 #2 #3 #4
+ {
+ \tl_gput_right:Nn \g_@@_pre_code_before_tl
+ { \@@_rowlistcolors [ #2 ] { #1 } { #3 } [ #4 ] }
+ }
+% \end{macrocode}
+% The first mandatory argument of the command |\@@_rowlistcolors| which is
+% writtent in the pre-|\CodeBefore| is of the form |i|: it means that the
+% command must be applied to all the rows from the row~$i$ until the end of the
+% tabular.
+%
+% \bigskip
% \begin{macrocode}
\NewDocumentCommand \@@_columncolor_preamble { O { } m }
{
@@ -10618,10 +10855,10 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_OnlyMainNiceMatrix:n #1
{
- \int_compare:nNnTF \l_@@_first_col_int = 0
+ \int_if_zero:nTF \l_@@_first_col_int
{ \@@_OnlyMainNiceMatrix_i:n { #1 } }
{
- \int_compare:nNnTF \c@jCol = 0
+ \int_if_zero:nTF \c@jCol
{
\int_compare:nNnF \c@iRow = { -1 }
{ \int_compare:nNnF \c@iRow = { \l_@@_last_row_int - 1 } { #1 } }
@@ -10640,7 +10877,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_OnlyMainNiceMatrix_i:n #1
{
- \int_compare:nNnF \c@iRow = 0
+ \int_if_zero:nF \c@iRow
{
\int_compare:nNnF \c@iRow = \l_@@_last_row_int
{
@@ -10784,7 +11021,7 @@ version 2005/12/01 or later.
\clist_if_empty:NF \l_@@_corners_clist \@@_test_in_corner_v:
\bool_if:NTF \g_tmpa_bool
{
- \int_compare:nNnT \l_@@_local_start_int = 0
+ \int_if_zero:nT \l_@@_local_start_int
% \end{macrocode}
% We keep in memory that we have a rule to draw. |\l_@@_local_start_int| will be
% the starting row of the rule that we will have to draw.
@@ -10962,7 +11199,7 @@ version 2005/12/01 or later.
\@@_qpoint:n { row - \int_eval:n { \l_@@_local_end_int + 1 } }
\dim_set_eq:NN \l_@@_tmpc_dim \pgf@y
\exp_args:NV \tikzset \l_@@_tikz_rule_tl
- \use:x { \exp_not:N \draw [ \l_@@_tikz_rule_tl ] }
+ \use:e { \exp_not:N \draw [ \l_@@_tikz_rule_tl ] }
( \l_tmpb_dim , \l_tmpa_dim ) --
( \l_tmpb_dim , \l_@@_tmpc_dim ) ;
\end { tikzpicture }
@@ -11049,7 +11286,7 @@ version 2005/12/01 or later.
\clist_if_empty:NF \l_@@_corners_clist \@@_test_in_corner_h:
\bool_if:NTF \g_tmpa_bool
{
- \int_compare:nNnT \l_@@_local_start_int = 0
+ \int_if_zero:nT \l_@@_local_start_int
% \end{macrocode}
% We keep in memory that we have a rule to draw. |\l_@@_local_start_int| will be
% the starting row of the rule that we will have to draw.
@@ -11288,7 +11525,7 @@ version 2005/12/01 or later.
\@@_qpoint:n { col - \int_eval:n { \l_@@_local_end_int + 1 } }
\dim_set_eq:NN \l_@@_tmpc_dim \pgf@x
\exp_args:NV \tikzset \l_@@_tikz_rule_tl
- \use:x { \exp_not:N \draw [ \l_@@_tikz_rule_tl ] }
+ \use:e { \exp_not:N \draw [ \l_@@_tikz_rule_tl ] }
( \l_tmpa_dim , \l_tmpb_dim ) --
( \l_@@_tmpc_dim , \l_tmpb_dim ) ;
\end { tikzpicture }
@@ -11378,21 +11615,7 @@ version 2005/12/01 or later.
% The final user can define a customized rule by using the key |custom-line| in
% |\NiceMatrixOptions|. That key takes in as value a list of \textsl{key=value}
% pairs.
-%
%
-%
-% \medskip
-% Among the keys avalaible in that list, there is the key |letter| to specify a
-% letter that the final user will use in the preamble of the array. All the
-% letters defined by this way by the final user for such customized rules are
-% added in the set of keys |{NiceMatrix / ColumnTypes}|. That set of keys is
-% used to store the characteristics of those types of rules for convenience: the
-% keys of that set of keys won't never be used as keys by the final user (he
-% will use, instead, letters in the preamble of its array).
-%
-% \begin{macrocode}
-\keys_define:nn { NiceMatrix / ColumnTypes } { }
-% \end{macrocode}
%
%
% \medskip
@@ -11473,21 +11696,18 @@ version 2005/12/01 or later.
{
\exp_args:NnV \tl_if_in:NnTF
\c_@@_forbidden_letters_str \l_@@_letter_str
- { \@@_error:n { Forbidden~letter } }
+ { \@@_error:ne { Forbidden~letter } \l_@@_letter_str }
{
% \end{macrocode}
-% The final user can, locally, redefine a letter of column type. That's
-% compatible with the use of |\keys_define:nn|: the definition is local and may
-% overwrite a previous definition.
+% During the analyse of the preamble provided by the final user, our automaton,
+% for the letter corresponding at the custom line, will directly use the
+% following command that you define in the main hash table of TeX.
% \begin{macrocode}
- \keys_define:nx { NiceMatrix / ColumnTypes }
- {
- \l_@@_letter_str .code:n =
- { \@@_v_custom_line:n { \exp_not:n { #1 } } }
- }
- }
- }
- }
+ \cs_set:cpn { @@ _ \l_@@_letter_str } ##1
+ { \@@_v_custom_line:n { #1 } }
+ }
+ }
+ }
\str_if_empty:NF \l_@@_command_str { \@@_h_custom_line:n { #1 } }
\str_if_empty:NF \l_@@_ccommand_str { \@@_c_custom_line:n { #1 } }
}
@@ -11495,6 +11715,7 @@ version 2005/12/01 or later.
%
%
% \begin{macrocode}
+\tl_const:Nn \c_@@_forbidden_letters_tl { lcrpmbVX|()[]!@<> }
\str_const:Nn \c_@@_forbidden_letters_str { lcrpmbVX|()[]!@<> }
% \end{macrocode}
%
@@ -11668,6 +11889,7 @@ version 2005/12/01 or later.
total-width = \dim_use:N \l_@@_rule_width_dim
}
}
+ \@@_rec_preamble:n
}
% \end{macrocode}
%
@@ -11786,7 +12008,7 @@ version 2005/12/01 or later.
% commands which color the |rows|, |columns| and |cells| must not color the
% cells in the corners.
% \begin{macrocode}
- \tl_gput_right:Nx \g_@@_aux_tl
+ \tl_build_gput_right:Nx \g_@@_aux_tl
{
\seq_set_from_clist:Nn \exp_not:N \l_@@_corners_cells_seq
{ \seq_use:Nnnn \l_@@_corners_cells_seq , , , }
@@ -11968,7 +12190,8 @@ version 2005/12/01 or later.
\cs_if_exist:cT
{ @@_max_cell_width_ \int_use:N \g_@@_NiceMatrixBlock_int }
{
- \exp_args:NNx \dim_set:Nn \l_@@_columns_width_dim
+ % is \exp_args:NNe mandatory?
+ \exp_args:NNe \dim_set:Nn \l_@@_columns_width_dim
{
\use:c
{ @@_max_cell_width _ \int_use:N \g_@@_NiceMatrixBlock_int }
@@ -12550,8 +12773,8 @@ version 2005/12/01 or later.
% \begin{macrocode}
&& ! \l_@@_X_column_bool
}
- { \exp_args:Nxx \@@_Block_iv:nnnnn }
- { \exp_args:Nxx \@@_Block_v:nnnnn }
+ { \exp_args:Nee \@@_Block_iv:nnnnn }
+ { \exp_args:Nee \@@_Block_v:nnnnn }
{ \l_tmpa_int } { \l_tmpb_int } { #3 } { #4 } { #5 }
}
% \end{macrocode}
@@ -12616,7 +12839,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\int_compare:nNnT { #1 } = 1
{
- \int_compare:nNnTF \c@iRow = 0
+ \int_if_zero:nTF \c@iRow
\l_@@_code_for_first_row_tl
{
\int_compare:nNnT \c@iRow = \l_@@_last_row_int
@@ -12664,7 +12887,7 @@ version 2005/12/01 or later.
% use a |{minipage}|.
% \begin{macrocode}
{
- \use:x
+ \use:e
{
\exp_not:N \begin { minipage }%
[ \str_lowercase:V { \l_@@_vpos_of_block_str } ]
@@ -12679,7 +12902,7 @@ version 2005/12/01 or later.
% In the other cases, we use a |{tabular}|.
% \begin{macrocode}
{
- \use:x
+ \use:e
{
\exp_not:N \begin { tabular }%
[ \str_lowercase:V { \l_@@_vpos_of_block_str } ]
@@ -12695,7 +12918,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
{
\c_math_toggle_token
- \use:x
+ \use:e
{
\exp_not:N \begin { array }%
[ \str_lowercase:V { \l_@@_vpos_of_block_str } ]
@@ -12883,7 +13106,7 @@ version 2005/12/01 or later.
% say the position of the block in its zone of merged cells).
% \begin{macrocode}
% \@@_adjust_hpos_rotate:
- \use:x
+ \use:e
{
\exp_not:N \begin { tabular } [ \l_@@_vpos_of_block_str ]
{ @ { } \l_@@_hpos_block_str @ { } }
@@ -12906,7 +13129,7 @@ version 2005/12/01 or later.
#4
% \@@_adjust_hpos_rotate:
\c_math_toggle_token % :n c
- \use:x
+ \use:e
{
\exp_not:N \begin { array } [ \l_@@_vpos_of_block_str ]
{ @ { } \l_@@_hpos_block_str @ { } }
@@ -13037,8 +13260,12 @@ version 2005/12/01 or later.
{ \int_set:Nn \l_@@_last_col_int { #4 } }
\int_compare:nNnTF \l_@@_last_col_int > \g_@@_col_total_int
{
- \int_compare:nTF
- { \l_@@_last_col_int <= \g_@@_static_num_of_col_int }
+ \bool_lazy_and:nnTF
+ \l_@@_preamble_bool
+ {
+ \int_compare_p:n
+ { \l_@@_last_col_int <= \g_@@_static_num_of_col_int }
+ }
{
\msg_error:nnnn { nicematrix } { Block~too~large~2 } { #1 } { #2 }
\@@_msg_redirect_name:nn { Block~too~large~2 } { none }
@@ -13239,9 +13466,10 @@ version 2005/12/01 or later.
% inner sep=0pt,
% fit = #1}}
%
-% \begin{tabular}{c!{\hspace{1cm}}c}
+% \begin{tabular}{c@{\hspace{1cm}}c}
% We highlight the node |1-1-block|
-% & We highlight the node |1-1-block-short| \\[2mm]
+% &
+% We highlight the node |1-1-block-short| \\[2mm]
% \begin{NiceTabular}{cc!{\hspace{1cm}}c}
% \Block{2-2}{our block} & & one \\
% & & two \\
@@ -13260,7 +13488,7 @@ version 2005/12/01 or later.
% \tikz \node [highlight = (1-1-block-short)] { } ;
% \end{NiceTabular}
% \end{tabular}
-%
+%
%
% \bigskip
% The construction of the node corresponding to the merged cells.
@@ -13406,7 +13634,7 @@ version 2005/12/01 or later.
% \end{macrocode}
% If we are in the first column, we must put the block as if it was with the key~|r|.
% \begin{macrocode}
- \int_compare:nNnT { #2 } = 0 { \str_set:Nn \l_@@_hpos_block_str r }
+ \int_if_zero:nT { #2 } { \str_set:Nn \l_@@_hpos_block_str r }
% \end{macrocode}
% If we are in the last column, we must put the block as if it was with the key~|l|.
% \begin{macrocode}
@@ -13599,7 +13827,7 @@ version 2005/12/01 or later.
{
color .tl_set:N = \l_@@_draw_tl ,
draw .code:n =
- \exp_args:Nx \tl_if_empty:nF { #1 } { \tl_set:Nn \l_@@_draw_tl { #1 } } ,
+ \exp_args:Ne \tl_if_empty:nF { #1 } { \tl_set:Nn \l_@@_draw_tl { #1 } } ,
draw .default:n = default ,
line-width .dim_set:N = \l_@@_line_width_dim ,
rounded-corners .dim_set:N = \l_@@_rounded_corners_dim ,
@@ -13626,14 +13854,14 @@ version 2005/12/01 or later.
\tl_set:Nx \l_tmpb_tl { \int_eval:n { \l_tmpb_tl + 1 } }
\int_step_inline:nnn \l_@@_tmpd_tl \l_tmpb_tl
{
- \use:x
+ \use:e
{
\@@_vline:n
{
position = ##1 ,
start = \l_@@_tmpc_tl ,
end = \int_eval:n { \l_tmpa_tl - 1 } ,
- total-width = \dim_use:N \l_@@_line_width_dim % added 2022-08-06
+ total-width = \dim_use:N \l_@@_line_width_dim
}
}
}
@@ -13650,7 +13878,7 @@ version 2005/12/01 or later.
\tl_set:Nx \l_tmpb_tl { \int_eval:n { \l_tmpb_tl + 1 } }
\int_step_inline:nnn \l_@@_tmpc_tl \l_tmpa_tl
{
- \use:x
+ \use:e
{
\@@_hline:n
{
@@ -13757,7 +13985,7 @@ version 2005/12/01 or later.
\pgfusepathqstroke
}
{
- \use:x { \exp_not:N \draw [ \l_@@_borders_tikz_tl ] }
+ \use:e { \exp_not:N \draw [ \l_@@_borders_tikz_tl ] }
( \pgf@x , \l_tmpb_dim ) -- ( \pgf@x , \l_@@_tmpc_dim ) ;
}
}
@@ -13783,7 +14011,7 @@ version 2005/12/01 or later.
\pgfusepathqstroke
}
{
- \use:x { \exp_not:N \draw [ \l_@@_borders_tikz_tl ] }
+ \use:e { \exp_not:N \draw [ \l_@@_borders_tikz_tl ] }
( \l_tmpa_dim , \pgf@y ) -- ( \l_tmpb_dim , \pgf@y ) ;
}
}
@@ -13817,7 +14045,7 @@ version 2005/12/01 or later.
\clist_map_inline:nn { #5 }
{
\keys_set_known:nnN { NiceMatrix / SpecialOffset } { ##1 } \l_tmpa_tl
- \use:x { \exp_not:N \path [ \l_tmpa_tl ] }
+ \use:e { \exp_not:N \path [ \l_tmpa_tl ] }
(
[
xshift = \dim_use:N \l_@@_offset_dim ,
@@ -13916,21 +14144,21 @@ version 2005/12/01 or later.
% yet nicematrix-ready).
% \begin{macrocode}
% \bool_set_false:N \l_@@_preamble_bool
- \use:x
+ \use:e
{
\exp_not:N \begin { NiceArrayWithDelims } { #1 } { #2 }
{ * { #4 } { \exp_not:V \l_@@_columns_type_tl } }
[ \exp_not:V \l_tmpa_tl ]
}
- \int_compare:nNnT \l_@@_first_row_int = 0
+ \int_if_zero:nT \l_@@_first_row_int
{
- \int_compare:nNnT \l_@@_first_col_int = 0 { & }
+ \int_if_zero:nT \l_@@_first_col_int { & }
\prg_replicate:nn { #4 - 1 } { & }
\int_compare:nNnT \l_@@_last_col_int > { -1 } { & } \\
}
\prg_replicate:nn { #3 }
{
- \int_compare:nNnT \l_@@_first_col_int = 0 { & }
+ \int_if_zero:nT \l_@@_first_col_int { & }
% \end{macrocode}
% We put |{ }| before |#6| to avoid a hasty expansion of a potential
% |\arabic{iRow}| at the beginning of the row which would result in an incorrect
@@ -13942,7 +14170,7 @@ version 2005/12/01 or later.
}
\int_compare:nNnT \l_@@_last_row_int > { -2 }
{
- \int_compare:nNnT \l_@@_first_col_int = 0 { & }
+ \int_if_zero:nT \l_@@_first_col_int { & }
\prg_replicate:nn { #4 - 1 } { & }
\int_compare:nNnT \l_@@_last_col_int > { -1 } { & } \\
}
@@ -15098,8 +15326,6 @@ version 2005/12/01 or later.
% \section{The command TikzEveryCell}
%
% \begin{macrocode}
-
-
\bool_new:N \l_@@_not_empty_bool
\bool_new:N \l_@@_empty_bool
@@ -15129,7 +15355,11 @@ version 2005/12/01 or later.
{
\group_begin:
\keys_set:nn { NiceMatrix / TikzEveryCell } { #1 }
- \tl_set:Nn \l_tmpa_tl { #2 }
+% \end{macrocode}
+% The inner pair of braces in the following line is mandatory because, the last
+% argument of |\@@_tikz:nnnnn| is \emph{a list of lists} of TikZ keys.
+% \begin{macrocode}
+ \tl_set:Nn \l_tmpa_tl { { #2 } }
\seq_map_inline:Nn \g_@@_pos_of_blocks_seq
{ \@@_for_a_block:nnnnn ##1 }
\@@_all_the_cells:
@@ -15149,7 +15379,7 @@ version 2005/12/01 or later.
{
\cs_if_exist:cF { cell - \@@_i_tl - \@@_j_tl }
{
- \exp_args:NNx \seq_if_in:NnF \l_@@_corners_cells_seq
+ \exp_args:NNe \seq_if_in:NnF \l_@@_corners_cells_seq
{ \@@_i_tl - \@@_j_tl }
{
\bool_set_false:N \l_tmpa_bool
@@ -15192,8 +15422,6 @@ version 2005/12/01 or later.
{ \cs_set:cpn { cell - ##1 - ####1 } { } }
}
}
-
-
% \end{macrocode}
%
%
@@ -15922,7 +16150,7 @@ version 2005/12/01 or later.
{
Problem~with~'not-empty'\\
For~technical~reasons,~you~must~activate~
- 'recreate-cell-nodes'~in~\token_to_str:N \CodeBefore\
+ 'create-cell-nodes'~in~\token_to_str:N \CodeBefore\
in~order~to~use~the~key~'\l_keys_key_str'.\\
That~key~will~be~ignored.
}
@@ -16020,7 +16248,7 @@ version 2005/12/01 or later.
\@@_msg_new:nn { Forbidden~letter }
{
Forbidden~letter.\\
- You~can't~use~the~letter~'\l_@@_letter_str'~for~a~customized~line.\\
+ You~can't~use~the~letter~'#1'~for~a~customized~line.\\
It~will~be~ignored.
}
% \end{macrocode}
@@ -16283,6 +16511,17 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \begin{macrocode}
+\@@_msg_new:nn { without~color-inside }
+ {
+ If~order~to~use~\token_to_str:N \cellcolor,~\token_to_str:N \rowcolor,~
+ \token_to_str:N \rowcolors\ or~\token_to_str:N \rowlistcolors\
+ outside~\token_to_str:N \CodeBefore,~you~
+ should~have~used~the~key~'color-inside'~in~your~\@@_full_name_env:.\\
+ You~can~go~on~but~you~may~need~more~compilations.
+ }
+% \end{macrocode}
+%
+% \begin{macrocode}
\@@_msg_new:nn { color~in~custom-line~with~tikz }
{
Erroneous~use.\\
@@ -16385,17 +16624,6 @@ version 2005/12/01 or later.
respect-arraystretch,~t,~T,~tikz,~transparent~and~vlines.
}
% \end{macrocode}
-%
-% \begin{macrocode}
-\@@_msg_new:nn { Version~of~siunitx~too~old }
- {
- siunitx~too~old.\\
- You~can't~use~'S'~columns~because~your~version~of~'siunitx'~
- is~too~old.~You~need~at~least~v~3.0.38~and~your~log~file~says:~"siunitx,~
- \use:c { ver @ siunitx.sty }". \\
- This~error~is~fatal.
- }
-% \end{macrocode}
%
%
% \begin{macrocode}
@@ -16794,6 +17022,16 @@ version 2005/12/01 or later.
However,~you~can~go~on.
}
% \end{macrocode}
+%
+% \begin{macrocode}
+\@@_msg_new:nn { Preamble~forgotten }
+ {
+ Preamble~forgotten.\\
+ You~have~probably~forgotten~the~preamble~of~your~
+ \@@_full_name_env:. \\
+ This~error~is~fatal.
+ }
+% \end{macrocode}
%
% \newpage
% \tableofcontents
diff --git a/macros/latex/contrib/nicematrix/nicematrix-code.pdf b/macros/latex/contrib/nicematrix/nicematrix-code.pdf
index a946462d28..f231477158 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-code.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.pdf b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
index b8847116e0..9ceefb5bfc 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.tex b/macros/latex/contrib/nicematrix/nicematrix-french.tex
index a677a35681..57c269627b 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.tex
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.tex
@@ -57,6 +57,11 @@
\NewDocumentCommand{\Definition}{m}
{{\setlength{\fboxsep}{1pt}\colorbox{gray!20}{\ttfamily \vphantom{gl}#1}}}
+\NewDocumentCommand{\DefinitionCommande}{m}
+ {{\setlength{\fboxsep}{1pt}\colorbox{gray!20}{\ttfamily
+ \vphantom{gl}\textbackslash #1}}}
+
+
\usepackage{makeidx}
\makeindex
@@ -620,8 +625,8 @@ la clé \Definition{respect-arraystretch} évite la remise à $1$ de
Par défaut, les filets ne sont pas tracés dans les blocs (voir à ce sujet
la partie sur les filets, section~\ref{rules} p.~\pageref{rules}). NĂ©anmoins, si
la clé \Definition{transparent} est utilisée, les filets seront tracés.\footnote{Par
-ailleurs, la commande |\TikzEveryCell| disponible dans le |\CodeAfter|, ne
-s'applique aux blocs avec la clé |transparent|).}
+ailleurs, la commande |\TikzEveryCell| disponible dans le |\CodeAfter| et le
+|\CodeBefore|, ne s'applique aux blocs avec la clé |transparent|.}
Pour un exemple, voir la section~\ref{tikz-key-examples},
page~\pageref{tikz-key-examples}.
@@ -678,7 +683,7 @@ Les blocs mono-colonne ont un comportement spécial.
largeur de la colonne courante.
Dans les colonnes à largeur fixée (|p{...}|, |b{...}|, |m{...}|, |w{...}{...}|,
-|W{...}{...}|, |V| et~|X|), le contenu du bloc est mis en forme comme un
+|W{...}{...}|, |V{...}| et~|X|), le contenu du bloc est mis en forme comme un
paragraphe de cette largeur.
\item La spécification d'alignement horizontal donnée par le type de
@@ -1060,7 +1065,7 @@ Marie & Pauline \\ \hline
En revanche, les filets verticaux ne sont pas tracés à l'intérieur des blocs
(créés par |\Block|: cf.~p.~\pageref{Block}) ni dans les coins (dont la création
est demandée par la clé |corners|: cf.~p.~\pageref{corners}), ni dans les
-éventuelles rangées extérieures (créées par les clés |row-first| et |last-row|:
+éventuelles rangées extérieures (créées par les clés |first-row| et |last-row|:
cf.~p.~\pageref{exterior}).
@@ -1266,7 +1271,6 @@ p.~\pageref{custom-line}.\footnote{Remarque technique. Si l'utilisateur définit
|\NewExpandableDocumentCommand| de LaTeX3, |\newcommand| de LaTeX ou mĂŞme
|\def| de TeX). Exemple : |\newcommand{\RedLine}{\Hline[color=red]}|}
-\bigskip
De même que la commande |\Hline|, le specificateur «\verb+|+» admet entre crochets
des options qui caractérisent le filet à tracer.
@@ -1363,7 +1367,7 @@ p.~\pageref{tabular-rounded-corners}.
La clé |hvlines-except-borders| est similaire à la clé |hvlines| mais ne trace
pas les filets sur les bords horizontaux et verticaux du tableau. Pour un
exemple d'utilisation de cette clé, voir la partie «Exemple d'utilisation avec
-tcolorbox» p.~\pageref{tcolorbox}.
+\pkg{tcolorbox}» p.~\pageref{tcolorbox}.
\medskip
\subsubsection{Les coins (vides)}
@@ -1391,7 +1395,7 @@ comme non vide par \pkg{nicematrix} avec la commande |\NotEmpty|.
\medskip
\begin{minipage}{9cm}
-Dans l'exemple ci-contre (oĂą B est au centre d'un bloc de taille $2\times 2$),
+Dans l'exemple ci-contre (oĂą B est au centre d'un |\Block| de taille $2\times 2$),
on a colorié en bleu clair les quatre coins (vides) du tableau.
\end{minipage}\hspace{2cm}%
\begin{NiceTabular}{*{6}{c}}[cell-space-top-limit=3pt]
@@ -1480,7 +1484,9 @@ doivent être séparés par des virgules).
\bigskip
$\triangleright$ Les coins sont Ă©galement pris en compte par les outils de
coloriage dans le |\CodeBefore|. Ces outils ne colorient pas les cases qui sont
-dans les coins (cf.~p.~\pageref{color-in-code-before}).
+dans les coins (cf.~p.~\pageref{color-in-code-before}). La commande
+|\TikzEveryCell| disponible dans le |\CodeAfter| et le |\CodeBefore| (cf.
+p.~\pageref{TikzEveryCell}). tient Ă©galement compte des coins.
\subsection{La commande \textbackslash diagbox}
@@ -2355,24 +2361,28 @@ concerné.\footnote{Pour le moment, cette clé n'est \emph{pas} disponible dans
On a alors accès aux commandes suivantes (les trois premières sont inspirées par
\pkg{colortbl} mais sont indépendantes de \pkg{colortbl}) :
\begin{itemize}
-\item |\cellcolor| qui colorie la case courante\footnote{NĂ©anmoins, cette
+\item \DefinitionCommande{cellcolor} qui colorie la case courante\footnote{NĂ©anmoins, cette
commande |\cellcolor| supprimera les espaces qui la suivent, ce que ne fait
pas la commande |\cellcolor| de \pkg{colortbl}.} ;
-\item |\rowcolor| à utiliser dans une case et qui colorie le reste de la rangée
-;
-\item |\columncolor| à utiliser dans le préambule du tableau de la même manière
-que la commande éponyme de \pkg{colortbl} (néanmoins, contrairement à la
-commande |\columncolor| de \pkg{colortbl}, celle de \pkg{nicematrix} peut
-apparaître à l'intérieur d'une autre commande, elle-même utilisée dans le
-préambule) ;
-\item |\rowcolors| qui prend pour arguments deux couleurs et colorie la suite du
-tableau avec ces deux couleurs ;
-\item |\rowlistcolors| qui prend pour argument une liste de couleurs et colorie
-la suite du tableau avec ces couleurs.\footnote{Quand la commande
- |\rowlistcolors| (ou la commande |\rowcolors|) est utilisée dans une case de
- la colonne~$j$, le coloriage ne s'applique que les colonnes au-delĂ  de~$j$ (Ă 
- dessein).}
+\item \DefinitionCommande{rowcolor} Ă  utiliser dans une case et qui colorie le
+reste de la rangée;\footnote{Si vous souhaitez une commande pour colorier les
+ $n$~rangées suivantes, considérez la commande |\RowStyle| et sa clé
+ |rowcolor|, p.~\pageref{RowStyle}}
+\item \DefinitionCommande{columncolor} à utiliser dans le préambule du tableau
+de la même manière que la commande éponyme de \pkg{colortbl} (néanmoins,
+contrairement Ă  la commande |\columncolor| de \pkg{colortbl}, celle de
+\pkg{nicematrix} peut apparaître à l'intérieur d'une autre commande, elle-même
+utilisée dans le préambule) ;
+\item \DefinitionCommande{rowcolors} qui prend pour arguments deux couleurs et
+colorie la suite du tableau avec ces deux couleurs ;
+\item \DefinitionCommande{rowlistcolors} qui prend pour argument une liste de
+couleurs et colorie la suite du tableau avec ces couleurs.\footnote{Quand la
+ commande |\rowlistcolors| (ou la commande |\rowcolors|) est utilisée dans une
+ case de la colonne~$j$, le coloriage ne s'applique que sur les colonnes
+ au-delĂ  de~$j$ (Ă  dessein).}
\end{itemize}
+Ces commandes sont compatibles avec les commandes pour les \emph{overlays} de
+Beamer (comme |\only|, etc.)
\medskip
\begin{Verbatim}
@@ -2406,6 +2416,45 @@ Dupont & Chantal & 15 janvier 1998 \\
\end{NiceTabular}
\end{center}
+\bigskip
+\colorbox{yellow!50}{\textbf{Nouveau 6.25}}\enskip Chaque utilisation de
+|\rowlistcolors| (et de |\rowcolors| qui en est un cas particulier) met un
+terme aux éventuels schémas\footnote{On a écrit \emph{schémas} au pluriel car on
+ peut avoir plusieurs schémas en cours s'ils portent sur des colonnes
+ différentes.} de coloriage en cours qui auraient été spécifiés par une
+commande |\rowlistcolors| précédente.
+
+En particulier, on peut engager un coloriage des rangées avec
+|\rowlistcolors{...}| et l'arrĂŞter par un |\rowlistcolors{}| avec argument vide.
+
+\bigskip
+\begin{BVerbatim}[boxwidth=10cm,baseline=c]
+\begin{NiceTabular}{c}[hvlines,color-inside]
+un \\
+deux \\
+~emphase#\rowlistcolors{red!15}@
+trois \\
+quatre \\
+cinq \\
+~emphase#\rowlistcolors{}@
+six \\
+sept \\
+\end{NiceTabular}
+\end{BVerbatim}
+\begin{NiceTabular}{c}[hvlines,color-inside]
+un \\
+deux \\
+\rowlistcolors{red!15}
+trois \\
+quatre \\
+cinq \\
+\rowlistcolors{}
+six \\
+sept \\
+\end{NiceTabular}
+
+
+
\section{La commande \textbackslash RowStyle}
\label{RowStyle}
@@ -2813,8 +2862,8 @@ préambule de spécification de colonne pour les éventuelles première et derni
colonne : ce sera automatiquement (et nécessairement) une colonne |r| pour la
première colonne et une colonne |l| pour la dernière.\footnote{Si on souhaite
une colonne extérieure avec un autre type d'alignement, on aura intérêt à
- considérer la commande |\SubMatrix| disponible dans le |\CodeAfter|
- (cf. p.~\pageref{sub-matrix}).}
+ considérer la commande |\SubMatrix| disponible dans le |\CodeAfter| et le
+ |\CodeBefore| (cf. p.~\pageref{sub-matrix}).}
\item On peut se demander comment \pkg{nicematrix} détermine le nombre de rangées et de colonnes nécessaires à la
composition de la «dernière rangée» et de la «dernière colonne».
@@ -3583,7 +3632,7 @@ a_{31} & a_{32} & a_{33}
\bigskip
Pour des constructions plus complexes, avec en particulier des délimiteurs ne
couvrant pas toutes les rangées, on aura intérêt à considérer la commande
-|\SubMatrix| disponible dans le |\CodeAfter|: voir la partie~\ref{sub-matrix},
+|\SubMatrix| disponible dans le |\CodeAfter| et le |\CodeBefore|: voir la partie~\ref{sub-matrix},
p.~\pageref{sub-matrix}.
@@ -4093,7 +4142,9 @@ $\begin{pNiceMatrix}
\index{SubMatrix@\texttt{\textbackslash TikzEveryCell} (commande du
\texttt{\textbackslash CodeAfter}\newline et du
\texttt{\textbackslash CodeBefore})|textbf}
-
+\label{TikzEveryCell}
+\index{empty (clé de \texttt{\textbackslash TikzEveryCell})}
+\index{non empty (clé de \texttt{\textbackslash TikzEveryCell})}
\colorbox{yellow!50}{\textbf{Nouveau 6.24}}\enskip La commande |\TikzEveryCell|
exécute avec TikZ le chemin rectangulaire qui correspond à chaque case du tableau,
@@ -4141,7 +4192,7 @@ l'argument de |\TikzEveryCell|.
\endgroup
-\medskip
+\bigskip
La commande |\TikzEveryCell| possède deux clés :
\begin{itemize}
\item avec la clé \Definition{empty}, la commande ne s'applique qu'aux cellules
@@ -6546,38 +6597,39 @@ avec l'environnement |{NiceMatrixBlock}| et l'option |auto-columns-width|.
\NiceMatrixOptions
{
light-syntax,
- last-col, code-for-last-col = \color{blue} \scriptstyle,
+ last-col, code-for-last-col = \color{blue}\scriptstyle,
+ vlines = 5 ,
+ matrix/columns-type = r
}
\setlength{\extrarowheight}{1mm}
-$\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 {} ;
3 -18 12 1 4 ;
-3 -46 29 -2 -15 ;
9 10 -5 4 7
-\end{pNiceArray}$
+\end{pNiceMatrix}$
\smallskip
-$\begin{pNiceArray}{rrrr|r}
-12 -8 7 5 3 ;
+\quad $\begin{pNiceMatrix}
+12 -8 7 5 3 ;
0 64 -41 1 19 { L_2 \gets L_1-4L_2 } ;
0 -192 123 -3 -57 { L_3 \gets L_1+4L_3 } ;
0 -64 41 -1 -19 { L_4 \gets 3L_1-4L_4 } ;
-\end{pNiceArray}$
+\end{pNiceMatrix}$
\smallskip
-$\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 ;
0 64 -41 1 19 ;
0 0 0 0 0 { L_3 \gets 3 L_2 + L_3 }
-\end{pNiceArray}$
+\end{pNiceMatrix}$
\smallskip
-$\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 {} ;
0 64 -41 1 19 ;
-\end{pNiceArray}$
-
+\end{pNiceMatrix}$
~emphase#\end{NiceMatrixBlock}@
\end{Verbatim}
@@ -6587,37 +6639,39 @@ $\begin{pNiceArray}{rrrr|r}
\NiceMatrixOptions
{
light-syntax,
- last-col, code-for-last-col = \color{blue} \scriptstyle ,
+ last-col, code-for-last-col = \color{blue}\scriptstyle,
+ vlines = 5 ,
+ matrix/columns-type = r
}
\setlength{\extrarowheight}{1mm}
-\quad $\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 {} ;
3 -18 12 1 4 ;
-3 -46 29 -2 -15 ;
9 10 -5 4 7
-\end{pNiceArray}$
+\end{pNiceMatrix}$
\smallskip
-\quad $\begin{pNiceArray}{rrrr|r}
-12 -8 7 5 3 ;
+\quad $\begin{pNiceMatrix}
+12 -8 7 5 3 ;
0 64 -41 1 19 { L_2 \gets L_1-4L_2 } ;
0 -192 123 -3 -57 { L_3 \gets L_1+4L_3 } ;
0 -64 41 -1 -19 { L_4 \gets 3L_1-4L_4 } ;
-\end{pNiceArray}$
+\end{pNiceMatrix}$
\smallskip
-\quad $\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 ;
0 64 -41 1 19 ;
0 0 0 0 0 { L_3 \gets 3 L_2 + L_3 }
-\end{pNiceArray}$\par\nobreak
+\end{pNiceMatrix}$
\smallskip
-\quad $\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 {} ;
0 64 -41 1 19 ;
-\end{pNiceArray}$
+\end{pNiceMatrix}$
\end{NiceMatrixBlock}
\medskip
@@ -6631,6 +6685,7 @@ largeur suivant leur taille.
Pour résoudre ce problème, on peut demander que les délimiteurs soient composés
avec leur largeur maximale grâce à la clé booléenne |delimiters/max-width|.
+
\begin{Verbatim}[formatcom=\small\color{gray}]
~emphase#\begin{NiceMatrixBlock}[auto-columns-width]@
\NiceMatrixOptions
@@ -6638,16 +6693,17 @@ avec leur largeur maximale grâce à la clé booléenne |delimiters/max-width|.
~emphase#delimiters/max-width@,
light-syntax,
last-col, code-for-last-col = \color{blue}\scriptstyle,
+ vlines = 5 ,
+ matrix/columns-type = r
}
\setlength{\extrarowheight}{1mm}
-$\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 {} ;
3 -18 12 1 4 ;
-3 -46 29 -2 -15 ;
9 10 -5 4 7
-\end{pNiceArray}$
-
+\end{pNiceMatrix}$
...
~emphase#\end{NiceMatrixBlock}@
\end{Verbatim}
@@ -6659,37 +6715,38 @@ $\begin{pNiceArray}{rrrr|r}
delimiters/max-width,
light-syntax,
last-col, code-for-last-col = \color{blue}\scriptstyle,
+ vlines = 5 ,
+ matrix/columns-type = r
}
\setlength{\extrarowheight}{1mm}
-\quad $\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 {} ;
3 -18 12 1 4 ;
-3 -46 29 -2 -15 ;
9 10 -5 4 7
-\end{pNiceArray}$
+\end{pNiceMatrix}$
\smallskip
-\quad $\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 ;
0 64 -41 1 19 { L_2 \gets L_1-4L_2 } ;
0 -192 123 -3 -57 { L_3 \gets L_1+4L_3 } ;
0 -64 41 -1 -19 { L_4 \gets 3L_1-4L_4 } ;
-\end{pNiceArray}$
+\end{pNiceMatrix}$
\smallskip
-\quad $\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 ;
0 64 -41 1 19 ;
0 0 0 0 0 { L_3 \gets 3 L_2 + L_3 }
-\end{pNiceArray}$
+\end{pNiceMatrix}$
\smallskip
-\quad $\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 {} ;
0 64 -41 1 19 ;
-\end{pNiceArray}$
-
+\end{pNiceMatrix}$
\end{NiceMatrixBlock}
diff --git a/macros/latex/contrib/nicematrix/nicematrix.pdf b/macros/latex/contrib/nicematrix/nicematrix.pdf
index 7865c622af..0184a263f7 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix.tex b/macros/latex/contrib/nicematrix/nicematrix.tex
index cec4b584ca..7eb1243f18 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.tex
+++ b/macros/latex/contrib/nicematrix/nicematrix.tex
@@ -53,6 +53,11 @@
\NewDocumentCommand{\Definition}{m}
{{\setlength{\fboxsep}{1pt}\colorbox{gray!20}{\ttfamily \vphantom{gl}#1}}}
+\NewDocumentCommand{\DefinitionCommand}{m}
+ {{\setlength{\fboxsep}{1pt}\colorbox{gray!20}{\ttfamily
+ \vphantom{gl}\textbackslash #1}}}
+
+
\usepackage{makeidx}
\makeindex
@@ -1434,7 +1439,9 @@ corners (designed by |NW|, |SW|, |NE| and |SE|).
\medskip
$\triangleright$ The corners are also taken into account by the tools provided
by \pkg{nicematrix} to color cells, rows and columns. These tools don't color
-the cells which are in the corners (cf.~p.~\pageref{color-in-code-before}).
+the cells which are in the corners (cf.~p.~\pageref{color-in-code-before}). The
+command |\TikzEveryCell| available in the |\CodeBefore| and the |\CodeAfter|
+(cf. p.~\pageref{TikzEveryCell}) takes also into account the empty corners.
\subsection{The command \textbackslash diagbox}
@@ -2291,24 +2298,28 @@ current environment.\footnote{Up to now, this key is \emph{not} available in |\N
There are several commands available (the first three ones are inspired by
\pkg{colortbl} but are \emph{independent} of \pkg{colortbl}):
\begin{itemize}
-\item |\cellcolor| which colorizes a cell;\footnote{However, this command
-|\cellcolor| will delete the following spaces, which does not the command
-|\cellcolor| of \pkg{colortbl}.}
-\item |\rowcolor| which must be used in a cell and which colorizes the end of
-the row;
-\item |\columncolor| which must be used in the preamble of the environment
-with the same syntax as the corresponding command of
-\pkg{colortbl} (however, unlike the command |\columncolor| of \pkg{colortbl},
-this command |\columncolor| can appear within another command, itself used in the
-preamble of the array);
-\item |\rowcolors| which takes in as arguments two colors and color the rest of
-the tabular with those colors;
-\item |\rowlistcolors| which takes in as argument a color and color the rest of
-the tabular with the colors of that list of colors.\footnote{When the command
- |\rowlistcolors| (or the command |\rowcolors| is used in a cell of the
- column~$j$ of the array, the command applies only on the columns above~$j$ (by
-design).}
+\item \DefinitionCommand{cellcolor} which colorizes a cell;\footnote{However,
+ this command cellcolor will delete the following spaces, which does not the
+ command cellcolor of \pkg{colortbl}.}
+\item \DefinitionCommand{rowcolor} which must be used in a cell and which
+colorizes the end of the row;\footnote{If you want a commande to color the
+ following $n$~rows, consider the command |\RowStyle| and its key |rowcolor|,
+ p.~\pageref{RowStyle}}
+\item \DefinitionCommand{columncolor} which must be used in the preamble of the
+environment with the same syntax as the corresponding command of \pkg{colortbl}
+(however, unlike the command columncolor of \pkg{colortbl}, this command
+|\columncolor| can appear within another command, itself used in the preamble of
+the array);
+\item \DefinitionCommand{rowcolors} which takes in as arguments two colors and
+color the rest of the tabular with those colors;
+\item \DefinitionCommand{rowlistcolors} which takes in as argument a color and
+color the rest of the tabular with the colors of that list of
+colors.\footnote{When the command |\rowlistcolors| (or the command |\rowcolors|
+ is used in a cell of the column~$j$ of the array, the command applies only on
+ the columns above~$j$ (by design).}
\end{itemize}
+These commands are compatible with the commands for the overlays of Beamer
+(|\only|, etc.)
\smallskip
\begin{Verbatim}
@@ -2342,6 +2353,43 @@ Dupont & Chantal & 15 janvier 1998 \\
\end{NiceTabular}
\end{center}
+\bigskip
+\colorbox{yellow!50}{\textbf{New 6.25}}\enskip Each use of the command
+|\rowlistcolors| (or |\rowcolors|, which is, in fact, a special case of
+|\rowlistcolors|) stops the potential coloring schemes\footnote{We say
+ \emph{schemes} in plural form because it's possible to start simultaneously
+ several coloring schemes if they apply on different columns.} specified by a
+previous command |\rowlistcolors|. In particular, it's possible to start
+coloring the rows with |\rowlistcolors{...}| and stop coloring by a command
+|\rowlistcolors| with an empty argument.
+
+\bigskip
+\begin{BVerbatim}[boxwidth=10cm,baseline=c]
+\begin{NiceTabular}{c}[hvlines,color-inside]
+one \\
+two \\
+~emphase#\rowlistcolors{red!15}@
+three \\
+four \\
+five \\
+~emphase#\rowlistcolors{}@
+six \\
+seven \\
+\end{NiceTabular}
+\end{BVerbatim}
+\begin{NiceTabular}{c}[hvlines,color-inside]
+one \\
+two \\
+\rowlistcolors{red!15}
+three \\
+four \\
+five \\
+\rowlistcolors{}
+six \\
+seven \\
+\end{NiceTabular}
+
+
\section{The command \textbackslash RowStyle}
\label{RowStyle}
@@ -2742,7 +2790,7 @@ the potential first column and the potential last column: they will
automatically (and necessarily) be of type |r| for the first column and |l|
for the last one.\footnote{The users wishing exterior columns with another
type of alignment should consider the command |\SubMatrix| available in the
-|\CodeAfter| (cf.~p.~\pageref{sub-matrix}).}
+|\CodeAfter| and in the |\CodeBefore| (cf.~p.~\pageref{sub-matrix}).}
\item One may wonder how \pkg{nicematrix} determines the number of rows and
columns which are needed for the composition of the ``last row'' and ``last
column''.
@@ -2831,8 +2879,8 @@ p.~\pageref{width}) doesn't apply to the ``first column'' and ``last column''.
\item For technical reasons, it's not possible to use the option of the
command |\\| after the ``first row'' or before the ``last row''. The placement
of the delimiters would be wrong. If you are looking for a workaround,
-consider the command |\SubMatrix| in the |\CodeAfter| described
-p.~\pageref{sub-matrix}.
+consider the command |\SubMatrix| in the |\CodeAfter| (and the |\CodeBefore|)
+described p.~\pageref{sub-matrix}.
\end{itemize}
@@ -3501,8 +3549,8 @@ a_{31} & a_{32} & a_{33}
\bigskip
For more complex constructions, in particular with delimiters spanning only a
\emph{subset} of the rows of the array, one should consider the command
-|\SubMatrix| available in the |\CodeAfter|. See the section~\ref{sub-matrix},
-p.~\pageref{sub-matrix}.
+|\SubMatrix| available in the |\CodeAfter| (and the |\CodeBefore|). See the
+section~\ref{sub-matrix}, p.~\pageref{sub-matrix}.
\section{The \textbackslash CodeAfter}
@@ -4008,7 +4056,9 @@ $\begin{pNiceMatrix}
\index{SubMatrix@\texttt{\textbackslash TikzEveryCell} (command of
\texttt{\textbackslash CodeAfter}\newline and
\texttt{\textbackslash CodeBefore})|textbf}
-
+\label{TikzEveryCell}
+\index{empty (key of \texttt{\textbackslash TikzEveryCell})}
+\index{non empty (key of \texttt{\textbackslash TikzEveryCell})}
\colorbox{yellow!50}{\textbf{New 6.24}}\enskip The command |\TikzEveryCell|
@@ -6407,82 +6457,86 @@ fix a width for all the columns. That's what is done in the following example
with the environment |{NiceMatrixBlock}| and its option |auto-columns-width|.
\begin{Verbatim}[formatcom=\small\color{gray}]
+\begin{Verbatim}[formatcom=\small\color{gray}]
~emphase#\begin{NiceMatrixBlock}[auto-columns-width]@
\NiceMatrixOptions
- {
+ {
light-syntax,
- last-col, code-for-last-col = \color{blue} \scriptstyle,
+ last-col, code-for-last-col = \color{blue}\scriptstyle,
+ vlines = 5 ,
+ matrix/columns-type = r
}
\setlength{\extrarowheight}{1mm}
-$\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 {} ;
3 -18 12 1 4 ;
-3 -46 29 -2 -15 ;
- 9 10 -5 4 7
-\end{pNiceArray}$
+ 9 10 -5 4 7
+\end{pNiceMatrix}$
\smallskip
-$\begin{pNiceArray}{rrrr|r}
-12 -8 7 5 3 ;
+\quad $\begin{pNiceMatrix}
+12 -8 7 5 3 ;
0 64 -41 1 19 { L_2 \gets L_1-4L_2 } ;
0 -192 123 -3 -57 { L_3 \gets L_1+4L_3 } ;
0 -64 41 -1 -19 { L_4 \gets 3L_1-4L_4 } ;
-\end{pNiceArray}$
+\end{pNiceMatrix}$
\smallskip
-$\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 ;
0 64 -41 1 19 ;
-0 0 0 0 0 { L_3 \gets 3 L_2 + L_3 }
-\end{pNiceArray}$
+0 0 0 0 0 { L_3 \gets 3 L_2 + L_3 }
+\end{pNiceMatrix}$
\smallskip
-$\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 {} ;
0 64 -41 1 19 ;
-\end{pNiceArray}$
-
+\end{pNiceMatrix}$
~emphase#\end{NiceMatrixBlock}@
\end{Verbatim}
-\bigskip
-\index{auto-columns-width!(key of \texttt{\{NiceMatrixBlock\}})|textit}
+\medskip
+\index{auto-columns-width!(clé de \texttt{\{NiceMatrixBlock\}})|textit}
\begin{NiceMatrixBlock}[auto-columns-width]
\NiceMatrixOptions
- {
+ {
light-syntax,
- last-col, code-for-last-col = \color{blue} \scriptstyle ,
+ last-col, code-for-last-col = \color{blue}\scriptstyle,
+ vlines = 5 ,
+ matrix/columns-type = r
}
\setlength{\extrarowheight}{1mm}
-\quad $\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 {} ;
3 -18 12 1 4 ;
-3 -46 29 -2 -15 ;
- 9 10 -5 4 7
-\end{pNiceArray}$
+ 9 10 -5 4 7
+\end{pNiceMatrix}$
\smallskip
-\quad $\begin{pNiceArray}{rrrr|r}
-12 -8 7 5 3 ;
+\quad $\begin{pNiceMatrix}
+12 -8 7 5 3 ;
0 64 -41 1 19 { L_2 \gets L_1-4L_2 } ;
0 -192 123 -3 -57 { L_3 \gets L_1+4L_3 } ;
0 -64 41 -1 -19 { L_4 \gets 3L_1-4L_4 } ;
-\end{pNiceArray}$
+\end{pNiceMatrix}$
\smallskip
-\quad $\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 ;
0 64 -41 1 19 ;
-0 0 0 0 0 { L_3 \gets 3 L_2 + L_3 }
-\end{pNiceArray}$\par\nobreak
+0 0 0 0 0 { L_3 \gets 3 L_2 + L_3 }
+\end{pNiceMatrix}$
\smallskip
-\quad $\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 {} ;
0 64 -41 1 19 ;
-\end{pNiceArray}$
+\end{pNiceMatrix}$
\end{NiceMatrixBlock}
\bigskip
@@ -6500,62 +6554,64 @@ composed with the maximal width, thanks to the boolean key
\begin{Verbatim}[formatcom=\small\color{gray}]
~emphase#\begin{NiceMatrixBlock}[auto-columns-width]@
\NiceMatrixOptions
- {
+ {
~emphase#delimiters/max-width@,
light-syntax,
last-col, code-for-last-col = \color{blue}\scriptstyle,
+ vlines = 5 ,
+ matrix/columns-type = r
}
\setlength{\extrarowheight}{1mm}
-$\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 {} ;
3 -18 12 1 4 ;
-3 -46 29 -2 -15 ;
- 9 10 -5 4 7
-\end{pNiceArray}$
-
+ 9 10 -5 4 7
+\end{pNiceMatrix}$
...
~emphase#\end{NiceMatrixBlock}@
\end{Verbatim}
-\bigskip
+\medskip
\begin{NiceMatrixBlock}[auto-columns-width]
\NiceMatrixOptions
- {
+ {
delimiters/max-width,
light-syntax,
last-col, code-for-last-col = \color{blue}\scriptstyle,
+ vlines = 5 ,
+ matrix/columns-type = r
}
\setlength{\extrarowheight}{1mm}
-\quad $\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 {} ;
3 -18 12 1 4 ;
-3 -46 29 -2 -15 ;
- 9 10 -5 4 7
-\end{pNiceArray}$
+ 9 10 -5 4 7
+\end{pNiceMatrix}$
\smallskip
-\quad $\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 ;
0 64 -41 1 19 { L_2 \gets L_1-4L_2 } ;
0 -192 123 -3 -57 { L_3 \gets L_1+4L_3 } ;
0 -64 41 -1 -19 { L_4 \gets 3L_1-4L_4 } ;
-\end{pNiceArray}$
+\end{pNiceMatrix}$
\smallskip
-\quad $\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 ;
0 64 -41 1 19 ;
-0 0 0 0 0 { L_3 \gets 3 L_2 + L_3 }
-\end{pNiceArray}$\par\nobreak
+0 0 0 0 0 { L_3 \gets 3 L_2 + L_3 }
+\end{pNiceMatrix}$
\smallskip
-\quad $\begin{pNiceArray}{rrrr|r}
+\quad $\begin{pNiceMatrix}
12 -8 7 5 3 {} ;
0 64 -41 1 19 ;
-\end{pNiceArray}$
-
+\end{pNiceMatrix}$
\end{NiceMatrixBlock}
@@ -7062,6 +7118,13 @@ The successive versions of the file |nicematrix.sty| provided by TeXLive are ava
\nolinkurl{https:www.tug.org/svn/texlive/trunk/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty}
}
+\subsection*{Changes between version 6.24 and 6.25}
+
+Correction of several bugs.
+
+An instruction |\rowlistcolors| in the tabular stops the effect of a previous
+|\rowlistcolors|.
+
\subsection*{Changes between version 6.23 and 6.24}
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index 835982e89e..4dd692e4a7 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,3 +1,7 @@
+2023-10-24 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (latex.4ht): make the \@wrindex command robust.
+
2023-10-20 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (tcolorbox.4ht),
diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index 577a1f2e9b..4a3036cffd 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1396 2023-10-20 16:07:23Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1397 2023-10-24 19:39:36Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2023 TeX Users Group
@@ -12847,7 +12847,7 @@ the meaning of \''\chat`\#'.
\let\a:wrindex\empty
\expandafter\ifx \csname @indexfile\endcsname\relax \else
\let\o:wrindex:|=\@wrindex
- \def\@wrindex{\a:wrindex \o:wrindex:}
+ \DeclareRobustCommand\@wrindex{\a:wrindex \o:wrindex:}
\Configure{wrindex}
{|<control @|>\warn:idx{\jobname}%
\:wribefr\@indexfile}
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index e61b2ad88e..882694b4cf 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -47,8 +47,8 @@ $mirrors = {
},
'Korea' => {
'http://ftp.ktug.org/tex-archive/' => 1,
- 'https://cran.asia/tex/' => 1,
'https://ftp.kaist.ac.kr/pub/tex-archive/' => 1,
+ 'https://lab.uklee.pe.kr/tex-archive/' => 1,
'https://mirror.kakao.com/CTAN/' => 1,
'https://mirror.navercorp.com/CTAN/' => 1,
},
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 3af4f7b160..c2a2e9d0d3 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,7 +26,7 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2023
-depend revision/68623
+depend revision/68640
name 00texlive.image
category TLCore
@@ -4794,7 +4794,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 68623
+revision 68626
shortdesc TeX Live standalone installer package
longdesc This package defines the files to go into the installer
longdesc archives (install-tl-unx.tar.gz, install-tl.zip) built by the
@@ -8937,16 +8937,16 @@ catalogue-version 3.13f
name acmart
category Package
-revision 68624
+revision 68628
shortdesc Class for typesetting publications of ACM
relocated 1
longdesc This package provides a class for typesetting publications of
longdesc the Association for Computing Machinery (ACM).
-containersize 43084
-containerchecksum bee99e6ab38e65600ea68f56077081c49da3f327e2103c6010dc9b381f2c6efd292a7aa08251f1f4883f9937c6007e927f9873d743b58a83ac7a62bf72d0ee22
-doccontainersize 4855488
-doccontainerchecksum 2131bd5a175afe72483c7f77280eae37c83ee22cfa00bebd7b8e3576f7c2562ae842c5f8703eb7a2eeb62b87a7e7cbc5433a0db235fba9122834d7bb5fa87b7b
-docfiles size=3454
+containersize 43120
+containerchecksum 783294a6a72b88f5ef502feaf99d984d3f2a34c0f467e044354a86a75482ef939d2394483efdd82fee056a0976e1f3e30feacaa6cdf5ae2a08b0e678467ef853
+doccontainersize 4888672
+doccontainerchecksum 5d286fe018a35126e59a85bca7c539622bb3122fa8160bf120b400513b3c5b12fa788527de58bb7ad319c09b0aa7807a70643c81c2a74e7b8013e232c5dff935
+docfiles size=3462
RELOC/doc/latex/acmart/README details="Readme"
RELOC/doc/latex/acmart/acm-jdslogo.png
RELOC/doc/latex/acmart/acmart.bib
@@ -8991,8 +8991,8 @@ docfiles size=3454
RELOC/doc/latex/acmart/samples/samples.ins
RELOC/doc/latex/acmart/samples/sampleteaser.pdf
RELOC/doc/latex/acmart/samples/software.bib
-srccontainersize 62368
-srccontainerchecksum 4d688c8750ac927e291da2051a470aeeabac74347e89029fb7bf3169db7f08531114da2256f07a3bfbd7c988c94574c33509b957394ca63d6f8f8d9521c2f50d
+srccontainersize 62408
+srccontainerchecksum 928e396a732da37ebf7862d15c42792afd644ba7574b6bffdb7641beab13342b079de60cf22a2c0740ef7a3ced8eba6d21c08dfdf5c52e4b5ae138c1b55fd8ce
srcfiles size=74
RELOC/source/latex/acmart/Makefile
RELOC/source/latex/acmart/acmart.dtx
@@ -25115,7 +25115,7 @@ catalogue-version 1.35
name asmejour
category Package
-revision 68624
+revision 68629
shortdesc A template for ASME journal papers
relocated 1
longdesc The asmejour class provides a template to format preprints
@@ -25130,11 +25130,11 @@ longdesc column balancing, various math options, government copyright,
longdesc and archivability (PDF/A). The class is compatible with
longdesc pdfLaTeX or LuaLaTeX. This package is not a publication of
longdesc ASME.
-containersize 22832
-containerchecksum e51234c535f96e51936befd115b7e3ab29fc0326a7cfb88303fd131490427677e9691fdd93afab935ad96d31ec81b17015c53e69037dd473d82ee8551a247f60
-doccontainersize 1824200
-doccontainerchecksum 3950547a47a91c3b5ba78cdb82aa57ee81d7a56802a31c30c980a940ec7a35f6b8730760bad823e3a31705b7cc730b748fbe86b5cbb3a35711d71b4201aa423a
-docfiles size=1570
+containersize 23460
+containerchecksum a2c37b69e147b7174335faa13522e00a2decf12f6a0fff45c6074c27299a5f71b80181d81265a1ddc7169e2f7652f60250e94222dcef1423de98ec30576aed62
+doccontainersize 1834616
+doccontainerchecksum 1a788cf31b7ef2a1cbf0a7d439b36ad80c786f4719a6d6138120d4fbf22208fc151300774da5718389fe22e0dea83fc8d9b41f0e96b1bb7426d0feab38b2e4ea
+docfiles size=1573
RELOC/doc/latex/asmejour/README.md details="Readme"
RELOC/doc/latex/asmejour/asmejour-sample.bib
RELOC/doc/latex/asmejour/asmejour-template.pdf details="Example of use"
@@ -25147,7 +25147,7 @@ docfiles size=1570
RELOC/doc/latex/asmejour/sample-figure-1.pdf
RELOC/doc/latex/asmejour/sample-figure-2a.pdf
RELOC/doc/latex/asmejour/sample-figure-2b.pdf
-runfiles size=23
+runfiles size=24
RELOC/bibtex/bst/asmejour/asmejour.bst
RELOC/tex/latex/asmejour/asmejour.cls
catalogue-ctan /macros/latex/contrib/asmejour
@@ -42668,24 +42668,24 @@ catalogue-version 0.1
name bithesis
category Package
-revision 68624
+revision 68634
shortdesc Templates for the Beijing Institute of Technology
relocated 1
longdesc This package establishes a simple and easy-to-use LaTeX
longdesc template for Beijing Institute of Technology dissertations,
longdesc including general undergraduate theses and master theses.
-containersize 18964
-containerchecksum 2426911ef942d3a355d77419b743ae9c1aead5dbc46f719bfff1cb00c3a63a153ad7df4ce0f73890d46669931438a2454de866779e07981092fe312900e0b209
-doccontainersize 556348
-doccontainerchecksum d17e31ade8071c0fba3aed0af2523359e3415896b3389fb1af8ee046212ec0b790d60e47e6f500c5feb47a9f5dfacaf07869d4c1eca6f73c27118706e1769bd7
-docfiles size=142
+containersize 19120
+containerchecksum 617142849910c69e2986f1c685aa09f29375b83197dc6d964a887b50bc495f9501d578b6b7b3d2a6e78613a34b994a11f1160590e660a65e748c42504866ae1d
+doccontainersize 732260
+doccontainerchecksum 6d5a915b04a096b1f5a9d9b9ed7bab9ae9e69886c3553778d5db07cbf8d2f0c183f2b86b1df0d2cb752368f192bf5e9252ad4c07071625659dca052c12ddcb25
+docfiles size=185
RELOC/doc/latex/bithesis/README.md details="Readme"
RELOC/doc/latex/bithesis/bithesis.pdf details="Package documentation" language="zh"
RELOC/doc/latex/bithesis/contributing-zh.md
RELOC/doc/latex/bithesis/contributing.md
RELOC/doc/latex/bithesis/dtx-style.sty
-srccontainersize 25644
-srccontainerchecksum 8b9db038f650d829f182a812db9090690aa013911abc0046abfef572958bf9c641aac1d2bbb4c706ac900bce5c7e43b0883b38c84a747e7827d8528ca56f70c4
+srccontainersize 25812
+srccontainerchecksum 8cef46e7e72dcc829ed8c9df27f6411b1b51a4fd3792a3d56479911ceb0e3197179a6e901beb49d4f91acdd5ac400881254c59a8162aaedded260b340cbb422f
srcfiles size=32
RELOC/source/latex/bithesis/bithesis.dtx
RELOC/source/latex/bithesis/bithesis.ins
@@ -88959,29 +88959,29 @@ catalogue-version 1.1
name customenvs
category Package
-revision 68620
+revision 68637
shortdesc Custom environments (MCQ, list with picked items, ...)
relocated 1
longdesc The package provides some custom environments (Multiple Choice,
longdesc list with chosen items, ...) based on existing environments.
-containersize 3176
-containerchecksum f5f072b279850f9f5d3ffcc5dd9851087b497d43dfacde846528aa52d1bee8243540e84ba7727fc83f77fed3fc1486663970badcbd906a250e0172cd7917db39
-doccontainersize 300124
-doccontainerchecksum 2f9e76feea93fd0747e828882efc6fd3c6edc478e870064c54a7d729d3cd7f135f870522475ffc764414d66322795671fd6eb91835daa852d9b0fb074d42e351
-docfiles size=83
+containersize 4564
+containerchecksum d58a216909f8bf7c425f0836c05842ca918b03b928a57ab06223a82fa588a3bd3d515f6beb5ed27330d5566192a234a08385ac387563db8ad171b928749b488c
+doccontainersize 418652
+doccontainerchecksum d807f71f40367888621fefb52ff3fbba1d5b301b670710461b0feb79eb61171ec6208de41ea15ab39c14650734f2ba6a2c5f89182f27072c87c9564fa462544a
+docfiles size=113
RELOC/doc/latex/customenvs/README.md details="Readme"
RELOC/doc/latex/customenvs/customenvs-doc-en.pdf details="Package documentation (English)"
RELOC/doc/latex/customenvs/customenvs-doc-en.tex
RELOC/doc/latex/customenvs/customenvs-doc-fr.pdf details="Package documentation (French)" language="fr"
RELOC/doc/latex/customenvs/customenvs-doc-fr.tex
-runfiles size=4
+runfiles size=7
RELOC/tex/latex/customenvs/customenvs.sty
catalogue-contact-bugs https://github.com/cpierquet/customenvs/issues
catalogue-contact-repository https://github.com/cpierquet/customenvs
catalogue-ctan /macros/latex/contrib/customenvs
catalogue-license lppl1.3c
catalogue-topics list table
-catalogue-version 0.1.0
+catalogue-version 0.1.1
name cutwin
category Package
@@ -143737,7 +143737,7 @@ catalogue-topics float
name hereapplies
category Package
-revision 65251
+revision 68638
shortdesc A LaTeX package for referencing groups of pages that share something in common
relocated 1
longdesc Here Applies is a LaTeX package that allows to collect groups
@@ -143745,10 +143745,10 @@ longdesc of labels and reference them altogether. It can be used for
longdesc creating informal glossaries that cross-link concepts to their
longdesc applications, or simply mentioning multiple pages that share
longdesc something in common.
-containersize 5332
-containerchecksum b89cf4ffd5299939b681a91acb6e06c6185bbca2077677aa551e3d5ae2463f823293fced819f242cee8806000009a47baaf5375aa4487568ad229a81208eee6e
-doccontainersize 421600
-doccontainerchecksum e55430f11a776d57c0ff022d11317986d454fcd1101a6df73afcb4c4b7f3782d1383a198d024e56ccf3950187017590e81128ca5a7e91247ae2e90271a4cd91d
+containersize 5340
+containerchecksum b796f6f276bd9cdea0f469482c96aa42956417c544647df201a8dfecfc5041b726a1ea1084a51b392b6f71b3172961689cce0cc7be63c146ba7edc3dc8bcac35
+doccontainersize 423736
+doccontainerchecksum 185798c65981f2d09b5c49ac3bfcca8763ca929399a9f534316ee8345f5550a437be10dd39bc886febc5d9de4156c0642c125ca2a033d129479c9cf98bc885c6
docfiles size=126
RELOC/doc/latex/hereapplies/COPYING
RELOC/doc/latex/hereapplies/ChangeLog.md
@@ -143770,7 +143770,7 @@ catalogue-contact-repository https://github.com/madmurphy/hereapplies.sty
catalogue-ctan /macros/latex/contrib/hereapplies
catalogue-license gpl3+
catalogue-topics label-ref
-catalogue-version 1.0.1
+catalogue-version 1.0.2
name heros-otf
category Package
@@ -147168,7 +147168,7 @@ catalogue-version 1.0b
name hyperref
category Package
-revision 68624
+revision 68630
shortdesc Extensive support for hypertext in LaTeX
relocated 1
longdesc The hyperref package is used to handle cross-referencing
@@ -147198,11 +147198,11 @@ depend rerunfilecheck
depend stringenc
depend url
depend zapfding
-containersize 90484
-containerchecksum c7acc5c32d23222ef36290dde1254bf478af1ff9b87cb9d85c42488f0d62ee24c058beb485af08de5508e05d6542d466bc9dd215301117439079daea29fef7f9
-doccontainersize 3675076
-doccontainerchecksum 4484aeb85a30cd7a7cfaf3737773903a5aab814cae55246546230761075976f5671de5ee39b3de5fed1a8c2cac2fa5da6753714b05aaebc3dca0781f2cb55def
-docfiles size=1198
+containersize 90912
+containerchecksum e79b5f0e7d1bfd398e448e0ae741e1f0cebbf0d637b5ecb59911b15a412b5aead0cce5df472e9c610e4ebe4e7c8beb409c5dc1c0a4f7c6ed2230018214a2e7be
+doccontainersize 3309220
+doccontainerchecksum ffc4b7b28c00e4c55f23762ba29206db2eee1344b43359d8a58eb0a37ca1e55937476813b8303b5edab6397af9e7ef47bfe69f6e1a837de2f08acd6a2f37460c
+docfiles size=1073
RELOC/doc/latex/hyperref/ChangeLog.txt
RELOC/doc/latex/hyperref/README.md details="Readme"
RELOC/doc/latex/hyperref/backref.pdf
@@ -147217,15 +147217,14 @@ docfiles size=1198
RELOC/doc/latex/hyperref/hyperref-doc6.html
RELOC/doc/latex/hyperref/hyperref-doc7.html
RELOC/doc/latex/hyperref/hyperref-doc8.html
+ RELOC/doc/latex/hyperref/hyperref-doc9.html
RELOC/doc/latex/hyperref/hyperref-linktarget.pdf
RELOC/doc/latex/hyperref/hyperref.pdf
RELOC/doc/latex/hyperref/manifest.txt
RELOC/doc/latex/hyperref/nameref.pdf
- RELOC/doc/latex/hyperref/paper.pdf
- RELOC/doc/latex/hyperref/slides.pdf
-srccontainersize 414292
-srccontainerchecksum e581422673021e898865752acd54367b1860ab6aaf7d87f3031e90b9adb5781b899df24a7c4fd81e16122ed553d344d03c81678885b3cefdf2d33da1c3bf7ccb
-srcfiles size=312
+srccontainersize 414588
+srccontainerchecksum c155508515678b7419d68934951f783aaf66e9b07a0d4861262f0b2cb35fef1d4e7eeb53cb29773524234a0e7d9a66949ff1919fbc65fcad3c511ec9f2bf2cb1
+srcfiles size=313
RELOC/source/latex/hyperref/backref.dtx
RELOC/source/latex/hyperref/bmhydoc.sty
RELOC/source/latex/hyperref/doc/paperslides99.zip
@@ -172606,7 +172605,7 @@ catalogue-version 1.1
name l3backend
category Package
-revision 68507
+revision 68631
shortdesc LaTeX3 backend drivers
relocated 1
longdesc This package forms parts of expl3, and contains the code used
@@ -172616,16 +172615,16 @@ longdesc engine in use. As such, these are distributed separately from
longdesc l3kernel to allow this code to be updated on an independent
longdesc schedule.
containersize 16220
-containerchecksum a6bac05976b5b98bec7e269063489e088f2a91da518d9e01b8c3a5e2df12450e0a5afb59bd5809bdfaf4d6ead63191a4bcc2444dc19ad1dd4831f1bfb1119e3e
+containerchecksum 47abea059ac387cf581082116e62f15f1f1b05172886e8caf313d4971259d00959b6c660f46d5b84825f9ae60d16b948f07216abdebf351577292a286e2e9124
doccontainersize 889136
-doccontainerchecksum ea1dc29903ce48d8b13aaeef756cfe6d47be62f941bbecdf3b74b9f619a9071bab39b027d7e5b26a51a8af358870e2439432129a876ed04fd89437a46eef4d15
+doccontainerchecksum d8a0f3831193b39d081f3b1eb1bad7494f87d24ba441115ca487f37ddbf80038db6483e6c01539e78883b73d335584c042a3c9d897c4fd8325c593b124967e33
docfiles size=234
RELOC/doc/latex/l3backend/CHANGELOG.md
RELOC/doc/latex/l3backend/README.md details="Readme"
RELOC/doc/latex/l3backend/l3backend-code.pdf details="Package documentation"
RELOC/doc/latex/l3backend/l3backend-code.tex
-srccontainersize 33852
-srccontainerchecksum 7cc95857d9ac06b467d1dec5a455e868d476f4d5dde19ed30cfa0cf1e4a459538c1a53b45bd83d9c7dbfe104bebcf9bfcf16bbd0adf4d055afd18018b22b3661
+srccontainersize 33840
+srccontainerchecksum 99b4443f206f62f478386d9ac9fc035e2f77972982136b6f1111984461634c977531ba0673203b606a6dfeed7c92134ee2f13bb4ff46e89d69dd8949732044b6
srcfiles size=58
RELOC/source/latex/l3backend/l3backend-basics.dtx
RELOC/source/latex/l3backend/l3backend-box.dtx
@@ -172933,7 +172932,7 @@ catalogue-topics macro-supp layout latex3 pre-release
name l3kernel
category Package
-revision 68507
+revision 68632
shortdesc LaTeX3 programming conventions
relocated 1
longdesc The l3kernel bundle provides an implementation of the LaTeX3
@@ -172943,11 +172942,11 @@ longdesc LaTeX3 kernel and other future code are built: it is an API for
longdesc TeX programmers. The packages are set up so that the LaTeX3
longdesc conventions can be used with regular LaTeX2e packages.
depend l3backend
-containersize 174520
-containerchecksum 2b24f6ef3faeba28fe04aa6850eb92c2936b657bf2c598407b58ea3f239370c97ead89e3b7c4f232ed350f143bcf3200066baf91aebeffb168b0fe6680dc7f64
-doccontainersize 12036152
-doccontainerchecksum 653057383739abf912d8e54f7a20fbb410872a54e3f769e900a32fafae4f45eea33631d7e56ed2d30b0906e59892aed6530eb32eb27fdf4df5f136f3e6cf3101
-docfiles size=3431
+containersize 176760
+containerchecksum ca31909f00e87e934e8b581839ae222120ab69ba7ce88e0660751b799bc5948b5a434cd2e3a6f0aac94e654256dcc39fbcd7f85866889c0a5d7621c5f486d0f8
+doccontainersize 12117468
+doccontainerchecksum ab29a5f868319ef39e872d57eb5558789c34e43c8bf4ab75b731996dcc48474eaafc90f60f2a59b47d6298025e1dc0860d3a93823e00c1575e0ba8ff73c7c694
+docfiles size=3456
RELOC/doc/latex/l3kernel/CHANGELOG.md
RELOC/doc/latex/l3kernel/README.md details="Readme"
RELOC/doc/latex/l3kernel/expl3.pdf details="The LaTeX3 Programming Language"
@@ -172994,9 +172993,9 @@ docfiles size=3431
RELOC/doc/latex/l3kernel/source3.pdf
RELOC/doc/latex/l3kernel/source3.tex
RELOC/doc/latex/l3kernel/source3body.tex
-srccontainersize 600376
-srccontainerchecksum 24fcdb71aa4ef4f57e9e01a244982086b4cc4aaa73737fff6cce7b25d2832051609b6be791187f4ed6d886c8d9048f7482380ef18d2059a31385a256a431cc8d
-srcfiles size=927
+srccontainersize 606308
+srccontainerchecksum be9ed9e048d44e1cdc7c72e52992bb1eb50c97f042b43605f6c6b52cbfce8b3b1ebfb0c8837b06cc53b9dc4dc07e40136c1a563246eda827ee01e37574969135
+srcfiles size=936
RELOC/source/latex/l3kernel/expl3.dtx
RELOC/source/latex/l3kernel/l3.ins
RELOC/source/latex/l3kernel/l3basics.dtx
@@ -173020,12 +173019,15 @@ srcfiles size=927
RELOC/source/latex/l3kernel/l3fp-convert.dtx
RELOC/source/latex/l3kernel/l3fp-expo.dtx
RELOC/source/latex/l3kernel/l3fp-extended.dtx
+ RELOC/source/latex/l3kernel/l3fp-functions.dtx
RELOC/source/latex/l3kernel/l3fp-logic.dtx
RELOC/source/latex/l3kernel/l3fp-parse.dtx
RELOC/source/latex/l3kernel/l3fp-random.dtx
RELOC/source/latex/l3kernel/l3fp-round.dtx
+ RELOC/source/latex/l3kernel/l3fp-symbolic.dtx
RELOC/source/latex/l3kernel/l3fp-traps.dtx
RELOC/source/latex/l3kernel/l3fp-trig.dtx
+ RELOC/source/latex/l3kernel/l3fp-types.dtx
RELOC/source/latex/l3kernel/l3fp.dtx
RELOC/source/latex/l3kernel/l3fparray.dtx
RELOC/source/latex/l3kernel/l3int.dtx
@@ -173055,7 +173057,7 @@ srcfiles size=927
RELOC/source/latex/l3kernel/l3tl.dtx
RELOC/source/latex/l3kernel/l3token.dtx
RELOC/source/latex/l3kernel/l3unicode.dtx
-runfiles size=355
+runfiles size=360
RELOC/tex/latex/l3kernel/expl3-code.tex
RELOC/tex/latex/l3kernel/expl3-generic.tex
RELOC/tex/latex/l3kernel/expl3.ltx
@@ -177177,16 +177179,16 @@ catalogue-version 0.7
name latex-via-exemplos
category Package
-revision 68624
+revision 68627
shortdesc A LaTeX course written in brazilian portuguese language
relocated 1
longdesc This is a LaTeX2e course written in brazilian portuguese
longdesc language.
containersize 404
-containerchecksum cafec287e11bbd4af78db2763ac7138c718dd0ee870ccb44217fb9c091adfc6816ce62b19c2da78d726d2a38370ade63cd295846cc733ad8eb9df2c4ac71ab30
-doccontainersize 2348576
-doccontainerchecksum ee3bf300433c68bac3ef8aca708ca85ce75314202273b5cb906f75c0f38044472aaa90b1353536db8884501df91a98c4085a69d530fc59f1f27f604467430c98
-docfiles size=825
+containerchecksum d98f99d1da5b8192cfd824829ec31f09f3178b0682885e5f497203c6f3f73bedc0a4f0a766ccde2f4f8a0e68b231f4d1213b3586fd1093588f3a9312716f072d
+doccontainersize 2396636
+doccontainerchecksum 605dba889bfa1ad23b2990b2f0f40db42947b718cd272d8f61243818d40ad9a552fb61f87ff4e3844e580d3acaaa9842c2484c62c5c5dfb4450755db3fb02758
+docfiles size=842
RELOC/doc/latex/latex-via-exemplos/README.md details="Readme"
RELOC/doc/latex/latex-via-exemplos/changelog.txt
RELOC/doc/latex/latex-via-exemplos/latex-via-exemplos-certificado.tex
@@ -225647,7 +225649,7 @@ catalogue-version 0.54
name newpx
category Package
-revision 68388
+revision 68635
shortdesc Alternative uses of the PX fonts, with improved metrics
relocated 1
longdesc This package, initially based on pxfonts, provides many fixes
@@ -225658,23 +225660,24 @@ longdesc options. For proper operation, the packages require that the
longdesc packages newtxmath, pxfonts, and TeXGyrePagella be installed
longdesc and their map files enabled.
execute addMap newpx.map
-containersize 4750992
-containerchecksum a354580952c66fc7cd11a3c652557481bd0be047eada84abbadb5c22b8098b50e902e5c4f759ba74938ef43f113a976c872def0a276d9c7764c3ff10a60de02d
-doccontainersize 456044
-doccontainerchecksum abe49017faef01e794f346488df7fca25b5b8572e03bf6e5705412ed3592e0808eba9bb6bda5ee79fd1f4fa8a35bd982f9bc47bb1746d7c57e72972f9993f08f
-docfiles size=134
+containersize 4729012
+containerchecksum 2a5e7942775cdad80480681204aeb0a803155710dd234089bf9b8b2d33937cb898dd60ad55bb0dd2700e35c5933ad7b6a9cb98a83270a57f1344a28b7bfb6d0a
+doccontainersize 466280
+doccontainerchecksum 8a3ec9c6f3b6898e30181d4af98d3e8f20313d208c2665f1136d63e3bd3caf9fa175367d719fe2e8a3006a0d4e427323a8f2c9ec5626d8357e78761aea551f99
+docfiles size=142
RELOC/doc/fonts/newpx/ChangesInV1.4.txt
RELOC/doc/fonts/newpx/MANIFEST-newpx.txt
RELOC/doc/fonts/newpx/README details="Readme"
+ RELOC/doc/fonts/newpx/footsnippet-crop.pdf
RELOC/doc/fonts/newpx/newpxdoc.pdf details="Package documentation"
RELOC/doc/fonts/newpx/newpxdoc.tex
RELOC/doc/fonts/newpx/newpxeg-crop.pdf
RELOC/doc/fonts/newpx/pxfontseg-crop.pdf
srccontainersize 392
-srccontainerchecksum 35e6c46e3ba2ad22822927d1a76f8aacf858faa80d9d93b83b425c11a7e9296185047187acbf08f0b26b6f4e7ee8fe285419bd8f7a08f5a0a1aa7649bbf8d18a
+srccontainerchecksum cb30a1c1639ad09f4379803505206989de3fd28a1c9944128a1fdf5234816a1ed494adfafe5cf6b676d811a91b8b2b482b76ea3f15cdb5185f0ca225ab60e41c
srcfiles size=1
RELOC/source/fonts/newpx/TRK.fea
-runfiles size=3686
+runfiles size=3695
RELOC/fonts/afm/public/newpx/NewPXBMI.afm
RELOC/fonts/afm/public/newpx/NewPXBMI_gnu.afm
RELOC/fonts/afm/public/newpx/NewPXMI.afm
@@ -226074,6 +226077,10 @@ runfiles size=3686
RELOC/fonts/tfm/public/newpx/zplsups-BoldItalic-ot1.tfm
RELOC/fonts/tfm/public/newpx/zplsups-BoldItalic-t1.tfm
RELOC/fonts/tfm/public/newpx/zplsups-BoldItalic-ts1.tfm
+ RELOC/fonts/tfm/public/newpx/zplsups-BoldSlanted-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/zplsups-BoldSlanted-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/zplsups-BoldSlanted-t1.tfm
+ RELOC/fonts/tfm/public/newpx/zplsups-BoldSlanted-ts1.tfm
RELOC/fonts/tfm/public/newpx/zplsups-Italic-ly1.tfm
RELOC/fonts/tfm/public/newpx/zplsups-Italic-ot1.tfm
RELOC/fonts/tfm/public/newpx/zplsups-Italic-t1.tfm
@@ -226082,6 +226089,10 @@ runfiles size=3686
RELOC/fonts/tfm/public/newpx/zplsups-Regular-ot1.tfm
RELOC/fonts/tfm/public/newpx/zplsups-Regular-t1.tfm
RELOC/fonts/tfm/public/newpx/zplsups-Regular-ts1.tfm
+ RELOC/fonts/tfm/public/newpx/zplsups-Slanted-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/zplsups-Slanted-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/zplsups-Slanted-t1.tfm
+ RELOC/fonts/tfm/public/newpx/zplsups-Slanted-ts1.tfm
RELOC/fonts/tfm/public/newpx/zplsy.tfm
RELOC/fonts/tfm/public/newpx/zplsyc.tfm
RELOC/fonts/tfm/public/newpx/zplsym.tfm
@@ -226253,6 +226264,8 @@ runfiles size=3686
RELOC/tex/latex/newpx/newpx.sty
RELOC/tex/latex/newpx/newpxmath.sty
RELOC/tex/latex/newpx/newpxtext.sty
+ RELOC/tex/latex/newpx/newpxtext1.sty
+ RELOC/tex/latex/newpx/newpxtextX.sty
RELOC/tex/latex/newpx/omlnpxmi.fd
RELOC/tex/latex/newpx/ot1minzpl.fd
RELOC/tex/latex/newpx/ot1npxtt.fd
@@ -226299,7 +226312,7 @@ runfiles size=3686
catalogue-ctan /fonts/newpx
catalogue-license lppl ofl
catalogue-topics font font-body font-maths font-serif font-proportional font-type1 font-otf font-supp font-t1enc
-catalogue-version 1.522
+catalogue-version 1.53
name newsletr
category Package
@@ -227880,7 +227893,7 @@ catalogue-topics font font-type1 font-decor
name nicematrix
category Package
-revision 68398
+revision 68639
shortdesc Improve the typesetting of mathematical matrices with PGF
relocated 1
longdesc This package is based on the package array. It creates PGF/TikZ
@@ -227892,28 +227905,28 @@ longdesc border matrices); control of the width of the columns; tools to
longdesc color rows and columns with a good PDF result; blocks of cells;
longdesc tabular notes; etc. The package requires and loads l3keys2e,
longdesc array, amsmath, pgfcore, and the module shapes of PGF.
-containersize 40940
-containerchecksum 9bbbb2d0ea3cec6f27751365d336f122c8a047a1cc2f688d34803e688ae3c7e18254e537382ec877457f4f2a4e17ce553c12a5642882e521f30b4e1acefadb0b
-doccontainersize 2145880
-doccontainerchecksum b07ed15f1c707521cd194212d413098a72d1bf6feba8df2ecfb6802d893f28c669a088466d269076a1dcb1313c3c1e02a9cfdbcb69d674ad74436d36429e7b63
-docfiles size=649
+containersize 41520
+containerchecksum 4134a263ff139b43cbcfa12f05c83f7175c81f55ad500b966d01e56576526f8438b3b2fbc57d8e663813effa1a1e3ee54d19104b12904187d781dfaa37e5590c
+doccontainersize 2165920
+doccontainerchecksum a1e4e6fcb4c8ee523fa5125a00b09332707f1469dcdac064a30a40aa091e656b1fc5039f5eb0a8b9dd2569785cabc84e023956e7a69f264a72920d2b87ae52ca
+docfiles size=652
RELOC/doc/latex/nicematrix/README.md details="Readme"
RELOC/doc/latex/nicematrix/nicematrix-code.pdf
RELOC/doc/latex/nicematrix/nicematrix-french.pdf details="Package documentation in French" language="fr"
RELOC/doc/latex/nicematrix/nicematrix-french.tex
RELOC/doc/latex/nicematrix/nicematrix.pdf details="Package documentation"
RELOC/doc/latex/nicematrix/nicematrix.tex
-srccontainersize 88180
-srccontainerchecksum 175580284b352063a88e470072c2164b266a1fbe3e7da25526079b90bb65627df36fd9a19f83d52aa374de3e23f37fd656ee88685c714dabba03b624fe52e789
-srcfiles size=142
+srccontainersize 89744
+srccontainerchecksum 11cacf7fe9d8e797adc6568287bdfe03a97f2f573fcc1d193601fea5d408ab7ecd9feef168fb79dfd7abde429dcc788a31917db28b1629f3c788f7974e5b1159
+srcfiles size=144
RELOC/source/latex/nicematrix/nicematrix-code.dtx
RELOC/source/latex/nicematrix/nicematrix.ins
-runfiles size=91
+runfiles size=92
RELOC/tex/latex/nicematrix/nicematrix.sty
catalogue-ctan /macros/latex/contrib/nicematrix
catalogue-license lppl1.3
catalogue-topics maths matrix pgf-tikz expl3
-catalogue-version 6.24
+catalogue-version 6.25
name nicetext
category Package
@@ -259554,7 +259567,7 @@ catalogue-version 1.0
name proflycee
category Package
-revision 68624
+revision 68633
shortdesc A LaTeX package for French maths teachers in high school
relocated 1
longdesc This package provides some commands to help French mathematics
@@ -259563,11 +259576,11 @@ longdesc create splines with "derivative control";
longdesc \CalculFormelParametres and \CalculFormelLigne in order to
longdesc create an xcas-windows-like; \CodePythonLstFichier to create
longdesc code presentation and code execution with pythontex.
-containersize 41348
-containerchecksum 80131c9e4de6c0f091a8fa6f2d4a2ba849d395a22ec5a0c53a488bc323e4cb10b7548f455621f3d09931682901f7fd1982e00c59081bb186b81fcecf98379abe
-doccontainersize 1584296
-doccontainerchecksum 39806573c707eea0e50432f1deab008728ff0f704d25c533e514d53ef2ddbdbe7e15edbfb122c2a2ed711019318203e5375080d93ca85594e409e28185b57ac5
-docfiles size=482
+containersize 42324
+containerchecksum c0e13002c3b115086d5a21cc6b8a55331ca6c93aa8d46f06dfc97b78eeee573b9884384b6c28bd2fbfbfb74a36762b9b80c3fd3687296eabe977a99ad20f16b9
+doccontainersize 1637484
+doccontainerchecksum 24e6fad1283005547518f3413615e65edbf7f8c82c261fb14c4c64022f1979433559add7a3418e2ab856814620ac37242717b5981896a714bb81210952763fda
+docfiles size=422
RELOC/doc/latex/proflycee/ProfLycee-doc.pdf details="Package documentation" language="fr"
RELOC/doc/latex/proflycee/ProfLycee-doc.tex
RELOC/doc/latex/proflycee/ProfLycee-exemples-pyluatex.pdf details="Examples using pyluatex" language="fr"
@@ -259575,26 +259588,8 @@ docfiles size=482
RELOC/doc/latex/proflycee/ProfLycee-exemples-pythontex.pdf details="Examples using python" language="fr"
RELOC/doc/latex/proflycee/ProfLycee-exemples-pythontex.tex
RELOC/doc/latex/proflycee/README.md details="Readme"
- RELOC/doc/latex/proflycee/graphics/integr_nwks_a.png
- RELOC/doc/latex/proflycee/graphics/integr_nwks_b.png
- RELOC/doc/latex/proflycee/graphics/pl-doc-probas_a.png
- RELOC/doc/latex/proflycee/graphics/pl-doc-probas_b.png
- RELOC/doc/latex/proflycee/graphics/pl-doc-probas_c.png
- RELOC/doc/latex/proflycee/graphics/pl-doc-probas_d.png
- RELOC/doc/latex/proflycee/graphics/pl-doc-probas_e.png
- RELOC/doc/latex/proflycee/graphics/pl-doc-probas_f.png
- RELOC/doc/latex/proflycee/graphics/pl-doc-stats_a.png
- RELOC/doc/latex/proflycee/graphics/pl-doc-stats_b.png
- RELOC/doc/latex/proflycee/graphics/pl-doc-stats_c.png
- RELOC/doc/latex/proflycee/graphics/pl-doc-stats_c2.png
- RELOC/doc/latex/proflycee/graphics/pl-doc-stats_d.png
- RELOC/doc/latex/proflycee/graphics/pl-doc-stats_e.png
- RELOC/doc/latex/proflycee/graphics/pl-solve_a.png
- RELOC/doc/latex/proflycee/graphics/pl-solve_b.png
- RELOC/doc/latex/proflycee/graphics/pl-solve_c.png
- RELOC/doc/latex/proflycee/graphics/pl-solve_d.png
- RELOC/doc/latex/proflycee/testscript.py
-runfiles size=75
+ RELOC/doc/latex/proflycee/proflycee-docctan.zip
+runfiles size=77
RELOC/tex/latex/proflycee/ProfLycee.sty
RELOC/tex/latex/proflycee/proflycee-tools-aleatoire.tex
RELOC/tex/latex/proflycee/proflycee-tools-analyse.tex
@@ -304389,7 +304384,7 @@ binfiles arch=x86_64-solaris size=1
name tex4ht
category Package
-revision 68600
+revision 68640
shortdesc Convert (La)TeX to HTML/XML
longdesc A converter from TeX and LaTeX to SGML-based formats such as
longdesc (X)HTML, MathML, OpenDocument, and Docbook, providing a
@@ -304410,10 +304405,10 @@ longdesc files from them is nontrivial, and generally done with the
longdesc Makefile in development, from which the TeX4ht package in TeX
longdesc Live is updated.
depend tex4ht.ARCH
-containersize 1103872
-containerchecksum 071f51c97e6af8b54d1a6a2f9ab9f8c5098fd3b24f2317d2a8c2631fc443923d8e1921d91171d7631cfc0b8c2f5505dd401850877e8b4801b484e81de01a83ce
+containersize 1103868
+containerchecksum bbf5ed1c0af6ef1ff7a05df3dacd1ba07ffd06c62d55e25ac008d4f4bbbf9db68efaf1db3a469b5e011bf3721aa80b288f466c8cf5fdd96ccab59fc742125e02
doccontainersize 136384
-doccontainerchecksum 5701abd7064d78b6019e7844ac7bd4f35e3c20a0e8e25f66f657a60d44a00b06bc8e3a455124095039d6f1dc1b30f8eb1805631a0897dd7cc2d5fe4b9321fdc2
+doccontainerchecksum 5ebbde878b4884cd91e7ee3ae6f700a2c29dea6db899f66a5c49aa1c78adbb1aad11f6010c6d2a8d6887661c0ede3e4e938f6cb13f3af5f09b4c0a6ffd600daa
docfiles size=260
texmf-dist/doc/generic/tex4ht/Makefile
texmf-dist/doc/generic/tex4ht/README details="Readme"
@@ -304485,8 +304480,8 @@ docfiles size=260
texmf-dist/doc/generic/tex4ht/mn56.html
texmf-dist/doc/generic/tex4ht/mn5x.png
texmf-dist/doc/generic/tex4ht/mn6x.png
-srccontainersize 1454584
-srccontainerchecksum a7df44709eedd4f4c70951f79949e3d42e2d07d6bcdd8a0a11bb0bff97ec832a619a82c9f19e450cd270487c4adf941a9f004722ca5deb025b928552f82b0306
+srccontainersize 1459384
+srccontainerchecksum ac4ea1dcfc5b30b2fc63653961cb2f968c8c68be7996babac2c9ea89ebc9824f866e40d8f350f90a3cfa900b6947e80f66e61315b5a35a86875c57f6b1718732
srcfiles size=4399
texmf-dist/source/generic/tex4ht/ChangeLog
texmf-dist/source/generic/tex4ht/Makefile
@@ -315992,7 +315987,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 68623
+revision 68626
shortdesc TeX Live infrastructure programs
longdesc Includes install-tl, tl-portable, rungs, etc.; not needed for
longdesc tlmgr to run but still ours. Not included in tlcritical.
@@ -316000,10 +315995,10 @@ depend texlive-scripts.ARCH
depend texlive.infra
execute addMap mathpple.map
postaction shortcut type=menu name="TeX Live command-line" cmd=TEXDIR/tlpkg/installer/tl-cmd.bat
-containersize 114072
-containerchecksum 422ef45db5d25c34b2ab827bba2e30d5fceb00208749e0a4512188cca47af122b019b4790deea036e4c3a2c7e2be8ede28b0b25e29eba32a23aa209830f40f1c
+containersize 114084
+containerchecksum 4088100059f89754a256d19afa4291884c848a917bc73cba3946e79e56884aa9bf2c8b2657e5a236f41f7821d001b45c59fa395fb5d09d55cd01bb7500e9d0c6
doccontainersize 428296
-doccontainerchecksum fc3583538501cf79e869c6aa90adc34b0b3f702a824e87d04819c4a865a81aa132983e33a08cc93a993532769b580745b31af449049c803968a234d40f10a254
+doccontainerchecksum 1ed948a13ab6ede566478c2c6af6e45eae568e59088472bb37fa7314f6c2acc68a22ed331558be22405c12e588f034fd1401ca8e394181703d44654d63a50b04
docfiles size=550
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
@@ -322324,31 +322319,31 @@ catalogue-version 0.2.3
name tikz-osci
category Package
-revision 68491
+revision 68636
shortdesc Produce oscilloscope "screen shots"
relocated 1
longdesc This package enables you to produce oscilloscope "screen
longdesc shots".
-containersize 2952
-containerchecksum 17c9f520be6ff3687ad8aec5493e75c6f535d5d8624fcac48021f8348b693fecabc29938873c0061506181a7bea9a3139e972dc8656909f92b8a6f025f8fafdc
-doccontainersize 232120
-doccontainerchecksum 375336b45ced26fe0cdaea07aa92037703d21be5dac831dd4dfc21d358e1bc42bccabc5419527a3dc282b7943248ff6e7aeceed9a614f09f4a8d6e7f29d840ce
-docfiles size=78
+containersize 3988
+containerchecksum 93711a01365e992d47306bd379ebc8f72296554288c855dc1f678232e5030894a9241d195cf949133da45ac8df2de1b55244629999f0c311b55d51a2083c4693
+doccontainersize 229352
+doccontainerchecksum 356d60c65bde0d61207df028447409827888a420300a4b27867561494917e4a45db8e6a6dbe291fd19797d64d912089bacda9fd18ff405a28ff2d6512b3b43db
+docfiles size=80
RELOC/doc/latex/tikz-osci/README.md details="Readme"
RELOC/doc/latex/tikz-osci/tikz-osci-doc.pdf details="Package documentation"
RELOC/doc/latex/tikz-osci/tikz-osci-doc.tex
RELOC/doc/latex/tikz-osci/tikz-osci-example.pdf details="Example of use"
RELOC/doc/latex/tikz-osci/tikz-osci-example.tex
-runfiles size=3
+runfiles size=5
RELOC/tex/latex/tikz-osci/tikz-osci.sty
catalogue-also pst-osci
catalogue-contact-bugs https://framagit.org/ThibGiauffret/latex_packages/-/issues
catalogue-contact-home https://www.ensciences.fr/read.php?article=1220
catalogue-contact-repository https://framagit.org/ThibGiauffret/latex_packages/-/tree/master/tikz-osci
catalogue-ctan /graphics/pgf/contrib/tikz-osci
-catalogue-license lppl1.3
-catalogue-topics pgf-tikz graphics-use
-catalogue-version 0.3.0
+catalogue-license lppl1.3c
+catalogue-topics pgf-tikz graphics-use physics
+catalogue-version 0.4.0
name tikz-page
category Package
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 6a01ff17c9..18e1583704 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-2fc599e1016a45d2651565605a0a37ef texlive.tlpdb
+d69c3588dce123265bf111960c6b706f texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index e49ecc7f52..c515ed15da 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-86cdf54b8ec24755383a958d51d2c0675f5b251ad0f5e7a4a9c846c6a164b045611b461128134f12b172851902f4424ca0f50545450013e4d3b1c3ed5bc53c68 texlive.tlpdb
+620af10560d24cb0d7fe6625e99fb7bea990a81224362e84feadda1c107e0e9239ba21dc19e061a946a0d73e70239193730b7f0e9c9a8c62dfe7c750d5f44509 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index bae65525e6..fad40c4bd0 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
@@ -1,11 +1,11 @@
-----BEGIN PGP SIGNATURE-----
-iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmU3BcMACgkQTOGHfhlD
-jHDU0Af9FoRPkPzWf2pe9elV0oCiiPtQD+iXN4+/K+rSoAKAaI5Azo7vMONOp8ew
-p9AHBhvNAOTiGs4Pe0sa7u7SwvTAsjNA1I0COse3IFF7IcgFbQecMHm50a8EU85p
-SN6S2zv+ZCS0Nl1KrzHKywqWGFRPJ/hGw438qxFqZMsWJ8CkCPecXh8DjAX+sjOP
-fuqZEw6qNy2jHwxfb+soOKcgHwfWEd1N25ZFVknbqtDfZnPWj1+iQxK6UxSp9rzJ
-lPdco3x+jnaNI3Z/ENJWrpdS7fXTKzANNRpmSPFT2NqJ1mOJ3AH4pTVtoTl/2tBo
-OYm0oPSMvQ+KB0xR21DEt5PsFLo43Q==
-=d5di
+iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmU4VzAACgkQTOGHfhlD
+jHDWtgf+MeI2REK8cjCkwJjLTATYCdu1kOjRThhQGYV9aOYmiyoTNwffF+gluUD5
+RAHJ/uYQQkRViEwkcp9dtgwCwdInPeqFlzzpdj6i5QekFvuxtY9Gyrf2gQUmIJbb
+IGpqVBlJk5tL7XIc97TDDr/rZpwyqA343OOm6JvK3eDA6viEuUh/u33yKxx8LFvA
+OMqRPhRUePSK9HK3EBxnCn8U7UyYaEtZfg9B+SRql3+cUYoYikCchokeH2BN711s
+B1t0zDD/Cc/zis5rMNk/oEYgtN/8OXaUn/BPSZCru3dmWWDVnQ60V99Jv+xO5gWb
+uZEmyPeT6NFGmARS6croqvPDO4HU7g==
+=LSVi
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 9993b8cae6..8bacf02268 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
Binary files differ
diff --git a/timestamp b/timestamp
index 4983da418b..1c2647ecb5 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
# The source CTAN of this site's material:
dante.ctan.org
# The year-month-day-hour-minute of this site's material:
-2023-10-24-02-02
+2023-10-25-02-02