From 27f547140ee908fb4ce9e4b8297af7d5bf8d7ff9 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 28 Oct 2023 03:01:16 +0000 Subject: CTAN sync 202310280301 --- fonts/newpx/tex/newpx.sty | 20 ++++++++------------ fonts/newpx/tex/newpxmath.sty | 4 ++-- fonts/newpx/tex/newpxtext.sty | 8 ++++---- 3 files changed, 14 insertions(+), 18 deletions(-) (limited to 'fonts/newpx/tex') diff --git a/fonts/newpx/tex/newpx.sty b/fonts/newpx/tex/newpx.sty index 1e6f1bfdd5..f83d2c746c 100644 --- a/fonts/newpx/tex/newpx.sty +++ b/fonts/newpx/tex/newpx.sty @@ -2,8 +2,8 @@ %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} +\def\fileversion{1.532} +\def\filedate{2023/10/26} \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] @@ -32,10 +32,9 @@ \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} +%\newif\ifzpl@otfmath %\zpl@otfmathfalse % default is type1 math +\DeclareBoolOption{otfmath}% creates and inits \ifnewpx@otfmath +%{\@nameuse{if#1}\iftutex\zpl@otfmathtrue\fi\fi} \DeclareBoolOption{type1}%[true]{}% no effect now %{%\@nameuse{if#1}\zpl@otftextfalse\fi} @@ -49,7 +48,6 @@ \ProcessKeyvalOptions{newpx} - \RequirePackage{xstring}% must load this after \@for % Needed for \StrLeft and \StrRight @@ -71,7 +69,7 @@ \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 +\def\zpl@minfam{zpltlf} %roman font, tabular lining fd, used in math } \zpl@text % set the defaults% @@ -79,16 +77,14 @@ %\PassOptionsToPackage{scaled=\zpltext@scale}{\zpl@TF} %} - \ifzpl@otftext - \ifzpl@otfmath %I + \ifnewpx@otfmath % \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 + \renewcommand*{\rmdefault}{\zpl@minfam} % Roman and Bold text for math \usepackage[]{newpxmath} % options will be as passed from newpx \usepackage[no-math]{fontspec} \usepackage{newpxtext} diff --git a/fonts/newpx/tex/newpxmath.sty b/fonts/newpx/tex/newpxmath.sty index 3c5e7e2dcd..5e58789a63 100644 --- a/fonts/newpx/tex/newpxmath.sty +++ b/fonts/newpx/tex/newpxmath.sty @@ -11,8 +11,8 @@ % of glyph collisions. % These modifications are by Michael Sharpe, msharpe at ucsd dot edu -\def\fileversion{1.51} -\def\filedate{2023/08/04} +\def\fileversion{1.532} +\def\filedate{2023/10/26} \ProvidesPackage{newpxmath} [\filedate\space v\fileversion] diff --git a/fonts/newpx/tex/newpxtext.sty b/fonts/newpx/tex/newpxtext.sty index be83368b49..a0e74cd63d 100644 --- a/fonts/newpx/tex/newpxtext.sty +++ b/fonts/newpx/tex/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.531} -\def\filedate{2023/10/25} +\def\fileversion{1.532} +\def\filedate{2023/10/26} \ProvidesPackage{newpxtext}[% \filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for TeXGyrePagellaX] @@ -53,7 +53,7 @@ \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} +%\@ifundefined{ver@newpxmath.sty}{}{\zpl@nomathtrue} \DeclareOptionX{type1}[true]{% %\@nameuse{if#1}\zpl@otffalse\fi @@ -591,11 +591,11 @@ \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} \patchcmd{\maketitle} {\hb@xt@1.8em}{\hb@xt@2.18em}{}{} - \fi \ifzpl@KOMA \setkomafont{footnotereference}{\normalfont\sustyle} \setkomafont{footnotelabel}{\normalfont\sustyle} \fi + \fi \renewcommand*{\textcircled}[1]{\hmode@bgroup\ooalign{% \hfil \raise -.255ex\hbox{{% -- cgit v1.2.3