texlive[68655] Master/texmf-dist: newpx (26oct23)
commits+karl at tug.org
commits+karl at tug.org
Thu Oct 26 21:49:15 CEST 2023
Revision: 68655
https://tug.org/svn/texlive?view=revision&revision=68655
Author: karl
Date: 2023-10-26 21:49:15 +0200 (Thu, 26 Oct 2023)
Log Message:
-----------
newpx (26oct23)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/fonts/newpx/README
trunk/Master/texmf-dist/doc/fonts/newpx/footsnippet-crop.pdf
trunk/Master/texmf-dist/doc/fonts/newpx/newpxdoc.pdf
trunk/Master/texmf-dist/tex/latex/newpx/newpxtext.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/tex/latex/newpx/newpxtext1.sty
trunk/Master/texmf-dist/tex/latex/newpx/newpxtextX.sty
Modified: trunk/Master/texmf-dist/doc/fonts/newpx/README
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/newpx/README 2023-10-25 23:43:15 UTC (rev 68654)
+++ trunk/Master/texmf-dist/doc/fonts/newpx/README 2023-10-26 19:49:15 UTC (rev 68655)
@@ -1,10 +1,15 @@
This package, based initially on pxfonts, provides many fixes and enhancements to that package, splitting it in two parts---newpxtext and newpxmath---which may be run independently of one another. It provides scaling, improved metrics, and other options. For proper operation, the packages require that the packages newtxmath, pxfonts and TeXGyrePagella be installed and their map files enabled. The text package now relies on an extension of the TeXGyrePagella Type1 fonts that is provided with this package. The accompanying MANIFEST-newpx.txt provides details of the extension as requested by GUST-FONT-LICENSE.txt
-Current version: 1.53 2023-10-23
+Current version: 1.531 2023-10-25
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.531
+Corrected the footnote marker issues so the footnote modifications now
+work as expected in all LaTeX engines, and in the standard and AMS
+document classes. (Some small issues remain with KOMA classes.)
+
Changes in version 1.53
1. Addition of superior letters and figures distinct from and taller
than numerators.
Modified: trunk/Master/texmf-dist/doc/fonts/newpx/footsnippet-crop.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/fonts/newpx/newpxdoc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/newpx/newpxtext.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/newpx/newpxtext.sty 2023-10-25 23:43:15 UTC (rev 68654)
+++ trunk/Master/texmf-dist/tex/latex/newpx/newpxtext.sty 2023-10-26 19:49:15 UTC (rev 68655)
@@ -8,8 +8,8 @@
% 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.53}
-\def\filedate{2023/10/23}
+\def\fileversion{1.531}
+\def\filedate{2023/10/25}
\ProvidesPackage{newpxtext}[%
\filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for TeXGyrePagellaX]
@@ -436,7 +436,7 @@
}
\ifzpl at defaultsups %
\else
- \ExplSyntaxOn
+ \ExplSyntaxOn
\DeclareDocumentCommand \fakesuperscript {m} {
\@textsuperscript{\selectfont#1}
}
@@ -463,13 +463,17 @@
{
\cs_new:Npn \footnotemarkfont {\normalfont}
}
- \ExplSyntaxOff
- \fi
- \ifzpl at KOMA
- \setkomafont{footnotereference}{\normalfont\supstyle}
- \setkomafont{footnotelabel}{\normalfont\supstyle}
- \fi
-% \ifzpl at KOMA
+ \ExplSyntaxOff
+ \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{}
+ \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{}
+ \patchcmd{\maketitle}
+{\hb at xt@1.8em}{\hb at xt@2.18em}{}{}
+ \ifzpl at KOMA
+ \setkomafont{footnotereference}{\normalfont\sustyle}
+ \setkomafont{footnotelabel}{\normalfont\sustyle}
+ \fi
+ \fi
+ % \ifzpl at KOMA
% \let\textsuperscript\sustyle
% \setkomafont{footnotelabel}{\textsuperscript}
% \setkomafont{footnotereference}{\textsuperscript}
@@ -516,7 +520,7 @@
\fi%
\fi%}
-\ifzpl at otf
+\iftutex
% \def\zpl at nft{\if t\zpl at thmtab Monospaced%
% \else Proportional\fi}
%\DeclareTextFontCommand{\textsl}{\slshape}
@@ -553,40 +557,41 @@
\ifzpl at 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}
+ \RequirePackage{realscripts}
\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}}
+ \DeclareDocumentCommand \imagsuperscript {m} {
+ \fontspec_if_fontspec_font:TF
+ {
+ \fontspec_if_opentype:TF
+ { \fontspec_if_feature:nTF {+sups}
+ { {\addfontfeature{VerticalPosition=Superior}#1} }
+ { \fakesuperscript{#1} }
+ }
+ { \fontspec_if_aat_feature:nnTF {10} {1}
+ { {\addfontfeature{VerticalPosition=Superior}#1} }
+ { \fakesuperscript{#1} }
+ }
+ }
+ { \fakesuperscript{#1} }
+}
+
+ \RenewDocumentCommand \realsuperscript {m} {
+ \hbox_set:Nn \l_tmpa_box {\imagsuperscript{#1}}
\box_scale:Nnn \l_tmpa_box { \zplsups at scalefactor } { \zplsups at scalefactor }
\hbox_set:Nn \l_tmpa_box
{ \box_move_up:nn \zplsups at raised {\box_use:N \l_tmpa_box} }
- \hspace*{\zplsups at Lspaced}{\color{\zplsups at color}%
+ \hspace*{\zplsups at Lspaced}
+ {\color{\zplsups at color}%
\box_use:N \l_tmpa_box }%
\hspace*{\zplsups at Rspaced}}
- \cs_set:Npn \@makefnmark {%
- \mbox{%
- \footnotemarkfont\textsuperscript{\@thefnmark}}
- }
- \cs_if_exist:NTF \ftntm at font
- {
- \cs_set:Npn \footnotemarkfont {\normalfont \ftntm at font}
- }
- {
- \cs_set:Npn \footnotemarkfont {\normalfont}
- }
\ExplSyntaxOff
- \fi
+
+ \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{}
+ \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{}
+ \patchcmd{\maketitle}
+{\hb at xt@1.8em}{\hb at xt@2.18em}{}{}
+ \fi
\ifzpl at KOMA
\setkomafont{footnotereference}{\normalfont\sustyle}
\setkomafont{footnotelabel}{\normalfont\sustyle}
Deleted: trunk/Master/texmf-dist/tex/latex/newpx/newpxtext1.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/newpx/newpxtext1.sty 2023-10-25 23:43:15 UTC (rev 68654)
+++ trunk/Master/texmf-dist/tex/latex/newpx/newpxtext1.sty 2023-10-26 19:49:15 UTC (rev 68655)
@@ -1,766 +0,0 @@
-\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 at KOMA
-\@ifundefined{KOMAClassName}{}{\zpl at KOMAtrue}
-\@ifundefined{ver at scrextend.sty}{}{\zpl at KOMAtrue}
-\newif\ifzpl at LTX
-\@ifclassloaded{article}{\zpl at LTXtrue}{}
-\@ifclassloaded{report}{\zpl at LTXtrue}{}
-\@ifclassloaded{book}{\zpl at LTXtrue}{}
-
-% Engine check
-\newif\ifzpl at otf
-\iftutex\zpl at otftrue
-%\else % [pdf]LaTeX
-% \zpl at otffalse
-\fi
-\def\zpl at divide#1#2{\strip at 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 at nomath\zpl at nomathfalse % load fontspec with no-math
-\newif\ifzpl at lining\zpl at liningtrue
-\newif\ifzpl at tabular\zpl at tabulartrue % default is tabular lining figures
-\@ifundefined{ver at newpxmath.sty}{}{\zpl at nomathtrue}
-
-\DeclareOptionX{type1}[true]{%
-%\@nameuse{if#1}\zpl at otffalse\fi
-}
-\DeclareOptionX{nofontspec}[true]{%
-%\@nameuse{if#1}\zpl at otffalse\fi
-}
-\DeclareOptionX{no-math}[true]{%
-\@nameuse{if#1}\zpl at nomathtrue\fi
-}
-
-\def\zpl at defaultfeatures{}
-\DeclareOptionX{defaultfeatures}{\def\zpl at defaultfeatures{#1}}
-
-%Figure style options
-\edef\zpl at dfltfigurestyle{lf}
-\edef\zpl at dfltfigurealign{t}
-
-\DeclareOptionX{lining}[true]{%
-\@nameuse{zpl at lining#1}
-}
-\DeclareOptionX{lf}[true]{%
-\@nameuse{zpl at lining#1}
-}
-\DeclareOptionX{oldstyle}[true]{%
-\@nameuse{if#1}%
- \zpl at liningfalse
-\else
- \zpl at liningtrue
-\fi
-}
-\DeclareOptionX{osf}[true]{%
-\@nameuse{if#1}%
- \zpl at liningfalse
-\else
- \zpl at liningtrue
-\fi
-}
-\DeclareOptionX{tabular}[true]{%
-\@nameuse{zpl at tabular#1}
-}
-\DeclareOptionX{t}[true]{%
-\@nameuse{zpl at tabular#1}
-}
-\DeclareOptionX{proportional}[true]{%
-\@nameuse{if#1}%
- \zpl at tabularfalse
-\else
- \zpl at tabulartrue
-\fi
-}
-\DeclareOptionX{p}[true]{%
-\@nameuse{if#1}%
- \zpl at tabularfalse
-\else
- \zpl at tabulartrue
-\fi
-}
-
-%Scale
-\providecommand{\zpl at scale}{1} % actual scaled command in \zpl at scaled
-\DeclareOptionX{scale}{\def\zpl at scale{#1}}
-\DeclareOptionX{scaled}{\def\zpl at scale{#1}}
-
-\newif\ifzpl at defaultsups
-%\newif\ifzpl at adobesc % we don't use this exc. in fd, but may in future
-\newif\ifzpl at scosf
-\newif\ifzpl at largesc
-\newif\ifzpl at helv \zpl at helvtrue % default is to load helvetica as sans serif font
-\newif\ifzpl at thrm
-\newif\ifzpl at sl
-% new sups options
-\newdimen\zplsups at scale
-\newdimen\zplsups at raise
-\def\zplsups at raised{\z@}
-\def\zplsups at Lspaced{.04em}
-\def\zplsups at Rspaced{.04em}
-\def\zplsups at scaledval{1.0}
-\def\zplsups at supscale{1.0}
-\DeclareOptionX{supscaled}{\renewcommand*{\zplsups at scaledval}{#1}}
-\DeclareOptionX{supscale}{\renewcommand*{\zplsups at scaledval}{#1}}
-\DeclareOptionX{supsraised}{\renewcommand*{\zplsups at raised}{#1}}
-\DeclareOptionX{supLspaced}{\renewcommand*{\zplsups at Lspaced}{#1}}
-\DeclareOptionX{supRspaced}{\renewcommand*{\zplsups at Rspaced}{#1}}
-
-% Other options
-\DeclareOptionX{defaultsups}[true]{%
-\@nameuse{zpl at defaultsups#1}
-}
-\DeclareOptionX{babel}[true]{%
-\@nameuse{zpl at babel#1}% for backward compatibility
-}
-\DeclareOptionX{largesc}[true]{%
-\@nameuse{zpl at largesc#1}
-}
-\DeclareOptionX{nohelv}[true]{%
-\@nameuse{if#1}\zpl at helvfalse\fi}%
-
-\def\zpl at helvratio{.94}
-\DeclareOptionX{helvratio}[0.94]{%
-\def\zpl at helvratio{#1}
-}
-\def\zpl at spcmag{1}
-\def\zpl at spc{.25em}
-\def\zpl at stretch{.2em}
-\def\zpl at shrink{.1em}
-\def\zpl at nospc{T}
-
-\DeclareOptionX{spcfactor}{%
-\def\zpl at spcmag{#1}\def\zpl at nospc{F}
-}
-\DeclareOptionX{spacing}{%
-\def\zpl at spc{#1}
-}
-\DeclareOptionX{stretch}{%
-\def\zpl at stretch{#1}
-}
-\DeclareOptionX{shrink}{%
-\def\zpl at shrink{#1}
-}
-\newcount\zpl at cnt \zpl at cnt=0
-\newif\ifzpl at zeroslash
-\newif\ifzpl at notextnu
-\def\zpl at thmlin{X} % default is to not change to lining
-\def\zpl at noti{T}\def\zpl at nolo{T}
-\DeclareOptionX{oldSS}{\advance\zpl at cnt 32 }
-\DeclareOptionX{notextnu}{\zpl at notextnutrue}
-\DeclareOptionX{slashedzero}{\zpl at zeroslashtrue}
-\DeclareOptionX{theoremfont}{\zpl at thrmtrue }
-\DeclareOptionX{thmlining}{\edef\zpl at thmlin{l}}
-\DeclareOptionX{trueslanted}{\zpl at sltrue}
-\DeclareOptionX{scosf}{\zpl at scosftrue}
-\DeclareOptionX{tighter}{%
-\gdef\zpl at spc{.25em}\gdef\zpl at stretch{.125em}%
-\gdef\zpl at shrink{.1em}\def\zpl at noti{F}}
-\DeclareOptionX{looser}{%
-\gdef\zpl at spc{.3em}\gdef\zpl at stretch{.2em}%
-\gdef\zpl at shrink{.1em}\def\zpl at nolo{F}}
-
-\DeclareOptionX{sfracvcenter}{%
-\def\zpl at sfrVC{#1}}
-\DeclareOptionX{sfracvspacing}{%
-\def\zpl at sfrVS{#1}}
-\DeclareOptionX{sfracbarthick}{%
-\def\zpl at sfrTH{#1}}
-\DeclareOptionX{sfracscaling}{%
-\def\zpl at sfrSC{#1}}
-
-\ProcessOptionsX\relax
-
-\setlength{\zplsups at raise}{\zplsups at raised}
-\setlength{\zplsups at scale}{\zplsups at scaledval\p@}
-\zplsups at scale=\zpl at scale\zplsups at scale %
-\def\zplsups at scaled{s*[\strip at pt\zplsups at scale]}
-% for stacked fractions
-\@ifundefined{zpl at xht}{\def\zpl at xht{460}}{} % lowercase letters
-\@ifundefined{zpl at deht}{\def\zpl at deht{412}}{} % denominator figures ht
-\@ifundefined{zpl at nubase}{\def\zpl at nubase{270}}{} % baseline of numerators
-\@ifundefined{zpl at debase}{\def\zpl at debase{0}}{} % baseline of denoms
-\@ifundefined{zpl at sfrVC}{\def\zpl at sfrVC{335}}{}% vertical center of sfrac
-\@ifundefined{zpl at sfrVS}{\def\zpl at sfrVS{106}}{} % space above/below bar
-\@ifundefined{zpl at sfrTH}{\def\zpl at sfrTH{52}}{} % bar thickness
-\@ifundefined{zpl at sfrSC}{\def\zpl at sfrSC{.9}}{} % scale defigures by this
-
-\def\re at DeclareTextSymbol#1#2#3{%
- \let#1=\undefined
- \DeclareTextSymbol{#1}{#2}{#3}}
-
-\ifzpl at otf
- \ifzpl at 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 at base{TeXGyrePagellaX}
- \ifzpl at 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 at scosf
- \AtBeginDocument{%
- \xpretocmd{\scshape}
- {\fontfamily{zpl\zpl at figurealign osf}}
- {}{}%
- }%
- \fi%
-% for possible use in footnote markers
-% \DeclareFontFamily{OT1}{zplsups}{}%
-% \DeclareFontShape{OT1}{zplsups}{m}{n}{%
-% <-> \zplsups at scaled zplsups-Regular-ot1
-%}{}
-% \DeclareFontFamily{T1}{zplsups}{}%
-% \DeclareFontShape{T1}{zsups}{m}{n}{%
-% <-> \zplsups at scaled zplsups-Regular-t1
-%}{}
-% \DeclareFontFamily{TS1}{zsups}{}%
-% \DeclareFontShape{TS1}{zsups}{m}{n}{%
-% <-> \zplsups at scaled zplsups-Regular-ts1
-%}{}
-\DeclareRobustCommand{\supstyle}{%
- \not at math@alphabet\supstyle\relax
- \usefont{\f at encoding}{zplsups}{m}{n}}
-
-\ifdim\zplsups at raise=\z@
- \DeclareRobustCommand{\textsups}[1]{{\supstyle#1}}
-\else
- \DeclareRobustCommand{\textsups}[1]{%
- \raisebox{\zplsups at raise}{\hbox{{\supstyle#1}}}}
-\fi
-
-\RequirePackage{fontaxes}
- \fa at naming@exception{figures}{{superior}{proportional}}{sups}
- \fa at 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 at math@alphabet\sustyle\relax
- \fontfamily{zplsups}\selectfont}
- \let\sufigures=\sustyle
- \let\nustyle=\sustyle
- \let\nufigures=\sustyle
-
- \fa at naming@exception{figures}{{inferior}{proportional}}{inf}
- \fa at 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 at math@alphabet\instyle\relax
- \fontfamily{zplsubs}\selectfont}
- \let\infigures=\instyle
-
- \fa at naming@exception{figures}{{denominators}{proportional}}{dnom}
- \fa at naming@exception{figures}{{denominators}{tabular}}{dnom}
-% \def\defigures{\@nomath\defigures
-% \fontfamily{defigures}\selectfont}
-% \DeclareTextFontCommand{\textde}{\defigures}
-% \let\textdenominators\textde
- \DeclareRobustCommand{\destyle}{%
- \not at math@alphabet\destyle\relax
- \fontfamily{zpldnom}\selectfont}
- \let\defigures=\destyle
-
- \fa at naming@exception{figures}{{numerators}{proportional}}{numr}
- \fa at 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 at 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 at foresolidus{\fontencoding{TS1}\selectfont\char"2F}%
-% \kern\zpl at 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 at footnote=\thefootnote
-\let\orig at makefnmark=\@makefnmark
-\def\bfseries at rm{b}
-\def\mdseries at rm{m}
-\def\useosf{\zpl at liningfalse}
-\@onlypreamble\useosf
-\def\useproportional{\zpl at tabularfalse}
-\@onlypreamble\useproportional
-
-\ifzpl at otf
- \def\zpl at dflt{}
- \ifzpl at zeroslash\edef\zpl at dflt{Numbers = SlashedZero ,
- }\fi
- \if T\zpl at nospc
- \if F\zpl at noti\def\zpl at spcmag{{1,.625,1}}\def\zpl at nospc{F}\fi
- \if F\zpl at nolo\def\zpl at spcmag{{1.2,1,1}}\def\zpl at nospc{F}\fi
- \fi
- \if F\zpl at nospc
- \edef\zpl at dflt{\zpl at dflt WordSpace = \zpl at spcmag ,
- }
- \fi
- \def\zpl at scraw{pcap}\def\zpl at scrawN{smcp}
- \ifzpl at largesc\def\zpl at scraw{smcp}\def\zpl at scrawN{pcap}\fi
-
- %\zpl at cnt will be 0..2^8-1
- \edef\zpl at lst{}
- \ifnum\zpl at cnt>127 \edef\zpl at lst{8}\advance\zpl at cnt -128 \fi
- \ifnum\zpl at cnt>63 \edef\zpl at lst{7,\zpl at lst}\advance\zpl at cnt -64 \fi
- \ifnum\zpl at cnt>31 \edef\zpl at lst{6,\zpl at lst}\advance\zpl at cnt -32 \fi
- \ifnum\zpl at cnt>15 \edef\zpl at lst{5,\zpl at lst}\advance\zpl at cnt -16 \fi
- \ifnum\zpl at cnt>7 \edef\zpl at lst{4,\zpl at lst}\advance\zpl at cnt -8 \fi
- \ifnum\zpl at cnt>3 \edef\zpl at lst{3,\zpl at lst}\advance\zpl at cnt -4 \fi
- \ifnum\zpl at cnt>1 \edef\zpl at lst{2,\zpl at lst}\advance\zpl at cnt -2 \fi
- \ifnum\zpl at cnt>0 \edef\zpl at lst{1,\zpl at lst}\fi
- \ifthenelse{\not\equal{\zpl at lst}{}}
- {\edef\zpl at dflt{\zpl at dflt StylisticSet={\zpl at lst} ,
- }}{}
-
- \defaultfontfeatures{
- Ligatures = TeX ,
- Scale = \zpl at scale ,
- Extension = .otf ,
- SmallCapsFeatures={\ifzpl at scosf Numbers = OldStyle ,
- \fi RawFeature = -\zpl at scrawN;+\zpl at scraw }
- \ifluatex Renderer=Basic\fi ,
- \zpl at dflt ,
- RawFeature=-ss05 ,
- \zpl at defaultfeatures
- }
-
-\else % type1
- \def\zpl at spacing{%
- \fontdimen2\font=\zpl at spc
- \fontdimen3\font=\zpl at stretch
- \fontdimen4\font=\zpl at shrink}
- \@tempdima=\zpl at scale\p@\@tempdima=\zpl at helvratio\@tempdima%
- \edef\qhv at scale{\strip at pt\@tempdima}
- \def\zpl at scaled{s*[\zpl at scale]}% used in fd files
-
-
- \DeclareRobustCommand{\lfstyle}{%
- \not at math@alphabet\lfstyle\relax
- \fontfamily{zplLF}\selectfont %
- }
- \DeclareRobustCommand{\tlfstyle}{%
- \not at math@alphabet\tlfstyle\relax
- \fontfamily{zplTLF}\selectfont %
- }
- \DeclareRobustCommand{\osfstyle}{%
- \not at math@alphabet\osfstyle\relax
- \fontfamily{zplOsF}\selectfont %
- }
- \DeclareRobustCommand{\tosfstyle}{%
- \not at math@alphabet\tosfstyle\relax
- \fontfamily{zplTOsF}\selectfont %
- }
- \ifzpl at defaultsups %
- \else
- \ExplSyntaxOn
- \DeclareDocumentCommand \fakesuperscript {m} {
- \@textsuperscript{\selectfont#1}
- }
- \RenewDocumentCommand \textsuperscript {s} {
- \IfBooleanTF #1 \fakesuperscript \realsuperscript
- }
- \DeclareDocumentCommand \realsuperscript {m} {
- \ifzpl at defaultsups\fakesuperscript{#1}
- \else\hspace*{\zplsups at Lspaced}\textsups{#1}\hspace*{\zplsups at Rspaced}\fi
- }
-
- \cs_set:Npn \@makefnmark {
- \mbox{%
- \footnotemarkfont\textsuperscript{\@thefnmark}}
- }
- \cs_if_exist:NTF \ftntm at font
- {
- \cs_new:Npn \footnotemarkfont {\normalfont \ftntm at font}
- }
- {
- \cs_new:Npn \footnotemarkfont {\normalfont}
- }
- \ExplSyntaxOff
- \fi
-% \ifzpl at KOMA
-% \let\textsuperscript\sustyle
-% \setkomafont{footnotelabel}{\textsuperscript}
-% \setkomafont{footnotereference}{\textsuperscript}
-% \else % NOT KOMA
-% \def\f@@tn at te{footnote}
-% \def\@makefnmark{%
-% \ifx\@mpfn\f@@tn at te%
-% \ifx\thefootnote\orig at footnote%
-% \hbox{\sustyle\hspace*{.05em}\@thefnmark\hspace*{.05em}}%
-% \else%
-% \orig at makefnmark%
-% \fi
-% \else%
-% \orig at makefnmark%
-% \fi}%
-% \fi
-% \fi
- \ifzpl at helv\renewcommand*{\sfdefault}{qhv}\fi
- \renewcommand*{\ttdefault}{npxtt}
- \DeclareRobustCommand\thfamily % new family for theorem font
- {\not at math@alphabet\thfamily\relax
- \fontfamily\thdefault\selectfont}
- \DeclareRobustCommand{\textth}[1]{%
- {\thfamily #1}%
- }
- \let\textthit\textth
-
-\fi % type1
-
-\ifzpl at 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 at 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 at math@alphabet\destyle\relax
- \addfontfeatures{VerticalPosition=Denominator}%
- }
- \DeclareRobustCommand{\nustyle}{%
- \not at math@alphabet\nustyle\relax
- \addfontfeatures{VerticalPosition=Numerator}%
- }
- \DeclareRobustCommand{\sustyle}{%
- \not at math@alphabet\sustyle\relax
- \addfontfeatures{VerticalPosition=Superior}%
- }
- \DeclareRobustCommand{\infstyle}{%
- \not at math@alphabet\infstyle\relax
- \addfontfeatures{VerticalPosition=Inferior}%
- }
-
- \let\sufigures\sustyle
- \let\nufigures\nustyle
- \let\infigures\infstyle
- \let\defigures\destyle
-
- \ifzpl at defaultsups %
- \else
- \RequirePackage{realscripts}
- \renewcommand\footnotemarkfont{\normalfont\sufigures}
- \fi
- \ifzpl at KOMA
- \setkomafont{footnotereference}{\normalfont\sustyle}
- \setkomafont{footnotelabel}{\normalfont\sustyle}
- \fi
-
- \renewcommand*{\textcircled}[1]{\hmode at 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 at 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 at notextnu\else\let\textnu=\textnumerator\fi
- \let\textnum\textnumerator
-\DeclareTextFontCommand{\textde}{\destyle}
- \let\textdenominator\textde
-\DeclareTextFontCommand{\textinf}{\instyle}
- \let\textinferior\textinf
-
-\newdimen\zpl at sixem\zpl at sixem6pt % for checking if a number refers to ex
-\newdimen\zpl at y \newdimen\zpl at x
-
-% convert numerical entry that may be multiple of ex (<6) or em value
-\def\zpl at toex#1{\zpl at x#1pt \ifdim\zpl at x<\z@\zpl at y-\zpl at x\else\zpl at y\zpl at x\fi \ifdim\zpl at y>\zpl at sixem \zpl at x\dimexpr
- 1pt * (\dimexpr #1pt\relax) / \dimexpr \zpl at xht pt\relax\relax\fi}
-
-\newdimen\zpl at tmpdima \newdimen\zpl at tmpdimb \newdimen\zpl at tmpdimc
-\newdimen\zpl at tmpdimd \newdimen\zpl at tmpdime \newdimen\zpl at tmpdimf
-\newdimen\zpl at dimA
-\newdimen\zpl at dimAA \newdimen\zpl at dimB \newdimen\zpl at dimBB
-\newdimen\zpl at dimC % vertical center
-% double cap letters for below bar, single cap for above
-
-\zpl at toex\zpl at sfrVC\zpl at dimC\zpl at x %Vertical center of fraction
-\zpl at toex\zpl at sfrTH\zpl at tmpdimb\zpl at x % bar thickness
-\zpl at tmpdime.5\zpl at tmpdimb % half bar thickness
-\zpl at toex\zpl at sfrVS\zpl at tmpdimc\zpl at x% vertical space
-\zpl at toex\zpl at deht\zpl at tmpdimd\zpl at x % height of unscaled figures
-\zpl at tmpdimd\zpl at sfrSC\zpl at tmpdimd % height of scaled figures
-\zpl at toex\zpl at debase\zpl at tmpdimf\zpl at x % unscaled baseline of de figures
-\zpl at toex\zpl at nubase\zpl at tmpdima\zpl at x % unscaled baseline of nu figures
-\zpl at tmpdima\zpl at sfrSC\zpl at tmpdima % scaled nu baseline
-\zpl at tmpdimf\zpl at sfrSC\zpl at tmpdimf % scaled de baseline
-\zpl at dimA\zpl at dimC
-\advance\zpl at dimA by \zpl at tmpdime % top of bar
-\zpl at dimAA\zpl at dimC
-\advance\zpl at dimAA by -\zpl at tmpdime % bottom of bar
-\zpl at dimB\zpl at dimA
-\advance\zpl at dimB by \zpl at tmpdimc % top figure baseline
-\advance\zpl at dimB by -\zpl at tmpdima
-\zpl at dimBB\zpl at dimAA
-\advance\zpl at dimBB by -\zpl at tmpdimc %
-\advance\zpl at dimBB by -\zpl at tmpdimd % bottom figure baseline
-\advance\zpl at dimBB by -\zpl at 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 at bgroup%
-\ooalign{%
- \setbox0=\hbox{\scalefont{\zpl at sfrSC}\nustyle#2}%
- \hfil \raise\strip at pt\zpl at dimB ex\box0\hfil \crcr%
- \leaders\hrule height \strip at pt\zpl at dimA ex depth -\strip at pt\zpl at dimAA ex\hfill \crcr%
- \setbox1=\hbox{\scalefont{\zpl at sfrSC}\destyle#3}%
- \hfil\raise\strip at pt\zpl at dimBB ex\box1\hfil}%
-\egroup}}
-}
-
-\AtEndPreamble{%
-\ifzpl at otf
- \ifzpl at lining
- \def\zpl at figurestyle{Lining}
- \else
- \def\zpl at figurestyle{OldStyle}
- \fi
- \ifzpl at tabular
- \def\zpl at figurealign{Monospaced}
- \else
- \def\zpl at figurealign{Proportional}
- \fi
-% \ifzpl at scosf
-% %\traceon
-% \setmainfont
-% [Numbers = {\zpl at figurealign,\zpl at figurestyle},
-% SmallCapsFeatures = { Letters=SmallCaps , Numbers = OldStyle }
-% ] {\zpl at base}
-%% \traceoff
-% \else
-% \setmainfont
-% [Numbers = {\zpl at figurealign,\zpl at figurestyle}
-% SmallCapsFeatures = { Letters=SmallCaps , }
-% ] {\zpl at base}
-% \fi
- \setmainfont
- [Numbers = {Proportional , Lining },
- SmallCapsFeatures = { Letters = SmallCaps , Numbers = OldStyle }
- ] {TeXGyrePagellaX}
-
-
-% \let\zpl at sty\zpl at figurestyle
-% \if l\zpl at thmlin\def\zpl at sty{Lining}\fi
-% \newcommand{\thfamily}%{\@nameuse{zpl\zpl at figurestyle}%
-% {\addfontfeatures{%
-% Numbers={\zpl at figurealign,\zpl at sty} ,
-% RawFeature=+ss05}
-% \itshape} % for theorems
-% \ifzpl at sl\else\let\slshape=\thfamily\fi % change
-
-\else % type1
- \ifzpl at lining
- \def\zpl at figurestyle{lf}
- \else
- \def\zpl at figurestyle{osf}
- \fi
- \ifzpl at tabular
- \def\zpl at figurealign{t}
- \else
- \def\zpl at figurealign{}
- \fi
-
- \renewcommand*{\rmdefault}{zpl\zpl at figurealign%
- \zpl at figurestyle}
- \let\familydefault\rmdefault
-
- % use OsF in small caps
-
- \def\zpl at thfigurestyle{\zpl at figurestyle}
- \ifx\zpl at figurestyle\zpl at dfltfigurestyle
- \def\zpl at thfigurestyle{tlf}
- \else
- \def\zpl at thfigurestyle{osf}
- \fi % there just two possible figure styles for the theorem font
- \newcommand*{\thdefault}{zplth-\zpl at thfigurestyle}
- \normalfont
-\fi % type1
-% both
-\ifzpl at KOMA
- %\let\textsuperscript\textsu
- \@ifpackageloaded{AB at authnote}{%
- \renewcommand\AB at authnote[1]{\textsu{#1}}
- \renewcommand\AB at affilnote[1]{\textsu{#1}}
- }
-\fi
-%both
-\ifzpl at thrm
- \@ifundefined{theoremstyle}{}{
- \theoremstyle{plain}
- \patchcmd{\th at 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 at 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 at figurealign OsF}\selectfont }
- \DeclareTextFontCommand{%
- \liningnums}{\fontfamily{zpl\zpl at figurealign LF}\selectfont }
- \DeclareTextFontCommand{%
- \tabularnums}{\fontfamily{zplT\zpl at figurestyle}\selectfont }
- \DeclareTextFontCommand{%
- \proportionalnums}{\fontfamily{zpl\zpl at figurestyle}\selectfont }
- \re at DeclareTextSymbol{\textdollar}{OT1}{36}
-\fi
-
-\endinput
-
Deleted: trunk/Master/texmf-dist/tex/latex/newpx/newpxtextX.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/newpx/newpxtextX.sty 2023-10-25 23:43:15 UTC (rev 68654)
+++ trunk/Master/texmf-dist/tex/latex/newpx/newpxtextX.sty 2023-10-26 19:49:15 UTC (rev 68655)
@@ -1,506 +0,0 @@
-\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 at otf
-\iftutex\zpl at otftrue
-\else
- \endinput
-\fi
-%%%%%%%%%%%%%%%%%%
- \RequirePackage{xkeyval}
-%%%% Start Options
-\newif\ifzpl at nomath\zpl at nomathfalse % load fontspec with no-math
-\newif\ifzpl at lining\zpl at liningtrue
-\newif\ifzpl at tabular\zpl at tabulartrue % default is tabular lining figures
-\@ifundefined{ver at newpxmath.sty}{}{\zpl at nomathtrue}
-
-\DeclareOptionX{type1}[true]{%
-%\@nameuse{if#1}\zpl at otffalse\fi
-}
-\DeclareOptionX{nofontspec}[true]{%
-%\@nameuse{if#1}\zpl at otffalse\fi
-}
-\DeclareOptionX{no-math}[true]{%
-\@nameuse{if#1}\zpl at nomathtrue\fi
-}
-
-\def\zpl at defaultfeatures{}
-\DeclareOptionX{defaultfeatures}{\def\zpl at defaultfeatures{#1}}
-
-%Figure style options
-\edef\zpl at dfltfigurestyle{lf}
-\edef\zpl at dfltfigurealign{t}
-
-\DeclareOptionX{lining}[true]{%
-\@nameuse{zpl at lining#1}
-}
-\DeclareOptionX{lf}[true]{%
-\@nameuse{zpl at lining#1}
-}
-\DeclareOptionX{oldstyle}[true]{%
-\@nameuse{if#1}%
- \zpl at liningfalse
-\else
- \zpl at liningtrue
-\fi
-}
-\DeclareOptionX{osf}[true]{%
-\@nameuse{if#1}%
- \zpl at liningfalse
-\else
- \zpl at liningtrue
-\fi
-}
-\DeclareOptionX{tabular}[true]{%
-\@nameuse{zpl at tabular#1}
-}
-\DeclareOptionX{t}[true]{%
-\@nameuse{zpl at tabular#1}
-}
-\DeclareOptionX{proportional}[true]{%
-\@nameuse{if#1}%
- \zpl at tabularfalse
-\else
- \zpl at tabulartrue
-\fi
-}
-\DeclareOptionX{p}[true]{%
-\@nameuse{if#1}%
- \zpl at tabularfalse
-\else
- \zpl at tabulartrue
-\fi
-}
-
-%Scale
-\providecommand{\zpl at scale}{1} % actual scaled command in \zpl at scaled
-\DeclareOptionX{scale}{\def\zpl at scale{#1}}
-\DeclareOptionX{scaled}{\def\zpl at scale{#1}}
-
-\newif\ifzpl at defaultsups
-%\newif\ifzpl at adobesc % we don't use this exc. in fd, but may in future
-\newif\ifzpl at scosf
-\newif\ifzpl at largesc
-\newif\ifzpl at helv \zpl at helvtrue % default is to load helvetica as sans serif font
-\newif\ifzpl at thrm
-\newif\ifzpl at sl
-% new sups options
-\newdimen\zplsups at scale
-\newdimen\zplsups at raise
-\def\zplsups at raised{\z@}
-\def\zplsups at Lspaced{.04em}
-\def\zplsups at Rspaced{.04em}
-\def\zplsups at scaledval{1.0}
-\def\zplsups at supscale{1.0}
-\DeclareOptionX{supscaled}{\renewcommand*{\zplsups at scaledval}{#1}}
-\DeclareOptionX{supscale}{\renewcommand*{\zplsups at scaledval}{#1}}
-\DeclareOptionX{supsraised}{\renewcommand*{\zplsups at raised}{#1}}
-\DeclareOptionX{supLspaced}{\renewcommand*{\zplsups at Lspaced}{#1}}
-\DeclareOptionX{supRspaced}{\renewcommand*{\zplsups at Rspaced}{#1}}
-
-% Other options
-\DeclareOptionX{defaultsups}[true]{%
-\@nameuse{zpl at defaultsups#1}
-}
-\DeclareOptionX{babel}[true]{%
-\@nameuse{zpl at babel#1}% for backward compatibility
-}
-\DeclareOptionX{largesc}[true]{%
-\@nameuse{zpl at largesc#1}
-}
-\DeclareOptionX{nohelv}[true]{%
-\@nameuse{if#1}\zpl at helvfalse\fi}%
-
-\def\zpl at helvratio{.94}
-\DeclareOptionX{helvratio}[0.94]{%
-\def\zpl at helvratio{#1}
-}
-\def\zpl at spcmag{1}
-\def\zpl at spc{.25em}
-\def\zpl at stretch{.2em}
-\def\zpl at shrink{.1em}
-\def\zpl at nospc{T}
-
-\DeclareOptionX{spcfactor}{%
-\def\zpl at spcmag{#1}\def\zpl at nospc{F}
-}
-\DeclareOptionX{spacing}{%
-\def\zpl at spc{#1}
-}
-\DeclareOptionX{stretch}{%
-\def\zpl at stretch{#1}
-}
-\DeclareOptionX{shrink}{%
-\def\zpl at shrink{#1}
-}
-\newcount\zpl at cnt \zpl at cnt=0
-\newif\ifzpl at zeroslash
-\newif\ifzpl at notextnu
-\def\zpl at thmlin{X} % default is to not change to lining
-\def\zpl at noti{T}\def\zpl at nolo{T}
-\DeclareOptionX{oldSS}{\advance\zpl at cnt 32 }
-\DeclareOptionX{notextnu}{\zpl at notextnutrue}
-\DeclareOptionX{slashedzero}{\zpl at zeroslashtrue}
-\DeclareOptionX{theoremfont}{\zpl at thrmtrue }
-\DeclareOptionX{thmlining}{\edef\zpl at thmlin{l}}
-\DeclareOptionX{trueslanted}{\zpl at sltrue}
-\DeclareOptionX{scosf}{\zpl at scosftrue}
-\DeclareOptionX{tighter}{%
-\gdef\zpl at spc{.25em}\gdef\zpl at stretch{.125em}%
-\gdef\zpl at shrink{.1em}\def\zpl at noti{F}}
-\DeclareOptionX{looser}{%
-\gdef\zpl at spc{.3em}\gdef\zpl at stretch{.2em}%
-\gdef\zpl at shrink{.1em}\def\zpl at nolo{F}}
-
-\DeclareOptionX{sfracvcenter}{%
-\def\zpl at sfrVC{#1}}
-\DeclareOptionX{sfracvspacing}{%
-\def\zpl at sfrVS{#1}}
-\DeclareOptionX{sfracbarthick}{%
-\def\zpl at sfrTH{#1}}
-\DeclareOptionX{sfracscaling}{%
-\def\zpl at sfrSC{#1}}
-
-\ProcessOptionsX\relax
-
-\setlength{\zplsups at raise}{\zplsups at raised}
-\setlength{\zplsups at scale}{\zplsups at scaledval\p@}
-\zplsups at scale=\zpl at scale\zplsups at scale %
-\def\zplsups at scaled{s*[\strip at pt\zplsups at scale]}
-% for stacked fractions
-\@ifundefined{zpl at xht}{\def\zpl at xht{460}}{} % lowercase letters
-\@ifundefined{zpl at deht}{\def\zpl at deht{412}}{} % denominator figures ht
-\@ifundefined{zpl at nubase}{\def\zpl at nubase{270}}{} % baseline of numerators
-\@ifundefined{zpl at debase}{\def\zpl at debase{0}}{} % baseline of denoms
-\@ifundefined{zpl at sfrVC}{\def\zpl at sfrVC{335}}{}% vertical center of sfrac
-\@ifundefined{zpl at sfrVS}{\def\zpl at sfrVS{106}}{} % space above/below bar
-\@ifundefined{zpl at sfrTH}{\def\zpl at sfrTH{52}}{} % bar thickness
-\@ifundefined{zpl at sfrSC}{\def\zpl at sfrSC{.9}}{} % scale defigures by this
-
-\def\re at DeclareTextSymbol#1#2#3{%
- \let#1=\undefined
- \DeclareTextSymbol{#1}{#2}{#3}}
-
-\ifzpl at otf
- \ifzpl at 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 at base{TeXGyrePagellaX}
-% \ifzpl at 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 at liningfalse}
-\@onlypreamble\useosf
-\def\useproportional{\zpl at tabularfalse}
-\@onlypreamble\useproportional
-
-\ifzpl at otf
- \def\zpl at dflt{}
- \ifzpl at zeroslash\edef\zpl at dflt{Numbers = SlashedZero ,
- }\fi
- \if T\zpl at nospc
- \if F\zpl at noti\def\zpl at spcmag{{1,.625,1}}\def\zpl at nospc{F}\fi
- \if F\zpl at nolo\def\zpl at spcmag{{1.2,1,1}}\def\zpl at nospc{F}\fi
- \fi
- \if F\zpl at nospc
- \edef\zpl at dflt{\zpl at dflt WordSpace = \zpl at spcmag ,
- }
- \fi
- \def\zpl at scraw{pcap}\def\zpl at scrawN{smcp}
- \ifzpl at largesc\def\zpl at scraw{smcp}\def\zpl at scrawN{pcap}\fi
-
- %\zpl at cnt will be 0..2^8-1
- \edef\zpl at lst{}
- \ifnum\zpl at cnt>127 \edef\zpl at lst{8}\advance\zpl at cnt -128 \fi
- \ifnum\zpl at cnt>63 \edef\zpl at lst{7,\zpl at lst}\advance\zpl at cnt -64 \fi
- \ifnum\zpl at cnt>31 \edef\zpl at lst{6,\zpl at lst}\advance\zpl at cnt -32 \fi
- \ifnum\zpl at cnt>15 \edef\zpl at lst{5,\zpl at lst}\advance\zpl at cnt -16 \fi
- \ifnum\zpl at cnt>7 \edef\zpl at lst{4,\zpl at lst}\advance\zpl at cnt -8 \fi
- \ifnum\zpl at cnt>3 \edef\zpl at lst{3,\zpl at lst}\advance\zpl at cnt -4 \fi
- \ifnum\zpl at cnt>1 \edef\zpl at lst{2,\zpl at lst}\advance\zpl at cnt -2 \fi
- \ifnum\zpl at cnt>0 \edef\zpl at lst{1,\zpl at lst}\fi
- \ifthenelse{\not\equal{\zpl at lst}{}}
- {\edef\zpl at dflt{\zpl at dflt StylisticSet={\zpl at lst} ,
- }}{}
-
- \defaultfontfeatures{
- Ligatures = TeX ,
- Scale = \zpl at scale ,
- Extension = .otf ,
- SmallCapsFeatures={\ifzpl at scosf Numbers = OldStyle ,
- \fi RawFeature = -\zpl at scrawN;+\zpl at scraw }
- \ifluatex Renderer=Basic\fi ,
- \zpl at dflt ,
- RawFeature=-ss05 ,
- \zpl at defaultfeatures
- }
-
-\else % type1
- \fi % type1
-
-\ifzpl at 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 at 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 at math@alphabet\destyle\relax
- \addfontfeatures{VerticalPosition=Denominator}%
- }
- \DeclareRobustCommand{\nustyle}{%
- \not at math@alphabet\nustyle\relax
- \addfontfeatures{VerticalPosition=Numerator}%
- }
- \DeclareRobustCommand{\sustyle}{%
- \not at math@alphabet\sustyle\relax
- \addfontfeatures{VerticalPosition=Superior}%
- }
- \DeclareRobustCommand{\infstyle}{%
- \not at math@alphabet\infstyle\relax
- \addfontfeatures{VerticalPosition=Inferior}%
- }
-
- \let\sufigures\sustyle
- \let\nufigures\nustyle
- \let\infigures\infstyle
- \let\defigures\destyle
-
- \ifzpl at defaultsups %
- \else
- \RequirePackage{realscripts}
- \renewcommand\footnotemarkfont{\normalfont\sufigures}
- \fi
-% \ifzpl at KOMA
-% \setkomafont{footnotereference}{\normalfont\sustyle}
-% \setkomafont{footnotelabel}{\normalfont\sustyle}
-% \fi
-
- \renewcommand*{\textcircled}[1]{\hmode at 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 at notextnu\else\let\textnu=\textnumerator\fi
- \let\textnum\textnumerator
-\DeclareTextFontCommand{\textde}{\destyle}
- \let\textdenominator\textde
-\DeclareTextFontCommand{\textinf}{\instyle}
- \let\textinferior\textinf
-
-\newdimen\zpl at sixem\zpl at sixem6pt % for checking if a number refers to ex
-\newdimen\zpl at y \newdimen\zpl at x
-
-% convert numerical entry that may be multiple of ex (<6) or em value
-\def\zpl at toex#1{\zpl at x#1pt \ifdim\zpl at x<\z@\zpl at y-\zpl at x\else\zpl at y\zpl at x\fi \ifdim\zpl at y>\zpl at sixem \zpl at x\dimexpr
- 1pt * (\dimexpr #1pt\relax) / \dimexpr \zpl at xht pt\relax\relax\fi}
-
-\newdimen\zpl at tmpdima \newdimen\zpl at tmpdimb \newdimen\zpl at tmpdimc
-\newdimen\zpl at tmpdimd \newdimen\zpl at tmpdime \newdimen\zpl at tmpdimf
-\newdimen\zpl at dimA
-\newdimen\zpl at dimAA \newdimen\zpl at dimB \newdimen\zpl at dimBB
-\newdimen\zpl at dimC % vertical center
-% double cap letters for below bar, single cap for above
-
-\zpl at toex\zpl at sfrVC\zpl at dimC\zpl at x %Vertical center of fraction
-\zpl at toex\zpl at sfrTH\zpl at tmpdimb\zpl at x % bar thickness
-\zpl at tmpdime.5\zpl at tmpdimb % half bar thickness
-\zpl at toex\zpl at sfrVS\zpl at tmpdimc\zpl at x% vertical space
-\zpl at toex\zpl at deht\zpl at tmpdimd\zpl at x % height of unscaled figures
-\zpl at tmpdimd\zpl at sfrSC\zpl at tmpdimd % height of scaled figures
-\zpl at toex\zpl at debase\zpl at tmpdimf\zpl at x % unscaled baseline of de figures
-\zpl at toex\zpl at nubase\zpl at tmpdima\zpl at x % unscaled baseline of nu figures
-\zpl at tmpdima\zpl at sfrSC\zpl at tmpdima % scaled nu baseline
-\zpl at tmpdimf\zpl at sfrSC\zpl at tmpdimf % scaled de baseline
-\zpl at dimA\zpl at dimC
-\advance\zpl at dimA by \zpl at tmpdime % top of bar
-\zpl at dimAA\zpl at dimC
-\advance\zpl at dimAA by -\zpl at tmpdime % bottom of bar
-\zpl at dimB\zpl at dimA
-\advance\zpl at dimB by \zpl at tmpdimc % top figure baseline
-\advance\zpl at dimB by -\zpl at tmpdima
-\zpl at dimBB\zpl at dimAA
-\advance\zpl at dimBB by -\zpl at tmpdimc %
-\advance\zpl at dimBB by -\zpl at tmpdimd % bottom figure baseline
-\advance\zpl at dimBB by -\zpl at 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 at bgroup%
-\ooalign{%
- \setbox0=\hbox{\scalefont{\zpl at sfrSC}\nustyle#2}%
- \hfil \raise\strip at pt\zpl at dimB ex\box0\hfil \crcr%
- \leaders\hrule height \strip at pt\zpl at dimA ex depth -\strip at pt\zpl at dimAA ex\hfill \crcr%
- \setbox1=\hbox{\scalefont{\zpl at sfrSC}\destyle#3}%
- \hfil\raise\strip at pt\zpl at dimBB ex\box1\hfil}%
-\egroup}}
-}
-
-\AtEndPreamble{%
-\ifzpl at otf
- \ifzpl at lining
- \def\zpl at figurestyle{Lining}
- \else
- \def\zpl at figurestyle{OldStyle}
- \fi
- \ifzpl at tabular
- \def\zpl at figurealign{Monospaced}
- \else
- \def\zpl at figurealign{Proportional}
- \fi
-% \ifzpl at scosf
-% %\traceon
-% \setmainfont
-% [Numbers = {\zpl at figurealign,\zpl at figurestyle},
-% SmallCapsFeatures = { Letters=SmallCaps , Numbers = OldStyle }
-% ] {\zpl at base}
-%% \traceoff
-% \else
-% \setmainfont
-% [Numbers = {\zpl at figurealign,\zpl at figurestyle}
-% SmallCapsFeatures = { Letters=SmallCaps , }
-% ] {\zpl at base}
-% \fi
-%\traceon
-\setmainfont
- [Numbers = {Proportional , Lining },
- SmallCapsFeatures = { Letters = SmallCaps , Numbers = OldStyle }
- ] {TeXGyrePagellaX}
-
-
-% \let\zpl at sty\zpl at figurestyle
-% \if l\zpl at thmlin\def\zpl at sty{Lining}\fi
-% \newcommand{\thfamily}%{\@nameuse{zpl\zpl at figurestyle}%
-% {\addfontfeatures{%
-% Numbers={\zpl at figurealign,\zpl at sty} ,
-% RawFeature=+ss05}
-% \itshape} % for theorems
-% \ifzpl at sl\else\let\slshape=\thfamily\fi % change
-
-\else % type1
- \fi % type1
-% both
-%\ifzpl at KOMA
-% %\let\textsuperscript\textsu
-% \@ifpackageloaded{AB at authnote}{%
-% \renewcommand\AB at authnote[1]{\textsu{#1}}
-% \renewcommand\AB at affilnote[1]{\textsu{#1}}
-% }
-%\fi
-%both
-\ifzpl at thrm
- \@ifundefined{theoremstyle}{}{
- \theoremstyle{plain}
- \patchcmd{\th at 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 at 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
-
More information about the tex-live-commits
mailing list.