diff options
57 files changed, 1098 insertions, 123 deletions
diff --git a/Master/texmf-dist/doc/fonts/newpx/README b/Master/texmf-dist/doc/fonts/newpx/README index 25a0ef708e9..41b9a364cf0 100644 --- a/Master/texmf-dist/doc/fonts/newpx/README +++ b/Master/texmf-dist/doc/fonts/newpx/README @@ -1,10 +1,33 @@ 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.505 2022-01-30 +Current version: 1.51 2023-08-20 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.51 +1. Corrected the zplnumr tfm files so that numerator figures work as expected. +2. Corrected newpxtext.sty so that: + (i) removed the code for the useless option nofontspec; + (ii) removed a duplicate option handler for defaultfeatures; + (iii) limited the effect of defaultfeatures to the main font; + (iv) reworked the footnote code so that KOMA based documents work as expected; + (v) added option notextnu preventing a clash with babel/greek. +3. Added glyphs dotlessi.sc, dotlessj.sc, idotaccent.sc (with dot) and i.TRK (a copy of i) which is subbed for i in the Turkish localization. In smcp, i.TRK --> idotaccent.sc, dotlessi --> dotlessi.sc and dotlessj --> dotlessj.sc, and similarly in pcap. In c2sc, Idotaccent --> idotaccent.sc, and similarly in c2pc. Unlike i, i.TRK does not undergo any ligations, so that its dot is preserved. See TRK.fea for the localization feature which can be chosen after selecting Merge Feature Info in the FontForge file menu. The table it creates should be moved to the top of the tables, or at least ahead of c2sc, c2pc, smcp, pcap and the liga tables. +4. Corrected the glyph I.sc in bolditalic, removing spurious dot. +5. Added newpx.sty, which works in all latex engines, calling newpxtext.sty and newpxmath.sty as appropriate. +6. Added \textsfrac for building stacked fractions: \textfrac[2]{17}{32} renders somewhat like $2\frac{17}{32}. +7. Added a minzlt text font family that can serve as operators and for \mathrm, \mathit and so on. This allows newpxmath.sty to be loaded before the text font, whether it be [pdf]latex flavored newpxtext or a unicode text font. +8. Updated newpxmath to closer parity with newtxmath with modifications to the names of {C,c}olon related math symbols. Also, a fix for use with siunitx under option noOT1. +9. Modified newpxtext.sty to solve an issue with footnote markers in Title and \thanks. The key was to change the lines (recommended in the realscripts documentation dating back to 2016) +\renewcommand{\footnotemarkfont}{\normalfont} % for standard latex users +to +\renewcommand{\footnotemark}{\normalfont} +and +\setkomafont{footnotelabel}{\normalfont} % for KOMA users +to +\setkomafont{footnotereference}{\normalfont} + Changes in version 1.505 Corrected case of names of encoding files used for subs, sups, numr and dnom and modified newpx.map in a number of the affected items. diff --git a/Master/texmf-dist/doc/fonts/newpx/newpxdoc.pdf b/Master/texmf-dist/doc/fonts/newpx/newpxdoc.pdf Binary files differindex 43c321d28c1..9d997e4d451 100644 --- a/Master/texmf-dist/doc/fonts/newpx/newpxdoc.pdf +++ b/Master/texmf-dist/doc/fonts/newpx/newpxdoc.pdf diff --git a/Master/texmf-dist/doc/fonts/newpx/newpxdoc.tex b/Master/texmf-dist/doc/fonts/newpx/newpxdoc.tex index 5df5dbf6e3e..9a151f03392 100644 --- a/Master/texmf-dist/doc/fonts/newpx/newpxdoc.tex +++ b/Master/texmf-dist/doc/fonts/newpx/newpxdoc.tex @@ -1,4 +1,4 @@ -% !TEX TS-program = xelatex +% !TEX TS-program = lualatex \documentclass[11pt]{article} \usepackage[margin=1in]{geometry} \usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent @@ -34,11 +34,9 @@ %\usepackage[largesc,theoremfont]{newpxtext} \usepackage{trace} -\usepackage[theoremfont,trueslanted,scosf]{newpxtext2} +\usepackage[theoremfont,trueslanted,scosf]{newpxtext} \makeatletter -%\ifzpl@lining\show\foo\else\show\barf\fi \ifzpl@otf - %\setmonofont{Inconsolatazi4-Regular.otf}[Scale=MatchLowercase] \setmonofont{inconsolata}[Scale=MatchLowercase] \else \usepackage[T1]{fontenc} @@ -115,6 +113,19 @@ \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}\\ +\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 +\begin{verbatim} +\usepackage[scale=.98,varbb,p,osf]{newpx} +\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}. +\item +Version 1.51 brings {\tt newpxmath} essentially up to parity with {\tt newtxmath}, version 1.723. +\end{itemize} \textsc{Changes as of version 1.5}\\ {\tt newpxtext.sty} contains code that mostly works for both {\tt pdflatex} as well as {\tt XeLateX} and {\tt LuaLaTeX}, though there are some new features that work only with the last two. The precise differences will be spelled out below. Unless explicitly noted, macros and package options will function similarly for all LaTeX engines. %The goal of this new project is use his glyphs along with a few additions and with completely reworked metrics which are generally looser, but not as loose as Computer Modern math. The following small examples (double normal size) provide some idea of the extent of the changes. @@ -135,7 +146,7 @@ This package is meant to be a replacement for Young Ryu's {\tt pxfonts}---a com %\end{minipage} -This {\tt newpx} package differs from {\tt pxfonts} in the following ways: +The original {\tt newpx} package differed from {\tt pxfonts} in the following ways, all of which are preserved in the newest version: \begin{itemize} \item {\tt newpx} is split into separate text and math packages that do not need to be used in conjunction; @@ -162,14 +173,14 @@ braces and other delimiters are now larger and, I believe, more pleasing to olde \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. For a side by side comparison: {\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 \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. -\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 we 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 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.\\ @@ -198,9 +209,9 @@ to load the roman and typewriter text fonts at 95\% of normal size, and the sans \begin{verbatim} \usepackage[scaled=.95,helvratio=.96]{newpxtext} \end{verbatim} -load roman and typewriter text fonts at 95\% of normal size, and the sans serif (\textsf{Helvetica} clone) at scale $0.95*0.96$. +load roman and typewriter text fonts at 95\% of normal size, and the sans serif (\textsf{Helvetica} clone) at scale 0.95*0.96. -The option \texttt{osf} instructs the text fonts to use old-style figures \oldstylenums{1234567890} rather than the default lining figures $1234567890$. As of version $1.23$, {\tt newpxtext} loads initially with lining figures so the math package uses lining figures in math mode. The option {\tt osf} switches to old-style figures in text at the very end of the preamble, forcing the use of oldstyle figures in text, but not math. In previous versions, it was necessary to run +The option \texttt{osf} instructs the text fonts to use old-style figures \oldstylenums{1234567890} rather than the default lining figures \texttlf{1234567890}. As of version 1.23, {\tt newpxtext} loads initially with lining figures so the math package uses lining figures in math mode. The option {\tt osf} switches to old-style figures in text at the very end of the preamble, forcing the use of oldstyle figures in text, but not math. In previous versions, it was necessary to run \verb|\useosf| after loading math. This is no longer required, but does no harm. See the discussion in section 4 for further details. A similar macro \verb|\useproportional| makes proportional figures the default outside math mode. As of version 1.415, the new option {\tt nohelv} prevents the loading of the default Helvetica clone as the sans serif text font. If you use this option, you should load your preferred sans serif font, otherwise you will be left with the Computer Modern default, most likely in a metafont version if not using OT1 encoding. @@ -246,7 +257,103 @@ If you want full control, the options {\tt spacing, stretch, shrink} allow you t \end{verbatim} \textbf{Behavior under XeLaTeX and LuaLaTeX.}\\ Fontspec offers the {\tt WordSpace=} option for individual control of the space, stretch and shrink, with the value being either an ordered triple like \verb|{1.1,1,.8}| or a single number like {\tt .9}, the latter having the same effect as the triple \verb|{.9,.9,.9}|. These three numbers act as multipliers of {\tt space}, {\tt stretch} and {\tt shrink}. The option that you can set is {\tt spcfactor=}, entering either a number or a triple---e.g., {\tt spcfactor=1.1} or \verb|{1.1,1,.8}|. Note however that {\tt tighter} and {\tt looser} will have an effect if {\tt spcfactor} is not set, amounting to \verb|{\spcfactor={1,.625,1}| and \verb|{\spcfactor={1.2,1,1}| respectively. -. + +\subsection{Basic example preambles.} + +The examples below are unrealistically simple but do show the structure of the part of the preamble required to load {\tt newpx}. + +\textsc{I: Otf text, otf math (requires unicode engine)} + + +Supports an arbitrary otf math font with otf text using {\tt TeXGyreTermesX}. +\begin{verbatim} + % Without newpx package: + \usepackage[otfmath]{newpxtext} + \usepackage{unicode-math} %loads amsmath + \setmathfont{}[] %expects your input here for otf math font and options +% or, with newpx package: + \usepackage[otfmath]{newpx} % pass options to text package + \setmathfont{}[] %expects your input here for otf math font and options +\end{verbatim} +\textsc{Notes:} +\begin{itemize} +\item Your option list to {\tt newpx[text]} must include {\tt otfmath}, otherwise it will load {\tt newpxmath}. +\item With {\tt newpx}, you may specify some other otf text fonts. +\item After loading {\tt newpx}, you must load your chosen unicode math package with \verb|\setmathfont{}[]|. +\item +You do not need to load {\tt amsmath}: it is loaded by {\tt unicode-math}. +\item When using an otf math font, options to {\tt newpx} are passed only to {\tt newpxtext}. + +\item Babel, if used, must be specified before {\tt newpx[text]}, which loads {\tt fontspec}. +\item Polyglossia, if used, must be specified after loading {\tt newpx[text]}. +\end{itemize} + +\textsc{II: Otf text, type1 math (requires unicode engine)} + +Supports {\tt newpxmath} with an otf text font. +\begin{verbatim} +% Without newpx + \renewcommand*{\rmdefault}{zplTLF} % loads minimal version of text font for use in math + \usepackage[T1]{fontenc} % so operators can have accented letters + \usepackage[list of math options]{newpxmath} % + \usepackage[no-math]{fontspec} + \usepackage{} % the chosen otf text font package, or fontspec \setmainfont, etc +% or, using newpx, only for TeXGyrePagellaX + \renewcommand*{\rmdefault}{zplTLF} % loads minimal version of text font for use in math + \usepackage[T1]{fontenc} % so operators can have accented letters + \usepackage[list of text and mathoptions]{newpx} % options will be passed to text font package and newpxmath +\end{verbatim} +\textsc{Notes:} +\begin{itemize} +\item No special option requirements---this is the default case. +\item Babel, if used, must be specified before {\tt newpx[text]}, which loads {\tt fontspec}. +\item Polyglossia, if used, must be specified after loading {\tt newpx[text]}. +\end{itemize} + + + +\textsc{III: type1 text, type1 math (requires non-unicode engine)} + +In the olden days of [pdf]latex processing, {\tt newpx} was traditionally summoned with lines like +\begin{verbatim} +\usepackage[T1]{fontenc} +\usepackage[<list of text options>]{newpxtext} +\usepackage[<list of math options>]{newpxmath} +\end{verbatim} +which still works but is a bit less flexible than its modern form: +\begin{verbatim} +\renewcommand*{\rmdefault}{zplTLF}% minimal text family, Roman and Bold for math +\usepackage[T1]{fontenc} +\usepackage[<list of text and math options>]{newpx} +\end{verbatim} +which expands in the non-unicode case to +\begin{verbatim} +\renewcommand*{\rmdefault}{zplTLF}% minimal text family, Roman and Bold for math +\usepackage[T1]{fontenc} +\usepackage[<list of math options>]{newpxmath} +\usepackage[<list of text options>]{newpxtext} +\end{verbatim} +For this arrangement, the math package needs information about the text font currently in force and the current typewriter and, possibly, the current sans serif font. The default Latin Modern text family would most likely not work well here for use as operators, \verb|\mathbf|, \verb|\mathtt| and the like. Dealing with the math part first allows you the flexibility of choosing different text fonts for use in math than you will use for body text. +\begin{verbatim} +% Without newpx + \renewcommand*{\rmdefault}{zplTLF}% minimal text family, Roman and Bold for math + \usepackage[T1]{fontenc} + \usepackage[<list of math options>]{newpxmath} % options will be as passed from newpx + \usepackage{} % the chosen text package + % should load tt and sans math before math +% or, using newpx, where text font will be TeXGyrePagelleX + % should load tt and sans math before newpx + \renewcommand*{\rmdefault}{zplTLF}% minimal text family, Roman and Bold for math + \usepackage[T1]{fontenc} + \usepackage[<list of text and math options>]{newpx} +\end{verbatim} +\textsc{Notes:} + +\begin{itemize} +\item Babel, if used, must be specified before {\tt newpx[text]}. +\end{itemize} + +Note that with a unicode engine, it is not possible to load a type1 text font package unless you have created custom {\tt tu}-encoded support files. \section{Usage with {\tt babel}} You should normally load {\tt babel} before loading {\tt newpxtext} in order for {\tt babel} to function as expected. For example, using {\tt pdflatex}: @@ -263,11 +370,22 @@ You should normally load {\tt babel} before loading {\tt newpxtext} in order for % option vvarbb gives you stix blackboard bold \linespread{1.05} \end{verbatim} - +With {\tt newpx}, you could simplify this a bit. +\begin{verbatim} +\usepackage[greek.polutonico,english]{babel} +\usepackage[varqu,varl]{inconsolata} +\usepackage[T1]{fontenc} +% the next line makes text figures proportional, oldstyle, while math uses lining figures +\usepackage[theoremfont,trueslanted,largesc,tighter,p,osf,amsthm,vvarbb]{newpx} +% amsmath is loaded automatically, before amsthm +% option vvarbb gives you stix blackboard bold +\linespread{1.05} +\end{verbatim} + \section{Usage with Lua\LaTeX\ and Xe\LaTeX} -As far as I can tell, \textsf{newpxmath} works with both, but requires a very specific loading order and choice of options. Briefly, the math options must all be loaded prior to loading and using {\tt fontspec}. As of version 1.5, {\tt newpxtext} will load fontspec when processing with XeLaTeX or LuaLaTeX unless one or more of the options {\tt nofontspec}, {\tt type1} is specified. (If you specify the option {\tt no-math} to {\tt newpxtext}, it will pass that option to the {\tt fontspec} call. This should be done if {\tt fontspec} will not be expected to load an Opentype math font.) +As far as I can tell, \textsf{newpxmath} works with both, but requires a very specific loading order and choice of options. Briefly, the math options must all be loaded prior to loading and using {\tt fontspec}. As of version 1.5, {\tt newpxtext} will load {\tt fontspec} when processing with XeLaTeX or LuaLaTeX unless one option {\tt type1} is specified. (Option {\tt nofontspec} is no longer acted upon, having no proper function, as of version 1.506.) If you specify the option {\tt no-math} to {\tt newpxtext}, it will pass that option to the {\tt fontspec} call. This should be specified if {\tt fontspec} will not be expected to load an Opentype math font. -\textsc{Example I: TeXGyrePagellaX Opentype + Asana-Math (Opentype).} +\textsc{Example I: TeXGyrePagellaX Opentype + texgyrepagella-math (Opentype).} \begin{verbatim} %\usepackage[greek.polutonico,english]{babel} % if using babel % next line calls fontspec and loads TeXGyrePagellaX otf @@ -276,7 +394,9 @@ As far as I can tell, \textsf{newpxmath} works with both, but requires a very sp %\usepackage{polyglossia} % must load after fontspec, if using polyglossia % polyglossia setup commands \usepackage{unicode-math}% can't load type1 math fonts after this -\setmathfont{Asana-Math} +\setmathfont{texgyrepagella-math} +% \mathsf and \mathtt from Latin Modern +% operators and other \mathxx from TeXGyrePagellaX \end{verbatim} \textsc{Notes:} \begin{itemize} @@ -285,61 +405,89 @@ You do not need to load {\tt amsmath}: it is loaded by {\tt unicode-math}. \item Babel, if used, must be specified before {\tt newpxtext}, which loads {\tt fontspec}. \item Polyglossia, if used, must be specified after loading {\tt newpxtext}. \end{itemize} -\textsc{Example II: newpxtext type1 + Asana-Math (Opentype).} +With {\tt newpx}, there is a little simplification: \begin{verbatim} %\usepackage[greek.polutonico,english]{babel} % if using babel -% next line does not call fontspec, loads newpxtext type1 -\usepackage[type1,theoremfont,trueslanted,largesc,p,osf]{newpxtext} -\usepackage{fontspec} +% next line calls fontspec and loads TeXGyrePagellaX otf +\usepackage[theoremfont,trueslanted,largesc,p,osf]{newpx} +% set mono and sans opentype fonts %\usepackage{polyglossia} % must load after fontspec, if using polyglossia % polyglossia setup commands -\usepackage{unicode-math}% can't load type1 math fonts after this -\setmathfont{Asana-Math} +%\usepackage{unicode-math}% newpx loads unicode-math +\setmathfont{texgyrepagella-math} \end{verbatim} -\textsc{Notes:} -\begin{itemize} -\item The {\tt type1} option to {\tt newpxtext} prevents the package loading {\tt fontspec} so you must load it before loading {\tt unicode-math} and any opentype fonts. -\item -You do not need to load {\tt amsmath}: it is loaded by {\tt unicode-math}. -\item Babel, if used, must be specified before {\tt newpxtext}. -\item Polyglossia, if used, must be specified after loading {\tt fontspec}. -\end{itemize} -\textsc{Example III: TeXGyrePagellaX Opentype + newpxmath (type1) + polyglossia + other Opentype.} +%\textsc{Example II: newpxtext type1 + texgyrepagella-math (Opentype).} +%\begin{verbatim} +%%\usepackage[greek.polutonico,english]{babel} % if using babel +%% next line does not call fontspec, loads newpxtext type1 +%\usepackage[type1,theoremfont,trueslanted,largesc,p,osf]{newpxtext} +%\usepackage{fontspec} +%%\usepackage{polyglossia} % must load after fontspec, if using polyglossia +%% polyglossia setup commands +%\usepackage{unicode-math}% can't load type1 math fonts after this +%\setmathfont{texgyrepagella-math} +%\end{verbatim} +%\textsc{Notes:} +%\begin{itemize} +%\item The {\tt type1} option to {\tt newpxtext} prevents the package loading {\tt fontspec} so you must load it before loading {\tt unicode-math} and any opentype fonts. +%\item +%You do not need to load {\tt amsmath}: it is loaded by {\tt unicode-math}. +%\item Babel, if used, must be specified before {\tt newpxtext}. +%\item Polyglossia, if used, must be specified after loading {\tt fontspec}. +%\end{itemize} + +\textsc{Example II: TeXGyrePagellaX Opentype + newpxmath (type1) + polyglossia + other Opentype.} \begin{verbatim} -\renewcommand{\rmdefault}{zplTLF}% Roman and Bold Pagella for math mode +\renewcommand{\rmdefault}{zplTLF}% Roman and Bold PagellaX for math mode \usepackage[T1]{fontenc} % T1 is active encoding for use in math text -\usepackage[type1]{cabin}% used only by \mathsf, optional -\usepackage{amsmath} % must be loaded before amsthm if using amsthm -\usepackage{amsthm}% load before newpxmath -\usepackage[vvarbb]{newpxmath} +\usepackage[type1]{sourcesanspro}% used only by \mathsf, optional +% Next line loads amsmath, then loads amsthm +\usepackage[amsthm,vvarbb]{newpxmath} \usepackage[no-math]{newpxtext}% pass no-math option to fontspec % Fontspec will be loaded so that Opentype text fonts may be loaded -\usepackage{polyglossia} % must load after fontspec -\setdefaultlanguage[variant=american]{english} -\setotherlanguages{french,russian} -\newfontfamily{\cyrillicfont}[Scale=MatchLowercase]{cochineal} +% By default, TeXGyrePagellaX (otf) will be loaded +%\usepackage{polyglossia} % must load after fontspec +%\setdefaultlanguage[variant=american]{english} +%\setotherlanguages{french,russian} +%\newfontfamily{\cyrillicfont}[Scale=MatchLowercase]{cochineal} \end{verbatim} \textsc{Notes:} \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} However, if you wish to load {\tt amsthm}, load {\tt amsmath}, then {\tt amsthm} before {\tt newpxmath}. +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 type} option to {\tt cabin} is important, preventing it from loading {\tt fontspec}, which would lead to an {\tt option clash} error. +\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} +With {\tt newpx}, the above is equivalent to: +\begin{verbatim} +\renewcommand{\rmdefault}{zplTLF}% Roman and Bold PagellaX for math mode +\usepackage[T1]{fontenc} % T1 is active encoding for use in math text +\usepackage[type1]{sourcesanspro}% used only by \mathsf, optional +% Next line loads amsmath, then loads amsthm +\usepackage[no-math,amsthm,vvarbb]{newpx} +% Fontspec will be loaded so that Opentype text fonts may be loaded +% By default, TeXGyrePagellaX (otf) will be loaded +\usepackage{polyglossia} % must load after fontspec +\setdefaultlanguage[variant=american]{english} +\setotherlanguages{french,russian} +\newfontfamily{\cyrillicfont}[Scale=MatchLowercase]{cochineal} +\end{verbatim} -\textsc{Example IV: newpxtext type1 + newpxmath (type1) + polyglossia + other Opentype.} +\textsc{Example III: newpxtext type1 + newpxmath (type1) + polyglossia + other Opentype.} \begin{verbatim} \renewcommand{\rmdefault}{zplTLF}% Roman and Bold Pagella for math mode \usepackage[T1]{fontenc} % T1 is active encoding for use in math text -\usepackage[type1]{cabin}% used only by \mathsf, optional -\usepackage{amsmath} % must be loaded before amsthm if using amsthm -\usepackage{amsthm}% load before newpxmath -\usepackage[vvarbb]{newpxmath} -\usepackage[no-math]{newpxtext}% pass no-math option to fontspec -% Fontspec will be loaded so that Opentype text fonts may be loaded +\usepackage[type1]{sourcesanspro}% used only by \mathsf, optional +%Uncomment either the following line +%\usepackage[amsthm,vvarbb,no-math]{newpx} +%or the next pair of lines +%\usepackage[amsthm,vvarbb]{newpxmath} +%\usepackage[no-math]{newpxtext}% pass no-math option to fontspec + +% Other Opentype text fonts may be loaded here \usepackage{polyglossia} % must load after fontspec \setdefaultlanguage[variant=american]{english} \setotherlanguages{french,russian} @@ -347,20 +495,19 @@ You do not need to load {\tt amsmath}: it is loaded by {\tt newpxmath} However, \end{verbatim} \textsc{Notes:} \begin{itemize} -\item The {\tt type1} option to {\tt newpxtext} prevents the package loading {\tt fontspec} so you must load it before loading {\tt unicode-math} and any opentype fonts. \item You do not need to load {\tt amsmath}: it is loaded by {\tt unicode-math}. \item Babel, if used, must be specified before {\tt newpxtext}. -\item Polyglossia, if used, must be specified after loading {\tt fontspec}. +\item Polyglossia, if used, must be specified after loading {\tt newpx [text]}. \end{itemize} -%\textsc{Example V: newpxtext tfm + Asana-Math.} +%\textsc{Example V: newpxtext tfm + texgyrepagella-math.} Be aware that some text packages (e.g., {\tt cabin}) may contain a line like \begin{verbatim} \RequirePackage{fontspec} \end{verbatim} -which would prevent (``option clash'' error) a subsequent +which would provoke an ``option clash'' error with a subsequent \begin{verbatim} \usepackage[no-math]{fontspec} \end{verbatim} @@ -368,7 +515,7 @@ unless suppressed by an appropriate option. E.g., \begin{verbatim} \usepackage[type1]{cabin} \end{verbatim} -prevents the problem with the {\tt cabin} package. +prevents the problem with the {\tt cabin} package. (Not working in the version of {\tt cabin.sty} dated 12/25/2022.) \iffalse Consider three scenarios for using some part of {\tt newpx} with one of XeLaTeX, LuaLaTeX. @@ -378,7 +525,7 @@ prevents the problem with the {\tt cabin} package. \usepackage[T1]{fontenc} % affects only \mathrm, \mathbf etc \usepackage{newpxtext} \usepackage[scaled=.85]{beramono}% used only by \mathtt, optional -\usepackage[type1]{cabin}% used only by \mathsf, optional +\usepackage[type1]{sourcesanspro}% used only by \mathsf, optional \usepackage{amsmath} % must be loaded before amsthm, if using amsthm \usepackage{amsthm}% load before newpxmath \usepackage[vvarbb]{newpxmath} @@ -397,7 +544,7 @@ While the math font options must be specified before {\tt fontspec}, be aware of \usepackage[T1]{fontenc} % affects only \mathrm, \mathbf etc \renewcommand{\rmdefault}{zplTLF}% Roman font for use in math mode \usepackage[scaled=.85]{beramono}% used only by \mathtt, optional -\usepackage[type1]{cabin}% used only by \mathsf, optional +\usepackage[type1]{sourcesanspro}% used only by \mathsf, optional \usepackage{amsmath} % must be loaded before amsthm \usepackage{amsthm}% load before newpxmath \usepackage[vvarbb]{newpxmath} @@ -413,7 +560,7 @@ While the math font options must be specified before {\tt fontspec}, be aware of \begin{verbatim} \renewcommand{\rmdefault}{zplTLF}% Roman and Bold for use in math mode \usepackage[T1]{fontenc} % T1 is active encoding for use in math text -\usepackage[type1]{cabin}% used only by \mathsf, optional +\usepackage[type1]{sourcesanspro}% used only by \mathsf, optional \usepackage{amsmath} % must be loaded before amsthm \usepackage{amsthm}% load before newpxmath \usepackage[vvarbb]{newpxmath} @@ -426,13 +573,17 @@ While the math font options must be specified before {\tt fontspec}, be aware of \end{verbatim} \fi -Previous to version 1.5, the preceding pages of this document were processed using {\tt pdflatex}, which was the only engine supported by {\tt newpxtext.sty}. As of version $1.5$, XeLaTeX and LuaLaTeX are also supported and the entire document is now processes by XeLaTeX. All {\tt newpxtext} options and macros formerly limited to {\tt pdflatex} have been modified and now work essentially the same under both unicode engines, though the output may not always be precisely the same as with {\tt pdflatex}. There are some macros and options available under unicode engines that go beyond what can be done under {\tt pdflatex}. +Previous to version 1.5, the preceding pages of this document were processed using {\tt pdflatex}, which was the only engine supported by {\tt newpxtext.sty}. As of version 1.5, XeLaTeX and LuaLaTeX are also supported and the entire document is now processes by LuaLaTeX. All {\tt newpxtext} options and macros formerly limited to {\tt pdflatex} have been modified and now work essentially the same under both unicode engines, though the output may not always be precisely the same as with {\tt pdflatex}. There are some macros and options available under unicode engines that go beyond what can be done under {\tt pdflatex}. \textsc{Modified Macros and Options:} \begin{itemize} \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: +\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. diff --git a/Master/texmf-dist/fonts/afm/public/newpx/zplb.afm b/Master/texmf-dist/fonts/afm/public/newpx/zplb.afm index f55d289d150..5afc815f060 100644 --- a/Master/texmf-dist/fonts/afm/public/newpx/zplb.afm +++ b/Master/texmf-dist/fonts/afm/public/newpx/zplb.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 -Comment Generated by FontForge 20201107 -Comment Creation Date: Thu Dec 16 17:40:47 2021 +Comment Generated by FontForge 20230101 +Comment Creation Date: Fri Aug 18 17:36:50 2023 FontName TeXGyrePagellaX-Bold FullName TeXGyrePagellaX-Bold FamilyName TeXGyrePagellaX @@ -20,7 +20,7 @@ CapHeight 678 XHeight 471 Ascender 650 Descender -266 -StartCharMetrics 1429 +StartCharMetrics 1452 C 0 ; WX 250 ; N space ; B 0 0 0 0 ; C 1 ; WX 278 ; N exclam ; B 63 -12 219 688 ; C 2 ; WX 402 ; N quotedbl ; B 22 376 380 695 ; @@ -1450,6 +1450,29 @@ C -1 ; WX 511 ; N yhookabove.sc ; B 25 -2 496 661 ; C -1 ; WX 516 ; N ytilde.sc ; B 25 -2 501 687 ; C -1 ; WX 936 ; N germandbls.sc.ss06 ; B 39 -12 902 488 ; C -1 ; WX 771 ; N uni1E9E.c2sc ; B 22 -17 726 532 ; +C -1 ; WX 320 ; N dotlessi.sc ; B 41 -2 283 478 ; +C -1 ; WX 319 ; N dotlessj.sc ; B 8 -150 283 478 ; +C -1 ; WX 320 ; N idotaccent.sc ; B 41 -2 283 691 ; +C -1 ; WX 333 ; N i.TRK ; B 34 -3 298 706 ; +C -1 ; WX 360 ; N section.sups ; B 20 203 341 810 ; +C -1 ; WX 453 ; N paragraph.sups ; B 13 240 426 802 ; +C -1 ; WX 419 ; N dblverticalbar.sups ; B 116 271 303 827 ; +C -1 ; WX 349 ; N dagger.sups ; B 19 343 330 802 ; +C -1 ; WX 343 ; N daggerdbl.sups ; B 21 177 322 802 ; +C -1 ; WX 345 ; N asterisk.math.sups ; B 31 362 315 659 ; +C -1 ; WX 310 ; N imacron.alt.sc ; B 41 -2 281 635 ; +C -1 ; WX 630 ; N h_uni0303.sc ; B 39 -2 638 665 ; +C -1 ; WX 626 ; N ubrevebelowinverted.sc ; B 33 -211 604 478 ; +C -1 ; WX 460 ; N l_uni0303.sc ; B 41 -2 476 682 ; +C -1 ; WX 525 ; N tdieresis.sc ; B 27 -2 503 676 ; +C -1 ; WX 525 ; N t_uni0303.sc ; B 27 -2 503 682 ; +C -1 ; WX 493 ; N ereversed.sc ; B 41 -2 459 478 ; +C -1 ; WX 641 ; N aogonekacute.sc ; B 31 -176 614 711 ; +C -1 ; WX 310 ; N iogonekacute.sc ; B 41 -176 305 711 ; +C -1 ; WX 310 ; N jacute.sc ; B 8 -150 308 711 ; +C -1 ; WX 675 ; N oogonekacute.sc ; B 47 -176 633 711 ; +C -1 ; WX 760 ; N orogate.sc ; B 44 -199 597 671 ; +C -1 ; WX 499 ; N eogonekacute.sc ; B 41 -176 476 711 ; EndCharMetrics StartKernData StartKernPairs 17005 diff --git a/Master/texmf-dist/fonts/afm/public/newpx/zplbi.afm b/Master/texmf-dist/fonts/afm/public/newpx/zplbi.afm index dbb0beac115..fa69fc4d3c6 100644 --- a/Master/texmf-dist/fonts/afm/public/newpx/zplbi.afm +++ b/Master/texmf-dist/fonts/afm/public/newpx/zplbi.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 -Comment Generated by FontForge 20201107 -Comment Creation Date: Thu Dec 16 18:07:19 2021 +Comment Generated by FontForge 20230101 +Comment Creation Date: Fri Aug 18 18:45:03 2023 FontName TeXGyrePagellaX-BoldItalic FullName TeXGyrePagellaX-BoldItalic FamilyName TeXGyrePagellaX @@ -20,7 +20,7 @@ CapHeight 678 XHeight 452 Ascender 646 Descender -250 -StartCharMetrics 1430 +StartCharMetrics 1453 C 0 ; WX 250 ; N space ; B 0 0 0 0 ; C 1 ; WX 333 ; N exclam ; B 58 -17 322 695 ; C 2 ; WX 500 ; N quotedbl ; B 137 467 493 720 ; @@ -1249,7 +1249,7 @@ C -1 ; WX 487 ; N e.sc ; B 21 -8 471 483 ; C -1 ; WX 442 ; N f.sc ; B 10 -6 454 482 ; C -1 ; WX 579 ; N g.sc ; B 62 -17 548 493 ; C -1 ; WX 611 ; N h.sc ; B 6 -7 631 482 ; -C -1 ; WX 313 ; N i.sc ; B 13 -6 316 634 ; +C -1 ; WX 313 ; N i.sc ; B 13 -6 316 471 ; C -1 ; WX 314 ; N j.sc ; B -5 -150 320 481 ; C -1 ; WX 572 ; N k.sc ; B 7 -5 575 482 ; C -1 ; WX 479 ; N l.sc ; B 31 -8 445 482 ; @@ -1451,6 +1451,29 @@ C -1 ; WX 734 ; N uni1E9E.c2sc ; B 21 -21 710 538 ; C -1 ; WX 323 ; N icaron.sc ; B 13 -3 382 626 ; C -1 ; WX 619 ; N udieresisgrave.sc ; B 69 -12 638 773 ; C -1 ; WX 341 ; N idieresisacute.sc ; B 13 -3 372 773 ; +C -1 ; WX 313 ; N dotlessi.sc ; B 13 -6 316 471 ; +C -1 ; WX 314 ; N dotlessj.sc ; B -5 -150 320 481 ; +C -1 ; WX 313 ; N idotaccent.sc ; B 13 -6 316 634 ; +C -1 ; WX 333 ; N i.TRK ; B 26 -17 312 695 ; +C -1 ; WX 398 ; N section.sups ; B 31 246 359 810 ; +C -1 ; WX 399 ; N paragraph.sups ; B 9 211 448 801 ; +C -1 ; WX 419 ; N dblverticalbar.sups ; B 119 272 306 829 ; +C -1 ; WX 378 ; N dagger.sups ; B 45 341 341 804 ; +C -1 ; WX 376 ; N daggerdbl.sups ; B 22 243 364 809 ; +C -1 ; WX 360 ; N asterisk.math.sups ; B 70 362 354 659 ; +C -1 ; WX 307 ; N imacron.alt.sc ; B 13 -6 342 644 ; +C -1 ; WX 612 ; N h_uni0303.sc ; B 6 -7 631 652 ; +C -1 ; WX 599 ; N ubrevebelowinverted.sc ; B 23 -154 576 486 ; +C -1 ; WX 461 ; N l_uni0303.sc ; B 31 -8 510 652 ; +C -1 ; WX 492 ; N tdieresis.sc ; B 51 -7 515 663 ; +C -1 ; WX 494 ; N t_uni0303.sc ; B 51 -7 515 652 ; +C -1 ; WX 476 ; N ereversed.sc ; B -1 -8 487 482 ; +C -1 ; WX 541 ; N aogonekacute.sc ; B -9 -184 504 634 ; +C -1 ; WX 306 ; N iogonekacute.sc ; B 13 -184 348 634 ; +C -1 ; WX 310 ; N jacute.sc ; B -5 -150 348 634 ; +C -1 ; WX 587 ; N oogonekacute.sc ; B 65 -184 613 634 ; +C -1 ; WX 731 ; N orogate.sc ; B 26 -174 592 639 ; +C -1 ; WX 471 ; N eogonekacute.sc ; B 21 -184 481 634 ; EndCharMetrics StartKernData StartKernPairs 12463 diff --git a/Master/texmf-dist/fonts/afm/public/newpx/zplbsl.afm b/Master/texmf-dist/fonts/afm/public/newpx/zplbsl.afm index 75c12d529b9..15249b84436 100644 --- a/Master/texmf-dist/fonts/afm/public/newpx/zplbsl.afm +++ b/Master/texmf-dist/fonts/afm/public/newpx/zplbsl.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 -Comment Generated by FontForge 20201107 -Comment Creation Date: Thu Dec 16 15:07:03 2021 +Comment Generated by FontForge 20230101 +Comment Creation Date: Fri Aug 18 17:55:27 2023 FontName TeXGyrePagellaX-BoldSlanted FullName TeXGyrePagellaX-BoldSlanted FamilyName TeXGyrePagellaX @@ -20,7 +20,7 @@ CapHeight 678 XHeight 471 Ascender 650 Descender -266 -StartCharMetrics 1429 +StartCharMetrics 1454 C 0 ; WX 250 ; N space ; B 0 0 0 0 ; C 1 ; WX 278 ; N exclam ; B 72 -12 340 688 ; C 2 ; WX 402 ; N quotedbl ; B 131 376 491 695 ; @@ -1450,6 +1450,31 @@ C -1 ; WX 485 ; N yhookabove.sc ; B 83 -2 565 661 ; C -1 ; WX 490 ; N ytilde.sc ; B 83 -2 570 613 ; C -1 ; WX 936 ; N germandbls.sc.ss06 ; B 44 -12 945 488 ; C -1 ; WX 771 ; N uni1E9E.c2sc ; B 22 -17 768 532 ; +C -1 ; WX 320 ; N dotlessi.sc ; B 41 -2 367 478 ; +C -1 ; WX 319 ; N dotlessj.sc ; B -18 -150 367 478 ; +C -1 ; WX 320 ; N idotaccent.sc ; B 41 -2 367 691 ; +C -1 ; WX 333 ; N i.TRK ; B 33 -3 347 706 ; +C -1 ; WX 360 ; N section.sups ; B 76 203 444 810 ; +C -1 ; WX 453 ; N paragraph.sups ; B 134 240 567 802 ; +C -1 ; WX 419 ; N dblverticalbar.sups ; B 164 271 449 827 ; +C -1 ; WX 349 ; N dagger.sups ; B 122 343 446 802 ; +C -1 ; WX 343 ; N daggerdbl.sups ; B 75 177 440 802 ; +C -1 ; WX 345 ; N asterisk.math.sups ; B 112 362 403 659 ; +C -1 ; WX 326 ; N imacron.alt.sc ; B 42 -3 398 669 ; +C -1 ; WX 663 ; N h_uni0303.sc ; B 39 -3 708 679 ; +C -1 ; WX 626 ; N ubrevebelowinverted.sc ; B 111 -211 688 478 ; +C -1 ; WX 484 ; N l_uni0303.sc ; B 66 -3 482 697 ; +C -1 ; WX 517 ; N tdieresis.sc ; B 86 -2 588 701 ; +C -1 ; WX 517 ; N t_uni0303.sc ; B 86 -2 588 697 ; +C -1 ; WX 484 ; N ereversed.sc ; B 54 -3 544 481 ; +C -1 ; WX 622 ; N aogonekacute.sc ; B 31 -263 599 728 ; +C -1 ; WX 326 ; N iogonekacute.sc ; B 20 -263 441 728 ; +C -1 ; WX 326 ; N jacute.sc ; B -23 -147 442 728 ; +C -1 ; WX 673 ; N oogonekacute.sc ; B 82 -263 677 728 ; +C -1 ; WX 800 ; N orogate.sc ; B 82 -199 677 671 ; +C -1 ; WX 484 ; N eogonekacute.sc ; B 49 -176 534 728 ; +C -1 ; WX 1000 ; N NameMe.1452 ; B 0 0 0 0 ; +C -1 ; WX 1000 ; N NameMe.1453 ; B 0 0 0 0 ; EndCharMetrics StartKernData StartKernPairs 11884 diff --git a/Master/texmf-dist/fonts/afm/public/newpx/zplr.afm b/Master/texmf-dist/fonts/afm/public/newpx/zplr.afm index 6eed0b3f83f..1a13710697a 100644 --- a/Master/texmf-dist/fonts/afm/public/newpx/zplr.afm +++ b/Master/texmf-dist/fonts/afm/public/newpx/zplr.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 -Comment Generated by FontForge 20201107 -Comment Creation Date: Fri Dec 24 14:28:16 2021 +Comment Generated by FontForge 20230101 +Comment Creation Date: Fri Aug 18 17:39:34 2023 FontName TeXGyrePagellaX-Regular FullName TeXGyrePagellaX-Regular FamilyName TeXGyrePagellaX @@ -20,7 +20,7 @@ CapHeight 700 XHeight 469 Ascender 662 Descender -269 -StartCharMetrics 1460 +StartCharMetrics 1482 C 0 ; WX 250 ; N space ; B 0 0 0 0 ; C 1 ; WX 278 ; N exclam ; B 81 -5 197 694 ; C 2 ; WX 371 ; N quotedbl ; B 52 469 318 709 ; @@ -1478,9 +1478,31 @@ C -1 ; WX 507 ; N yhookabove.sc ; B 21 -2 488 665 ; C -1 ; WX 507 ; N ytilde.sc ; B 21 -2 488 670 ; C -1 ; WX 802 ; N germandbls.sc.ss06 ; B 31 -14 777 498 ; C -1 ; WX 608 ; N uni1E9E.c2sc ; B 30 -14 580 517 ; -C -1 ; WX 1026 ; N NameMe.1457 ; B 0 0 0 0 ; -C -1 ; WX 1026 ; N NameMe.1458 ; B 0 0 0 0 ; +C -1 ; WX 271 ; N dotlessi.sc ; B 30 -2 246 486 ; +C -1 ; WX 268 ; N dotlessj.sc ; B 5 -137 243 486 ; C -1 ; WX 592 ; N agrave.sc ; B 25 -2 567 702 ; +C -1 ; WX 266 ; N idotaccent.sc ; B 28 -3 239 642 ; +C -1 ; WX 291 ; N i.TRK ; B 21 -3 271 687 ; +C -1 ; WX 351 ; N section.sups ; B 17 209 329 753 ; +C -1 ; WX 436 ; N paragraph.sups ; B 25 269 412 765 ; +C -1 ; WX 409 ; N dblverticalbar.sups ; B 142 220 267 763 ; +C -1 ; WX 336 ; N dagger.sups ; B 22 335 315 744 ; +C -1 ; WX 338 ; N daggerdbl.sups ; B 22 188 317 744 ; +C -1 ; WX 310 ; N asterisk.math.sups ; B 26 351 285 605 ; +C -1 ; WX 266 ; N imacron.alt.sc ; B 30 -2 246 619 ; +C -1 ; WX 614 ; N h_uni0303.sc ; B 28 -3 586 629 ; +C -1 ; WX 599 ; N ubrevebelowinverted.sc ; B 23 -154 576 486 ; +C -1 ; WX 481 ; N l_uni0303.sc ; B 29 -3 455 645 ; +C -1 ; WX 466 ; N tdieresis.sc ; B 13 -3 451 642 ; +C -1 ; WX 463 ; N t_uni0303.sc ; B 13 -3 451 645 ; +C -1 ; WX 469 ; N ereversed.sc ; B 30 -2 433 486 ; +C -1 ; WX 606 ; N aogonekacute.sc ; B 25 -176 581 697 ; +C -1 ; WX 282 ; N iogonekacute.sc ; B 30 -176 268 697 ; +C -1 ; WX 264 ; N jacute.sc ; B 5 -137 266 697 ; +C -1 ; WX 587 ; N oogonekacute.sc ; B 30 -176 594 697 ; +C -1 ; WX 731 ; N orogate.sc ; B 26 -174 592 639 ; +C -1 ; WX 576 ; N amacron.sc ; B 25 -2 549 619 ; +C -1 ; WX 471 ; N eogonekacute.sc ; B 29 -263 445 714 ; EndCharMetrics StartKernData StartKernPairs 17424 diff --git a/Master/texmf-dist/fonts/afm/public/newpx/zplri.afm b/Master/texmf-dist/fonts/afm/public/newpx/zplri.afm index 1aaca4fd58d..6cc2c568419 100644 --- a/Master/texmf-dist/fonts/afm/public/newpx/zplri.afm +++ b/Master/texmf-dist/fonts/afm/public/newpx/zplri.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 -Comment Generated by FontForge 20201107 -Comment Creation Date: Thu Dec 16 17:57:01 2021 +Comment Generated by FontForge 20230101 +Comment Creation Date: Fri Aug 18 18:12:40 2023 FontName TeXGyrePagellaX-Italic FullName TeXGyrePagellaX-Italic FamilyName TeXGyrePagellaX @@ -20,7 +20,7 @@ CapHeight 700 XHeight 529 Ascender 642 Descender -260 -StartCharMetrics 1462 +StartCharMetrics 1485 C 0 ; WX 250 ; N space ; B 0 0 0 0 ; C 1 ; WX 333 ; N exclam ; B 76 -8 292 733 ; C 2 ; WX 500 ; N quotedbl ; B 140 508 455 733 ; @@ -1483,6 +1483,29 @@ C -1 ; WX 493 ; N ytilde.sc ; B 48 -6 488 616 ; C -1 ; WX 651 ; N germandbls.sc ; B 15 -20 664 522 ; C -1 ; WX 826 ; N germandbls.sc.ss06 ; B 28 -19 794 501 ; C -1 ; WX 651 ; N uni1E9E.c2sc ; B 15 -20 664 522 ; +C -1 ; WX 270 ; N dotlessi.sc ; B 18 -6 274 489 ; +C -1 ; WX 268 ; N dotlessj.sc ; B -10 -149 275 489 ; +C -1 ; WX 270 ; N idotaccent.sc ; B 18 -6 274 623 ; +C -1 ; WX 278 ; N i.TRK ; B 34 -9 264 710 ; +C -1 ; WX 354 ; N section.sups ; B 9 200 329 817 ; +C -1 ; WX 361 ; N paragraph.sups ; B 22 197 436 808 ; +C -1 ; WX 413 ; N dblverticalbar.sups ; B 146 280 267 836 ; +C -1 ; WX 339 ; N dagger.sups ; B 32 332 319 808 ; +C -1 ; WX 335 ; N daggerdbl.sups ; B 7 238 331 808 ; +C -1 ; WX 326 ; N asterisk.math.sups ; B 66 378 325 649 ; +C -1 ; WX 266 ; N imacron.alt.sc ; B 18 -6 287 619 ; +C -1 ; WX 597 ; N h_uni0303.sc ; B 11 -6 594 659 ; +C -1 ; WX 622 ; N ubrevebelowinverted.sc ; B 72 -154 628 490 ; +C -1 ; WX 481 ; N l_uni0303.sc ; B 24 -7 457 659 ; +C -1 ; WX 476 ; N tdieresis.sc ; B 48 -4 495 642 ; +C -1 ; WX 473 ; N t_uni0303.sc ; B 48 -4 495 665 ; +C -1 ; WX 460 ; N ereversed.sc ; B 2 -8 466 490 ; +C -1 ; WX 529 ; N aogonekacute.sc ; B 0 -183 493 627 ; +C -1 ; WX 282 ; N iogonekacute.sc ; B 18 -183 323 627 ; +C -1 ; WX 264 ; N jacute.sc ; B -10 -149 313 627 ; +C -1 ; WX 587 ; N oogonekacute.sc ; B 48 -183 567 627 ; +C -1 ; WX 731 ; N orogate.sc ; B 26 -174 592 639 ; +C -1 ; WX 471 ; N eogonekacute.sc ; B 33 -183 443 627 ; EndCharMetrics StartKernData StartKernPairs 17167 diff --git a/Master/texmf-dist/fonts/afm/public/newpx/zplrsl.afm b/Master/texmf-dist/fonts/afm/public/newpx/zplrsl.afm index c29af0f95ab..1cdac4d0f85 100644 --- a/Master/texmf-dist/fonts/afm/public/newpx/zplrsl.afm +++ b/Master/texmf-dist/fonts/afm/public/newpx/zplrsl.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 -Comment Generated by FontForge 20201107 -Comment Creation Date: Wed Dec 15 17:54:36 2021 +Comment Generated by FontForge 20230101 +Comment Creation Date: Fri Aug 18 17:06:58 2023 FontName TeXGyrePagellaX-Slanted FullName TeXGyrePagellaX-Slanted FamilyName TeXGyrePagellaX @@ -20,7 +20,7 @@ CapHeight 700 XHeight 469 Ascender 662 Descender -269 -StartCharMetrics 1459 +StartCharMetrics 1483 C 0 ; WX 250 ; N space ; B 0 0 0 0 ; C 1 ; WX 278 ; N exclam ; B 89 -5 316 694 ; C 2 ; WX 371 ; N quotedbl ; B 168 469 437 709 ; @@ -1320,9 +1320,9 @@ C -1 ; WX 573 ; N ocircumflex.sc ; B -8 -14 549 701 ; C -1 ; WX 573 ; N otilde.sc ; B -6 -14 552 670 ; C -1 ; WX 614 ; N odieresis.sc ; B -5 -14 593 667 ; C -1 ; WX 644 ; N oslash.sc ; B -14 -14 649 498 ; -C -1 ; WX 551 ; N ugrave.sc ; B 28 -15 564 702 ; -C -1 ; WX 551 ; N uacute.sc ; B 28 -15 564 702 ; -C -1 ; WX 551 ; N ucircumflex.sc ; B 28 -15 564 701 ; +C -1 ; WX 551 ; N ugrave.sc ; B 28 -14 564 702 ; +C -1 ; WX 551 ; N uacute.sc ; B 28 -14 564 702 ; +C -1 ; WX 551 ; N ucircumflex.sc ; B 28 -14 564 701 ; C -1 ; WX 593 ; N udieresis.sc ; B 31 -14 609 667 ; C -1 ; WX 468 ; N yacute.sc ; B 22 -2 497 702 ; C -1 ; WX 445 ; N thorn.sc ; B -22 -2 432 486 ; @@ -1375,10 +1375,10 @@ C -1 ; WX 388 ; N scaron.sc ; B -36 -14 416 701 ; C -1 ; WX 462 ; N tcedilla.sc ; B 53 -158 507 487 ; C -1 ; WX 444 ; N tcaron.sc ; B 20 -2 456 701 ; C -1 ; WX 551 ; N utilde.sc ; B 31 -14 567 670 ; -C -1 ; WX 551 ; N umacron.sc ; B 33 -15 569 644 ; +C -1 ; WX 551 ; N umacron.sc ; B 33 -14 569 644 ; C -1 ; WX 565 ; N ubreve.sc ; B 29 -14 579 696 ; C -1 ; WX 568 ; N uring.sc ; B 32 -14 585 660 ; -C -1 ; WX 551 ; N uhungarumlaut.sc ; B 28 -15 626 708 ; +C -1 ; WX 551 ; N uhungarumlaut.sc ; B 28 -14 626 708 ; C -1 ; WX 571 ; N uogonek.sc ; B 62 -176 617 486 ; C -1 ; WX 749 ; N wcircumflex.sc ; B 25 -6 763 701 ; C -1 ; WX 482 ; N ycircumflex.sc ; B 22 -2 497 701 ; @@ -1392,7 +1392,7 @@ C -1 ; WX 551 ; N uhorn.sc ; B 42 -14 616 549 ; C -1 ; WX 566 ; N acaron.sc ; B -52 -2 505 701 ; C -1 ; WX 246 ; N icaron.sc ; B -47 -2 342 701 ; C -1 ; WX 573 ; N ocaron.sc ; B -8 -14 549 701 ; -C -1 ; WX 551 ; N ucaron.sc ; B 28 -15 564 701 ; +C -1 ; WX 551 ; N ucaron.sc ; B 28 -14 564 701 ; C -1 ; WX 593 ; N udieresisacute.sc ; B 24 -14 602 748 ; C -1 ; WX 593 ; N udieresiscaron.sc ; B 24 -14 602 747 ; C -1 ; WX 593 ; N udieresisgrave.sc ; B 24 -14 602 748 ; @@ -1480,6 +1480,30 @@ C -1 ; WX 481 ; N ytilde.sc ; B 25 -2 500 670 ; C -1 ; WX 776 ; N germandbls.sc.ss06 ; B -18 -14 765 498 ; C -1 ; WX 582 ; N uni1E9E.c2sc ; B -30 -14 588 517 ; C -1 ; WX 566 ; N agrave.sc ; B -52 -2 495 702 ; +C -1 ; WX 271 ; N dotlessi.sc ; B 30 -2 332 486 ; +C -1 ; WX 268 ; N dotlessj.sc ; B -16 -137 329 486 ; +C -1 ; WX 266 ; N idotaccent.sc ; B 27 -3 325 642 ; +C -1 ; WX 291 ; N i.TRK ; B 20 -3 309 687 ; +C -1 ; WX 351 ; N section.sups ; B 74 209 420 753 ; +C -1 ; WX 436 ; N paragraph.sups ; B 141 269 547 765 ; +C -1 ; WX 409 ; N dblverticalbar.sups ; B 181 220 402 763 ; +C -1 ; WX 336 ; N dagger.sups ; B 120 335 422 744 ; +C -1 ; WX 338 ; N daggerdbl.sups ; B 77 188 427 744 ; +C -1 ; WX 310 ; N asterisk.math.sups ; B 102 351 373 605 ; +C -1 ; WX 266 ; N imacron.alt.sc ; B 30 -2 344 619 ; +C -1 ; WX 614 ; N h_uni0303.sc ; B 27 -3 666 629 ; +C -1 ; WX 636 ; N ubrevebelowinverted.sc ; B 30 -154 697 486 ; +C -1 ; WX 481 ; N l_uni0303.sc ; B 60 -3 543 645 ; +C -1 ; WX 466 ; N tdieresis.sc ; B 82 -3 535 642 ; +C -1 ; WX 463 ; N t_uni0303.sc ; B 82 -3 535 645 ; +C -1 ; WX 469 ; N ereversed.sc ; B 44 -2 519 486 ; +C -1 ; WX 606 ; N aogonekacute.sc ; B 25 -176 585 697 ; +C -1 ; WX 282 ; N iogonekacute.sc ; B 30 -176 386 697 ; +C -1 ; WX 264 ; N jacute.sc ; B -16 -137 384 697 ; +C -1 ; WX 587 ; N oogonekacute.sc ; B 67 -176 645 697 ; +C -1 ; WX 731 ; N orogate.sc ; B 62 -174 641 639 ; +C -1 ; WX 576 ; N amacron.sc ; B 25 -2 555 619 ; +C -1 ; WX 471 ; N eogonekacute.sc ; B 37 -263 517 714 ; EndCharMetrics StartKernData StartKernPairs 12449 diff --git a/Master/texmf-dist/fonts/enc/dvips/newpx/zplsups-ts1.enc b/Master/texmf-dist/fonts/enc/dvips/newpx/zplsups-ts1.enc new file mode 100644 index 00000000000..ee15cc5e204 --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/newpx/zplsups-ts1.enc @@ -0,0 +1,291 @@ +/zplsupsTS1Encoding [ +% 0x00 + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef +% 0x08 + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef +% 0x10 + /.notdef + /.notdef + /quotedblbase + /.notdef + /.notdef + /twelveudash + /threequartersemdash + /capitalcompwordmark +% 0x18 + /arrowleft + /arrowright + /tieaccentlowercase + /tieaccentcapital + /newtieaccentlowercase + /newtieaccentcapital + /.notdef + /ascendercompwordmark +% 0x20 + /blank + /.notdef + /.notdef + /.notdef + /dollar.superior + /.notdef + /.notdef + /quotesingle +% 0x28 + /.notdef + /.notdef + /asterisk.math.sups + /.notdef + /comma.superior + /hyphendbl + /period.superior + /fraction.superior +% 0x30 + /zero.sups + /one.sups + /two.sups + /three.sups + /four.sups + /five.sups + /six.sups + /seven.sups +% 0x38 + /eight.sups + /nine.sups + /.notdef + /.notdef + /angbracketleft.superior + /minus.superior + /angbracketright.superior + /.notdef +% 0x40 + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef +% 0x48 + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /Omegainv.superior + /.notdef + /bigcircle.superior +% 0x50 + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /Omega +% 0x58 + /.notdef + /.notdef + /.notdef + /openbracketleft.superior + /.notdef + /openbracketright.superior + /arrowup + /arrowdown +% 0x60 + /asciigrave.superior + /.notdef + /born.superior + /divorced.superior + /died.superior + /.notdef + /.notdef + /.notdef +% 0x68 + /.notdef + /.notdef + /.notdef + /.notdef + /leaf + /married.superior + /musicalnote.superior + /.notdef +% 0x70 + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef +% 0x78 + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /tildelow.superior + /hyphendblchar.superior +% 0x80 + /asciibreve.superior + /asciicaron.superior + /asciiacutedbl.superior + /asciigravedbl.superior + /dagger.sups + /daggerdbl.sups + /bardbl.sups + /perthousand.superior +% 0x88 + /bullet.superior + /centigrade.superior + /dollaroldstyle.superior + /centoldstyle.superior + /florin.superior + /colonmonetary.superior + /won.superior + /naira.superior +% 0x90 + /guarani.superior + /peso.superior + /lira.superior + /recipe.superior + /interrobang.superior + /interrobangdown.superior + /dong.superior + /trademark.superior +% 0x98 + /pertenthousand.superior + /pilcrow.superior + /baht.superior + /numero.superior + /discount.superior + /estimated.superior + /openbullet.superior + /servicemark.superior +% 0xA0 + /quillbracketleft.superior + /quillbracketright.superior + /cent.superior + /sterling.superior + /currency.superior + /yen.superior + /brokenbar.superior + /section.sups +% 0xA8 + /asciidieresis.superior + /copyright.superior + /ordfeminine.superior + /copyleft.superior + /logicalnot.superior + /circledP.superior + /registered.superior + /asciimacron.superior +% 0xB0 + /degree.superior + /plusminus.superior + /two.sups + /three.sups + /asciiacute.superior + /mu.sups + /paragraph.sups + /periodcentered.sups +% 0xB8 + /referencemark.superior + /one.sups + /ordmasculine.superior + /radical.superior + /onequarter.superior + /onehalf.superior + /threequarters.superior + /Euro.sups +% 0xC0 + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef +% 0xC8 + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef +% 0xD0 + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /multiply.sups + /.notdef +% 0xD8 + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef +% 0xE0 + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef +% 0xE8 + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef +% 0xF0 + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /divide.sups + /.notdef +% 0xF8 + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef + /.notdef +] def + diff --git a/Master/texmf-dist/fonts/map/dvips/newpx/newpx.map b/Master/texmf-dist/fonts/map/dvips/newpx/newpx.map index 9fc6f3af41f..932401c3ac6 100644 --- a/Master/texmf-dist/fonts/map/dvips/newpx/newpx.map +++ b/Master/texmf-dist/fonts/map/dvips/newpx/newpx.map @@ -1,5 +1,10 @@ % newpx.map +zplsups-Regular-ts1 TeXGyrePagellaX-Regular " zplsupsTS1Encoding ReEncodeFont " <zplsups-ts1.enc <zplr.pfb +zplsups-Bold-ts1 TeXGyrePagellaX-Bold " zplsupsTS1Encoding ReEncodeFont " <zplsups-ts1.enc <zplb.pfb +zplsups-Italic-ts1 TeXGyrePagellaX-Italic " zplsupsTS1Encoding ReEncodeFont " <zplsups-ts1.enc <zplri.pfb +zplsups-BoldItalic-ts1 TeXGyrePagellaX-BoldItalic " zplsupsTS1Encoding ReEncodeFont " <zplsups-ts1.enc <zplbi.pfb + zplr-x zplx-regular " tgpdiff ReEncodeFont " <[tgpdiff.enc <zplx-regular.pfb zplb-x zplx-bold " tgpdiff ReEncodeFont " <[tgpdiff.enc <zplx-bold.pfb diff --git a/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-Bold.otf b/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-Bold.otf Binary files differindex 970da075509..857f3694120 100644 --- a/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-Bold.otf +++ b/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-Bold.otf diff --git a/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-BoldItalic.otf b/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-BoldItalic.otf Binary files differindex 0ec992c66ce..ee0c60f03d4 100644 --- a/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-BoldItalic.otf +++ b/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-BoldItalic.otf diff --git a/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-BoldSlanted.otf b/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-BoldSlanted.otf Binary files differindex 32b5606a013..6ea70c026a1 100644 --- a/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-BoldSlanted.otf +++ b/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-BoldSlanted.otf diff --git a/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-Italic.otf b/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-Italic.otf Binary files differindex 92ec130888a..63a44b9e07c 100644 --- a/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-Italic.otf +++ b/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-Italic.otf diff --git a/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-Regular.otf b/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-Regular.otf Binary files differindex 55481ec7768..99e7624a9a3 100644 --- a/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-Regular.otf +++ b/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-Regular.otf diff --git a/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-Slanted.otf b/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-Slanted.otf Binary files differindex 4607190fe27..3494cf92570 100644 --- a/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-Slanted.otf +++ b/Master/texmf-dist/fonts/opentype/public/newpx/TeXGyrePagellaX-Slanted.otf diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplbsym.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplbsym.tfm Binary files differindex ceb337ac3aa..1bdef0126ff 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplbsym.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplbsym.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Bold-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Bold-ly1.tfm Binary files differindex 2413d346af3..94f4a274318 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Bold-ly1.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Bold-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Bold-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Bold-ot1.tfm Binary files differindex 08781a34a3b..be32f0e8b08 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Bold-ot1.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Bold-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Bold-t1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Bold-t1.tfm Binary files differindex d02340eda4f..af9d2d3c777 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Bold-t1.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Bold-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldItalic-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldItalic-ly1.tfm Binary files differindex 11421979944..178d7136d2d 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldItalic-ly1.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldItalic-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldItalic-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldItalic-ot1.tfm Binary files differindex f34d30a2492..62684cd1bb8 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldItalic-ot1.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldItalic-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldItalic-t1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldItalic-t1.tfm Binary files differindex 08c4877cbd0..81614d8fade 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldItalic-t1.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldItalic-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldSlanted-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldSlanted-ly1.tfm Binary files differindex 50c3d8511c6..d54798ee7bc 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldSlanted-ly1.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldSlanted-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldSlanted-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldSlanted-ot1.tfm Binary files differindex c72eceae220..dd71a96bfc3 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldSlanted-ot1.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldSlanted-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldSlanted-t1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldSlanted-t1.tfm Binary files differindex 95db29e0249..b4f58685835 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldSlanted-t1.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-BoldSlanted-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Italic-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Italic-ly1.tfm Binary files differindex de3cc185349..54635ff97c3 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Italic-ly1.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Italic-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Italic-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Italic-ot1.tfm Binary files differindex e4504988e7c..1875a819043 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Italic-ot1.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Italic-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Italic-t1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Italic-t1.tfm Binary files differindex 06ab8a84f94..3915debb0ce 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Italic-t1.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Italic-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Regular-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Regular-ly1.tfm Binary files differindex f9bc56af27a..897db0e0bcc 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Regular-ly1.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Regular-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Regular-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Regular-ot1.tfm Binary files differindex 183d9ae4177..f1d8b88ddec 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Regular-ot1.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Regular-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Regular-t1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Regular-t1.tfm Binary files differindex 7baf0803110..11eb14917dc 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Regular-t1.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Regular-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Slanted-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Slanted-ly1.tfm Binary files differindex 27081c86322..31b4cc2731f 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Slanted-ly1.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Slanted-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Slanted-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Slanted-ot1.tfm Binary files differindex cc12e4a219c..23de19ec7aa 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Slanted-ot1.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Slanted-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Slanted-t1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Slanted-t1.tfm Binary files differindex 53616de2986..505fda625fc 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Slanted-t1.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplnumr-Slanted-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplsups-Bold-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplsups-Bold-ts1.tfm Binary files differnew file mode 100644 index 00000000000..590ebd1be0e --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplsups-Bold-ts1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplsups-BoldItalic-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplsups-BoldItalic-ts1.tfm Binary files differnew file mode 100644 index 00000000000..a09a407f676 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplsups-BoldItalic-ts1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplsups-Italic-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplsups-Italic-ts1.tfm Binary files differnew file mode 100644 index 00000000000..c6b36cfe8c2 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplsups-Italic-ts1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplsups-Regular-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplsups-Regular-ts1.tfm Binary files differnew file mode 100644 index 00000000000..1f60b97d800 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplsups-Regular-ts1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplsym.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplsym.tfm Binary files differindex e1ec6c0ca49..cfed80f1765 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplsym.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplsym.tfm diff --git a/Master/texmf-dist/fonts/type1/public/newpx/zplb.pfb b/Master/texmf-dist/fonts/type1/public/newpx/zplb.pfb Binary files differindex eecc8f82852..c9e2cb216c1 100644 --- a/Master/texmf-dist/fonts/type1/public/newpx/zplb.pfb +++ b/Master/texmf-dist/fonts/type1/public/newpx/zplb.pfb diff --git a/Master/texmf-dist/fonts/type1/public/newpx/zplbi.pfb b/Master/texmf-dist/fonts/type1/public/newpx/zplbi.pfb Binary files differindex d4142f0439e..54f0eeead16 100644 --- a/Master/texmf-dist/fonts/type1/public/newpx/zplbi.pfb +++ b/Master/texmf-dist/fonts/type1/public/newpx/zplbi.pfb diff --git a/Master/texmf-dist/fonts/type1/public/newpx/zplbsl.pfb b/Master/texmf-dist/fonts/type1/public/newpx/zplbsl.pfb Binary files differindex 8f7fdcecadd..ec2cd30c95c 100644 --- a/Master/texmf-dist/fonts/type1/public/newpx/zplbsl.pfb +++ b/Master/texmf-dist/fonts/type1/public/newpx/zplbsl.pfb diff --git a/Master/texmf-dist/fonts/type1/public/newpx/zplr.pfb b/Master/texmf-dist/fonts/type1/public/newpx/zplr.pfb Binary files differindex fa7cf80b118..3e6511273dc 100644 --- a/Master/texmf-dist/fonts/type1/public/newpx/zplr.pfb +++ b/Master/texmf-dist/fonts/type1/public/newpx/zplr.pfb diff --git a/Master/texmf-dist/fonts/type1/public/newpx/zplri.pfb b/Master/texmf-dist/fonts/type1/public/newpx/zplri.pfb Binary files differindex f514a93709a..cd11e7e9b0f 100644 --- a/Master/texmf-dist/fonts/type1/public/newpx/zplri.pfb +++ b/Master/texmf-dist/fonts/type1/public/newpx/zplri.pfb diff --git a/Master/texmf-dist/fonts/type1/public/newpx/zplrsl.pfb b/Master/texmf-dist/fonts/type1/public/newpx/zplrsl.pfb Binary files differindex 171e100bbd9..bc59b382b17 100644 --- a/Master/texmf-dist/fonts/type1/public/newpx/zplrsl.pfb +++ b/Master/texmf-dist/fonts/type1/public/newpx/zplrsl.pfb diff --git a/Master/texmf-dist/fonts/vf/public/newpx/zplbsym.vf b/Master/texmf-dist/fonts/vf/public/newpx/zplbsym.vf Binary files differindex db86fd19018..7db133737b0 100644 --- a/Master/texmf-dist/fonts/vf/public/newpx/zplbsym.vf +++ b/Master/texmf-dist/fonts/vf/public/newpx/zplbsym.vf diff --git a/Master/texmf-dist/fonts/vf/public/newpx/zplsym.vf b/Master/texmf-dist/fonts/vf/public/newpx/zplsym.vf Binary files differindex 6bed91dc49b..50320590005 100644 --- a/Master/texmf-dist/fonts/vf/public/newpx/zplsym.vf +++ b/Master/texmf-dist/fonts/vf/public/newpx/zplsym.vf diff --git a/Master/texmf-dist/source/fonts/newpx/TRK.fea b/Master/texmf-dist/source/fonts/newpx/TRK.fea new file mode 100644 index 00000000000..0266291a2bc --- /dev/null +++ b/Master/texmf-dist/source/fonts/newpx/TRK.fea @@ -0,0 +1,5 @@ +feature locl { +script latn; +language TRK exclude_dflt; +sub i by i.TRK; +} locl; diff --git a/Master/texmf-dist/tex/latex/newpx/ly1minzpl.fd b/Master/texmf-dist/tex/latex/newpx/ly1minzpl.fd new file mode 100644 index 00000000000..df2b7e96f21 --- /dev/null +++ b/Master/texmf-dist/tex/latex/newpx/ly1minzpl.fd @@ -0,0 +1,38 @@ +\ProvidesFile{ly1minzpl.fd}[2021/05/25 v1.0 font definition file for LY1/minzpl/TLF] + +\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{} + +\expandafter\ifx\csname zpl@scaled\endcsname\relax + \global\let\zpl@scaled\@empty% +\fi +\gdef\zpl@lsfx{} +\def\zpl@makelsfx{\ifzpl@largesc\gdef\zpl@lsfx{l}\fi} +\ifdefined\zpl@largescfalse \zpl@makelsfx\fi +\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi + +\DeclareFontFamily{LY1}{minzpl}{\zpl@spacing} +\DeclareFontShape{LY1}{minzpl}{b}{sc}{<-> \zpl@scaled zpl-Bold-tlf-sc\zpl@lsfx-ly1}{} +\DeclareFontShape{LY1}{minzpl}{b}{n}{<-> \zpl@scaled zpl-Bold-tlf-ly1}{} +\DeclareFontShape{LY1}{minzpl}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-tlf-sc\zpl@lsfx-ly1}{} +\DeclareFontShape{LY1}{minzpl}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tlf-ly1}{} +\DeclareFontShape{LY1}{minzpl}{m}{sc}{<-> \zpl@scaled zpl-Regular-tlf-sc\zpl@lsfx-ly1}{} +\DeclareFontShape{LY1}{minzpl}{m}{n}{<-> \zpl@scaled zpl-Regular-tlf-ly1}{} +\DeclareFontShape{LY1}{minzpl}{m}{scit}{<-> \zpl@scaled zpl-Italic-tlf-sc\zpl@lsfx-ly1}{} +\DeclareFontShape{LY1}{minzpl}{m}{it}{<-> \zpl@scaled zpl-Italic-tlf-ly1}{} +\DeclareFontShape{LY1}{minzpl}{bx}{sc}{<->ssub * minzpl/b/sc}{} +\DeclareFontShape{LY1}{minzpl}{bx}{n}{<->ssub * minzpl/b/n}{} +\DeclareFontShape{LY1}{minzpl}{bx}{scit}{<->ssub * minzpl/b/scit}{} +\DeclareFontShape{LY1}{minzpl}{bx}{it}{<->ssub * minzpl/b/it}{} +\ifzpl@sl % point to real slanted fonts + \DeclareFontShape{LY1}{minzpl}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tlf-ly1}{} + \DeclareFontShape{LY1}{minzpl}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tlf-ly1}{} + \DeclareFontShape{LY1}{minzpl}{bx}{sl}{<->ssub * minzpl/b/sl}{} +\else %point to theorem font + \DeclareFontShape{LY1}{minzpl}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-ly1}{} + \DeclareFontShape{LY1}{minzpl}{b}{sl}{<->ssub * minzpl/m/sl}{} + \DeclareFontShape{LY1}{minzpl}{bx}{sl}{<->ssub * minzpl/m/sl}{} +\fi +\DeclareFontShape{LY1}{minzpl}{b}{scsl}{<->ssub * minzpl/b/scit}{} +\DeclareFontShape{LY1}{minzpl}{bx}{scsl}{<->ssub * minzpl/b/scit}{} +\DeclareFontShape{LY1}{minzpl}{m}{scsl}{<->ssub * minzpl/m/scit}{} +\endinput diff --git a/Master/texmf-dist/tex/latex/newpx/newpx.sty b/Master/texmf-dist/tex/latex/newpx/newpx.sty new file mode 100644 index 00000000000..1e6f1bfdd5b --- /dev/null +++ b/Master/texmf-dist/tex/latex/newpx/newpx.sty @@ -0,0 +1,107 @@ +\NeedsTeXFormat{LaTeX2e} + + +%Package to simplify loading of newpxmath with a text font family such as newpxtext for all latex engines, or for newpxtext and an otf math package. +\def\fileversion{1.51} +\def\filedate{2023/08/04} +\ProvidesPackage{newpx}[% +\filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for newpxmath and newpxtext, or for newpxtext and an otf math package] + +\message{`newpx'v\fileversion,\space\filedate\space Integrated\space loading\space of\space newpxmath\space and\space a\space text\space font +\space for\space all\space latex\space engines\space (msharpe)} + +\RequirePackage{fontenc,fontaxes} +\RequirePackage{ifthen,iftex,etoolbox,scalefnt,trimspaces} + +\forcsvlist{\listadd\zpl@mathlst}{vecsep,amsthm,nosubscriptcorrection,subscriptcorrection,varbb,vvarbb,nosymbolsc,noamssymbols,amssymbols,uprightscript,uprightGreek,slantedGreek,frenchmath,upint,smallerops,useBImacros,varg,varvw,noOT1,fracspacing,subscriptcorrectionfile} +%\show\zpl@mathlst +\RequirePackage{kvoptions} + +\DeclareDefaultOption{ +\xifinlist{\CurrentOptionKey}{\zpl@mathlst} +{% true branch for xifinlist +\expandafter\PassOptionsToPackage\expandafter{\CurrentOption}{newpxmath}} +{% false branch for xifinlist +%\xdef\zpl@Topt{\zpl@Topt \CurrentOption,} +\expandafter\PassOptionsToPackage\expandafter% +{\CurrentOption}{newpxtext}} +\ifthenelse{\equal{scale}{\CurrentOptionKey} \OR \equal{scaled}{\CurrentOptionKey}} +{% true branch for ifthenelse +%\expandafter\PassOptionsToPackage\expandafter{\CurrentOption}{newpxmath} +\edef\zpl@scale{\CurrentOptionValue} +\edef\npxmath@scaled{\CurrentOptionValue} +}{ % false branch for ifthenelse +}} +\newif\ifzpl@otfmath %\zpl@otfmathfalse % default is type1 math +\DeclareBoolOption{otfmath}% defines \ifnewpx@otfmath +\ifnewpx@otfmath\iftutex\zpl@otfmathtrue\fi\fi +%\@nameuse{if#1}\iftutex\zpl@otfmathtrue\fi\fi} + +\DeclareBoolOption{type1}%[true]{}% no effect now +%{%\@nameuse{if#1}\zpl@otftextfalse\fi} + +\DeclareBoolOption{type1text}%[true]{} %no effect now +%{% same as type1--use type1 for text +%\@nameuse{if#1}\zpl@otftextfalse\fi} + +\DeclareBoolOption{nofontspec}%[true]{} % no effect +%{\@nameuse{if#1}\zpl@nofontspectrue\fi} + +\ProcessKeyvalOptions{newpx} + + +\RequirePackage{xstring}% must load this after \@for +% Needed for \StrLeft and \StrRight + +%Enginecheck +%iftex's \iftutex is true for LuaTeX and XeTeX +\newif\ifzpl@otftext +\iftutex\zpl@otftexttrue\fi +%\def\zpl@Mopt{} % math options to pass +%\def\zpl@Topt{} % text options to pass + +%\def\tx@divide#1#2{\strip@pt\dimexpr 1pt * (\dimexpr #1pt) / \dimexpr #2pt\relax\relax} +%\newcommand*{\zpltext@rm}{} % not understood by libertinus-otf +%\newcommand*{\zpltext@sf}{}% not understood by libertinus-otf + + + +\def\zpl@dfltTF{newpxtext} % the default text font package name +\def\zpl@text{\let\zpl@TF=\zpl@dfltTF % the text font package name +\def\zpl@MF{newpxmath} +%\def\zpl@id{0} % identifier for font properties +%\def\zpl@sc{zpl@scale} % macro name for scale factor in font package +\def\zpl@minfam{zplTLF} %roman font, tabular lining fd, used in math +} +\zpl@text % set the defaults% + +%\newcommand{\PassMathScale}{\ifzpl@iszero\gdef\zpltext@scale{\zplmath@scale}\gdef\zpltext@scaled{s*[\zpltext@scale]}\fi +%\PassOptionsToPackage{scaled=\zpltext@scale}{\zpl@TF} +%} + + +\ifzpl@otftext + \ifzpl@otfmath %I + \typeout{I} + \usepackage[]{newpxtext} %may not load fontspec + \RequirePackage{fontspec} % just in case + \usepackage{unicode-math} %loads amsmath + \else %II: type1 math, otftext + \typeout{II} + \renewcommand*{\rmdefault}{zplTLF} % Roman and Bold text for math + \usepackage[]{newpxmath} % options will be as passed from newpx + \usepackage[no-math]{fontspec} + \usepackage{newpxtext} + \fi %ifzpl@otfmath + %\show\zpl@otftexttrue +\else % not otftext + \typeout{IV} +% IV, type1 tex and math + \renewcommand*{\rmdefault}{\zpl@minfam}% Roman and Bold for math + \usepackage{newpxmath} % options will be as passed from newpx + \usepackage{\zpl@TF} % should load tt and sans math before newpx +\fi + + + +\endinput diff --git a/Master/texmf-dist/tex/latex/newpx/newpxtext.sty b/Master/texmf-dist/tex/latex/newpx/newpxtext.sty index 046df984b02..8df47a8fb1e 100644 --- a/Master/texmf-dist/tex/latex/newpx/newpxtext.sty +++ b/Master/texmf-dist/tex/latex/newpx/newpxtext.sty @@ -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.504} -\def\filedate{2022/01/30} +\def\fileversion{1.51} +\def\filedate{2023/08/06} \ProvidesPackage{newpxtext}[% \filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for TeXGyrePagellaX] @@ -18,7 +18,7 @@ \RequirePackage[T1]{fontenc} \renewcommand*{\rmdefault}{zplTLF} % the default until end of preamble \renewcommand*{\familydefault}{\rmdefault} -\RequirePackage{ifxetex,ifluatex,xkeyval,etoolbox,textcomp} +\RequirePackage{iftex,xkeyval,etoolbox,textcomp} \RequirePackage{xstring,ifthen,scalefnt} % for \textfrac \IfFileExists{mweights.sty}{\RequirePackage{mweights}}{} \DeclareEncodingSubset{TS1}{zpl*}{0} @@ -30,14 +30,11 @@ % Engine check \newif\ifzpl@otf -\ifxetex - \zpl@otftrue -\else\ifluatex - \zpl@otftrue -\else % [pdf]LaTeX - \zpl@otffalse -\fi\fi - +\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} @@ -46,17 +43,17 @@ \let\ExecuteOptionsX\ExecuteOptions \let\ProcessOptionsX\ProcessOptions } -%%%%Start Options +%%%% 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 +%\@nameuse{if#1}\zpl@otffalse\fi } \DeclareOptionX{nofontspec}[true]{% -\@nameuse{if#1}\zpl@otffalse\fi +%\@nameuse{if#1}\zpl@otffalse\fi } \DeclareOptionX{no-math}[true]{% \@nameuse{if#1}\zpl@nomathtrue\fi @@ -111,9 +108,9 @@ } %Scale -\newcommand*{\zpl@scale}{1} % actual scaled command in \zpl@scaled -\DeclareOptionX{scale}{\renewcommand*{\zpl@scale}{#1}} -\DeclareOptionX{scaled}{\renewcommand*{\zpl@scale}{#1}} +\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 @@ -158,13 +155,13 @@ \DeclareOptionX{shrink}{% \def\zpl@shrink{#1} } -\def\zpl@defaultfeatures{} \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{defaultfeatures}{\def\zpl@defaultfeatures{#1}} \DeclareOptionX{oldSS}{\advance\zpl@cnt 32 } +\DeclareOptionX{notextnu}{\zpl@notextnutrue} \DeclareOptionX{slashedzero}{\zpl@zeroslashtrue} \DeclareOptionX{theoremfont}{\zpl@thrmtrue } \DeclareOptionX{thmlining}{\edef\zpl@thmlin{l}} @@ -177,8 +174,27 @@ \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 +% 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}} @@ -189,7 +205,8 @@ \RequirePackage{fontspec} \fi - \ifxetex\XeTeXtracingfonts=1\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" }} @@ -219,7 +236,7 @@ \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 @@ -260,7 +277,7 @@ \mbox{% \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1] {\textlf{#1}\kern.1em}{}% - {\sustyle#2}% numerator + {\nustyle#2}% numerator \StrRight{#2}{1}[\@digit@]% % look for 1, 2, 6, 7 \ifcase\@digit@% 0 @@ -331,7 +348,7 @@ {\edef\zpl@dflt{\zpl@dflt StylisticSet={\zpl@lst} , }}{} - \defaultfontfeatures{ + \defaultfontfeatures[\zpl@base]{ Ligatures = TeX , Scale = \zpl@scale , Extension = .otf , @@ -375,7 +392,8 @@ \ifzpl@defaultsups % \else \ifzpl@KOMA - %\let\textsuperscript\sustyle + \let\textsuperscript\sustyle + \setkomafont{footnotelabel}{\textsuperscript} \else % NOT KOMA \def\f@@tn@te{footnote} \def\@makefnmark{% @@ -444,14 +462,14 @@ \let\nustyle=\nufigures \let\instyle=\infigures \let\destyle=\defigures + \ifzpl@KOMA + \setkomafont{footnotereference}{\normalfont} + \else + \renewcommand{\footnotemarkfont}{\normalfont} + \fi \ifzpl@defaultsups % \else - \usepackage{realscripts} - \ifzpl@KOMA - \setkomafont{footnotelabel}{\normalfont} - \else - \renewcommand\footnotemarkfont{\normalfont} - \fi + \RequirePackage{realscripts} \fi % \ifzpl@scosf % \edef\zpl@fnt{\expandafter\csname zpl\ifzpl@tabular T\fi OsF\endcsname} @@ -491,13 +509,63 @@ } \DeclareTextFontCommand{\textsu}{\sustyle} \let\textsuperior\textsu -\DeclareTextFontCommand{\textnu}{\nustyle} - \let\textnumerator\textnu +\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 @@ -556,15 +624,23 @@ \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]{\textsuperscript{#1}} + \renewcommand\AB@affilnote[1]{\textsuperscript{#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 +\fi +} % Define \oldstylenums, \liningnums ,\tabularnums and \proportionalnums \ifzpl@otf diff --git a/Master/texmf-dist/tex/latex/newpx/ot1minzpl.fd b/Master/texmf-dist/tex/latex/newpx/ot1minzpl.fd new file mode 100644 index 00000000000..490d13ff731 --- /dev/null +++ b/Master/texmf-dist/tex/latex/newpx/ot1minzpl.fd @@ -0,0 +1,38 @@ +\ProvidesFile{ot1minzpl.fd}[2021/05/25 v1.0 font definition file for OT1/minzpl/TLF] + +\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{} + +\expandafter\ifx\csname zpl@scaled\endcsname\relax + \global\let\zpl@scaled\@empty% +\fi +\gdef\zpl@lsfx{} +\def\zpl@makelsfx{\ifzpl@largesc\gdef\zpl@lsfx{l}\fi} +\ifdefined\zpl@largescfalse \zpl@makelsfx\fi +\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi + +\DeclareFontFamily{OT1}{minzpl}{\zpl@spacing} +\DeclareFontShape{OT1}{minzpl}{b}{sc}{<-> \zpl@scaled zpl-Bold-tlf-sc\zpl@lsfx-ot1}{} +\DeclareFontShape{OT1}{minzpl}{b}{n}{<-> \zpl@scaled zpl-Bold-tlf-ot1}{} +\DeclareFontShape{OT1}{minzpl}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-tlf-sc\zpl@lsfx-ot1}{} +\DeclareFontShape{OT1}{minzpl}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tlf-ot1}{} +\DeclareFontShape{OT1}{minzpl}{m}{sc}{<-> \zpl@scaled zpl-Regular-tlf-sc\zpl@lsfx-ot1}{} +\DeclareFontShape{OT1}{minzpl}{m}{n}{<-> \zpl@scaled zpl-Regular-tlf-ot1}{} +\DeclareFontShape{OT1}{minzpl}{m}{scit}{<-> \zpl@scaled zpl-Italic-tlf-sc\zpl@lsfx-ot1}{} +\DeclareFontShape{OT1}{minzpl}{m}{it}{<-> \zpl@scaled zpl-Italic-tlf-ot1}{} +\DeclareFontShape{OT1}{minzpl}{bx}{sc}{<->ssub * minzpl/b/sc}{} +\DeclareFontShape{OT1}{minzpl}{bx}{n}{<->ssub * minzpl/b/n}{} +\DeclareFontShape{OT1}{minzpl}{bx}{scit}{<->ssub * minzpl/b/scit}{} +\DeclareFontShape{OT1}{minzpl}{bx}{it}{<->ssub * minzpl/b/it}{} +\ifzpl@sl % point to real slanted fonts + \DeclareFontShape{OT1}{minzpl}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tlf-ot1}{} + \DeclareFontShape{OT1}{minzpl}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tlf-ot1}{} + \DeclareFontShape{OT1}{minzpl}{bx}{sl}{<->ssub * minzpl/b/sl}{} +\else %point to theorem font + \DeclareFontShape{OT1}{minzpl}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-ot1}{} + \DeclareFontShape{OT1}{minzpl}{b}{sl}{<->ssub * minzpl/m/sl}{} + \DeclareFontShape{OT1}{minzpl}{bx}{sl}{<->ssub * minzpl/m/sl}{} +\fi +\DeclareFontShape{OT1}{minzpl}{b}{scsl}{<->ssub * minzpl/b/scit}{} +\DeclareFontShape{OT1}{minzpl}{bx}{scsl}{<->ssub * minzpl/b/scit}{} +\DeclareFontShape{OT1}{minzpl}{m}{scsl}{<->ssub * minzpl/m/scit}{} +\endinput diff --git a/Master/texmf-dist/tex/latex/newpx/t1minzpl.fd b/Master/texmf-dist/tex/latex/newpx/t1minzpl.fd new file mode 100644 index 00000000000..d320d7f8d42 --- /dev/null +++ b/Master/texmf-dist/tex/latex/newpx/t1minzpl.fd @@ -0,0 +1,38 @@ +\ProvidesFile{t1minzpl.fd}[2021/05/25 v1.0 font definition file for T1/minzpl/TLF] + +\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{} + +\expandafter\ifx\csname zpl@scaled\endcsname\relax + \global\let\zpl@scaled\@empty% +\fi +\gdef\zpl@lsfx{} +\def\zpl@makelsfx{\ifzpl@largesc\gdef\zpl@lsfx{l}\fi} +\ifdefined\zpl@largescfalse \zpl@makelsfx\fi +\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi + +\DeclareFontFamily{T1}{minzpl}{\zpl@spacing} +\DeclareFontShape{T1}{minzpl}{b}{sc}{<-> \zpl@scaled zpl-Bold-tlf-sc\zpl@lsfx-t1}{} +\DeclareFontShape{T1}{minzpl}{b}{n}{<-> \zpl@scaled zpl-Bold-tlf-t1}{} +\DeclareFontShape{T1}{minzpl}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-tlf-sc\zpl@lsfx-t1}{} +\DeclareFontShape{T1}{minzpl}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tlf-t1}{} +\DeclareFontShape{T1}{minzpl}{m}{sc}{<-> \zpl@scaled zpl-Regular-tlf-sc\zpl@lsfx-t1}{} +\DeclareFontShape{T1}{minzpl}{m}{n}{<-> \zpl@scaled zpl-Regular-tlf-t1}{} +\DeclareFontShape{T1}{minzpl}{m}{scit}{<-> \zpl@scaled zpl-Italic-tlf-sc\zpl@lsfx-t1}{} +\DeclareFontShape{T1}{minzpl}{m}{it}{<-> \zpl@scaled zpl-Italic-tlf-t1}{} +\DeclareFontShape{T1}{minzpl}{bx}{sc}{<->ssub * minzpl/b/sc}{} +\DeclareFontShape{T1}{minzpl}{bx}{n}{<->ssub * minzpl/b/n}{} +\DeclareFontShape{T1}{minzpl}{bx}{scit}{<->ssub * minzpl/b/scit}{} +\DeclareFontShape{T1}{minzpl}{bx}{it}{<->ssub * minzpl/b/it}{} +\ifzpl@sl % point to real slanted fonts + \DeclareFontShape{T1}{minzpl}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tlf-t1}{} + \DeclareFontShape{T1}{minzpl}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tlf-t1}{} + \DeclareFontShape{T1}{minzpl}{bx}{sl}{<->ssub * minzpl/b/sl}{} +\else %point to theorem font + \DeclareFontShape{T1}{minzpl}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-t1}{} + \DeclareFontShape{T1}{minzpl}{b}{sl}{<->ssub * minzpl/m/sl}{} + \DeclareFontShape{T1}{minzpl}{bx}{sl}{<->ssub * minzpl/m/sl}{} +\fi +\DeclareFontShape{T1}{minzpl}{b}{scsl}{<->ssub * minzpl/b/scit}{} +\DeclareFontShape{T1}{minzpl}{m}{scsl}{<->ssub * minzpl/m/scit}{} +\DeclareFontShape{T1}{minzpl}{bx}{scsl}{<->ssub * minzpl/b/scit}{} +\endinput diff --git a/Master/texmf-dist/tex/latex/newpx/ts1zplsups.fd b/Master/texmf-dist/tex/latex/newpx/ts1zplsups.fd new file mode 100644 index 00000000000..f707d40534a --- /dev/null +++ b/Master/texmf-dist/tex/latex/newpx/ts1zplsups.fd @@ -0,0 +1,62 @@ +\ProvidesFile{ts1zplsups.fd}[2023/08/09 v1.0] +\expandafter\ifx\csname zpl@scaled\endcsname\relax + \global\let\zpl@scaled\@empty% +\fi + +\DeclareFontFamily{TS1}{zplsups}{} +\DeclareFontShape{TS1}{zplsups}{m}{n}{ %medium + <-> \zpl@scaled zplsups-Regular-ts1% +}{} +\DeclareFontShape{TS1}{zplsups}{m}{it}{ %italic + <-> \zpl@scaled zplsups-Italic-ts1% +}{} +\DeclareFontShape{TS1}{zplsups}{b}{n}{ %bold + <-> \zpl@scaled zplsups-Bold-ts1% +}{} +\DeclareFontShape{TS1}{zplsups}{b}{it}{ %bold italic + <-> \zpl@scaled zplsups-BoldItalic-ts1% +}{} +\DeclareFontShape{TS1}{zplsups}{m}{sl}{ %medium + <-> \zpl@scaled zplsups-Italic-ts1% +}{} +\DeclareFontShape{TS1}{zplsups}{b}{sl}{ %medium + <-> \zpl@scaled zplsups-BoldItalic-ts1% +}{} + +\DeclareFontShape{TS1}{zplsups}{m}{sc}{ %cap & small cap + <-> ssub * zplsups/m/n% +}{} +\DeclareFontShape{TS1}{zplsups}{m}{scit}{ %italic + <-> ssub * zplsups/m/it% +}{} +\DeclareFontShape{TS1}{zplsups}{m}{ui}{ %unslanted italic + <-> ssub * zplsups/m/n% +}{} +\DeclareFontShape{TS1}{zplsups}{bx}{sc}{ %bold extended cap & small cap + <-> ssub * zplsups/b/n% +}{} +\DeclareFontShape{TS1}{zplsups}{bx}{sl}{ %bold extended slanted + <-> ssub * zplsups/b/sl% +}{} +\DeclareFontShape{TS1}{zplsups}{bx}{it}{ %bold extended italic + <-> ssub * zplsups/b/it% +}{} +\DeclareFontShape{TS1}{zplsups}{bx}{scit}{ %bold extended italic + <-> ssub * zplsups/b/it% +}{} +\DeclareFontShape{TS1}{zplsups}{bx}{ui}{ %bold extended unslanted italic + <-> ssub * zplsups/b/n% +}{} +\DeclareFontShape{TS1}{zplsups}{bx}{n}{ %bold extended + <-> ssub * zplsups/b/n% +}{} +\DeclareFontShape{TS1}{zplsups}{b}{sc}{ %bold cap & small cap + <-> ssub * zplsups/b/n% +}{} +\DeclareFontShape{TS1}{zplsups}{b}{ui}{ %bold unslanted italic + <-> ssub * zplsups/b/n% +}{} +\DeclareFontShape{TS1}{zplsups}{b}{scit}{ %bold italic + <-> ssub * zplsups/b/it% +}{} +\endinput diff --git a/Master/texmf-dist/tex/latex/newpx/unpxsym.fd b/Master/texmf-dist/tex/latex/newpx/unpxsym.fd index 6f9e38c5069..d82160bf069 100644 --- a/Master/texmf-dist/tex/latex/newpx/unpxsym.fd +++ b/Master/texmf-dist/tex/latex/newpx/unpxsym.fd @@ -1,16 +1,16 @@ %Filename: unpxsym.fd -%Created by: tex px-drv +%Created by: tex px-sym-drv %Created using fontinst v1.933 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY \ProvidesFile{unpxsym.fd} - [2015/03/21 Fontinst v1.933 font definitions for U/npxsym.] + [2023/08/16 Fontinst v1.933 font definitions for U/npxsym.] \expandafter\ifx\csname npxmath@scaled\endcsname\relax - \let\npxmath@@scaled\@empty% + \global\let\npxmath@@scaled\@empty% \else - \edef\npxmath@@scaled{s*[\csname npxmath@scaled\endcsname]}% + \xdef\npxmath@@scaled{s*[\csname npxmath@scaled\endcsname]}% \fi \DeclareFontFamily{U}{npxsym}{} @@ -25,4 +25,5 @@ \DeclareFontShape{U}{npxsym}{bx}{n}{<->ssub * npxsym/b/n}{} + \endinput |