summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-10-28 03:01:16 +0000
committerNorbert Preining <norbert@preining.info>2023-10-28 03:01:16 +0000
commit27f547140ee908fb4ce9e4b8297af7d5bf8d7ff9 (patch)
treee369cbac6d7ab890e1139cd73f5034e45af74b8b /fonts
parente7c703c953f148411c70d5ca86dc1c1023d73806 (diff)
CTAN sync 202310280301
Diffstat (limited to 'fonts')
-rw-r--r--fonts/cyrillic/cmcyr/mf/coding.bak69
-rw-r--r--fonts/newpx/README8
-rw-r--r--fonts/newpx/doc/newpxdoc.pdfbin432728 -> 432291 bytes
-rw-r--r--fonts/newpx/doc/newpxdoc.tex36
-rw-r--r--fonts/newpx/tex/newpx.sty20
-rw-r--r--fonts/newpx/tex/newpxmath.sty4
-rw-r--r--fonts/newpx/tex/newpxtext.sty8
7 files changed, 38 insertions, 107 deletions
diff --git a/fonts/cyrillic/cmcyr/mf/coding.bak b/fonts/cyrillic/cmcyr/mf/coding.bak
deleted file mode 100644
index 7ce9c009ff..0000000000
--- a/fonts/cyrillic/cmcyr/mf/coding.bak
+++ /dev/null
@@ -1,69 +0,0 @@
-% that coding is KOI-8
-
-CYR_a := oct"101";
-CYR_be := oct"102";
-CYR_ve := oct"127";
-CYR_ghe := oct"107";
-CYR_de := oct"104";
-CYR_ie := oct"105";
-CYR_yo := oct"74";
-CYR_zhe := oct"126";
-CYR_ze := oct"132";
-CYR_i := oct"111";
-CYR_short_i := oct"112";
-CYR_ka := oct"113";
-CYR_el := oct"114";
-CYR_em := oct"115";
-CYR_en := oct"116";
-CYR_o := oct"117";
-CYR_pe := oct"120";
-CYR_er := oct"122";
-CYR_es := oct"123";
-CYR_te := oct"124";
-CYR_u := oct"125";
-CYR_ef := oct"106";
-CYR_ha := oct"110";
-CYR_tse := oct"103";
-CYR_che := oct"136";
-CYR_sha := oct"133";
-CYR_shcha := oct"135";
-CYR_hard_sign := oct"137";
-CYR_yeru := oct"131";
-CYR_soft_sign := oct"130";
-CYR_e := oct"134";
-CYR_yu := oct"100";
-CYR_ya := oct"121";
-
-CYR_A := oct"141";
-CYR_BE := oct"142";
-CYR_VE := oct"167";
-CYR_GHE := oct"147";
-CYR_DE := oct"144";
-CYR_IE := oct"145";
-CYR_YO := oct"76";
-CYR_ZHE := oct"166";
-CYR_ZE := oct"172";
-CYR_I := oct"151";
-CYR_SHORT_I := oct"152";
-CYR_KA := oct"153";
-CYR_EL := oct"154";
-CYR_EM := oct"155";
-CYR_EN := oct"156";
-CYR_O := oct"157";
-CYR_PE := oct"160";
-CYR_ER := oct"162";
-CYR_ES := oct"163";
-CYR_TE := oct"164";
-CYR_U := oct"165";
-CYR_EF := oct"146";
-CYR_HA := oct"150";
-CYR_TSE := oct"143";
-CYR_CHE := oct"176";
-CYR_SHA := oct"173";
-CYR_SHCHA := oct"175";
-CYR_HARD_SIGN := oct"177";
-CYR_YERU := oct"171";
-CYR_SOFT_SIGN := oct"170";
-CYR_E := oct"174";
-CYR_YU := oct"140";
-CYR_YA := oct"161";
diff --git a/fonts/newpx/README b/fonts/newpx/README
index 0245be15a2..fe5dc67ce6 100644
--- a/fonts/newpx/README
+++ b/fonts/newpx/README
@@ -1,10 +1,16 @@
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.531 2023-10-25
+Current version: 1.532 2023-10-26
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.532
+1. Changed all references to zplTLF to zpltlf and updated docs to
+reflect those changes.
+2. Corrected a number of bugs in newpx.sty and newpxtext.sty that were
+preventing the proper handling of calls to a unicode math font.
+
Changes in version 1.531
Corrected the footnote marker issues so the footnote modifications now
work as expected in all LaTeX engines, and in the standard and AMS
diff --git a/fonts/newpx/doc/newpxdoc.pdf b/fonts/newpx/doc/newpxdoc.pdf
index 377d70d68b..edfef6274f 100644
--- a/fonts/newpx/doc/newpxdoc.pdf
+++ b/fonts/newpx/doc/newpxdoc.pdf
Binary files differ
diff --git a/fonts/newpx/doc/newpxdoc.tex b/fonts/newpx/doc/newpxdoc.tex
index df34eebde1..beb3719461 100644
--- a/fonts/newpx/doc/newpxdoc.tex
+++ b/fonts/newpx/doc/newpxdoc.tex
@@ -311,7 +311,7 @@ You do not need to load {\tt amsmath}: it is loaded by {\tt unicode-math}.
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
+ \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}
@@ -339,13 +339,13 @@ In the olden days of [pdf]latex processing, {\tt newpx} was traditionally summo
\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
+\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
+\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}
@@ -353,14 +353,14 @@ which expands in the non-unicode case to
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
+ \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
- \usepackage[T1]{fontenc} % math text font zplTLF by default
+ \usepackage[T1]{fontenc} % math text font zpltlf by default
\usepackage[<list of text and math options>]{newpx}
\end{verbatim}
\textsc{Notes:}
@@ -405,7 +405,7 @@ As far as I can tell, \textsf{newpxmath} works with both, but requires a very sp
\begin{verbatim}
%\usepackage[greek.polutonico,english]{babel} % if using babel
% next line calls fontspec and loads TeXGyrePagellaX otf
-\usepackage[theoremfont,trueslanted,largesc,p,osf]{newpxtext}
+\usepackage[otfmath,theoremfont,trueslanted,largesc,p,osf]{newpxtext}
% set mono and sans opentype fonts
%\usepackage{polyglossia} % must load after fontspec, if using polyglossia
% polyglossia setup commands
@@ -425,7 +425,7 @@ With {\tt newpx}, there is a little simplification:
\begin{verbatim}
%\usepackage[greek.polutonico,english]{babel} % if using babel
% next line calls fontspec and loads TeXGyrePagellaX otf
-\usepackage[theoremfont,trueslanted,largesc,p,osf]{newpx}
+\usepackage[otfmath,theoremfont,trueslanted,largesc,p,osf]{newpx}
% set mono and sans opentype fonts
%\usepackage{polyglossia} % must load after fontspec, if using polyglossia
% polyglossia setup commands
@@ -455,7 +455,7 @@ With {\tt newpx}, there is a little simplification:
\textsc{Example II: TeXGyrePagellaX Opentype + newpxmath (type1) + polyglossia + other Opentype.}
\begin{verbatim}
-\renewcommand{\rmdefault}{zplTLF}% Roman and Bold PagellaX 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]{sourcesanspro}% used only by \mathsf, optional
% Next line loads amsmath, then loads amsthm
@@ -478,7 +478,7 @@ You do not need to load {\tt amsmath}: it is loaded by {\tt newpxmath}. Option {
\item The {\tt type1} option to {\tt cabin} is important, preventing it from loading {\tt fontspec}, which would lead to an {\tt option clash} error. \end{itemize}
With {\tt newpx}, the above is equivalent to:
\begin{verbatim}
-%\renewcommand{\rmdefault}{zplTLF}% Roman and Bold PagellaX for math mode
+%\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
@@ -493,7 +493,7 @@ With {\tt newpx}, the above is equivalent to:
\textsc{Example III: newpxtext type1 + newpxmath (type1) + polyglossia + other Opentype.}
\begin{verbatim}
-\renewcommand{\rmdefault}{zplTLF}% Roman and Bold Pagella for math mode
+\renewcommand{\rmdefault}{zpltlf}% Roman and Bold Pagella for math mode
\usepackage[T1]{fontenc} % T1 is active encoding for use in math text
\usepackage[type1]{sourcesanspro}% used only by \mathsf, optional
%Uncomment either the following line
@@ -541,9 +541,7 @@ prevents the problem with the {\tt cabin} package. (Not working in the version o
\usepackage{newpxtext}
\usepackage[scaled=.85]{beramono}% used only by \mathtt, 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}
+\usepackage[amsthm,vvarbb]{newpxmath}
\usepackage[scr=rsfso]{mathalpha} % optional
\usepackage{bm}% load after all math to give access to bold math, optional
%Now load the otf text fonts using fontspec---won't affect math
@@ -557,7 +555,7 @@ While the math font options must be specified before {\tt fontspec}, be aware of
\begin{verbatim}
%load LaTeX text components before math
\usepackage[T1]{fontenc} % affects only \mathrm, \mathbf etc
-\renewcommand{\rmdefault}{zplTLF}% Roman font for use in math mode
+\renewcommand{\rmdefault}{zpltlf}% Roman font for use in math mode
\usepackage[scaled=.85]{beramono}% used only by \mathtt, optional
\usepackage[type1]{sourcesanspro}% used only by \mathsf, optional
\usepackage{amsmath} % must be loaded before amsthm
@@ -573,12 +571,12 @@ While the math font options must be specified before {\tt fontspec}, be aware of
\textsc{Example preamble using polyglossia:}
\begin{verbatim}
-\renewcommand{\rmdefault}{zplTLF}% Roman and Bold for use in math mode
+\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]{sourcesanspro}% used only by \mathsf, optional
-\usepackage{amsmath} % must be loaded before amsthm
-\usepackage{amsthm}% load before newpxmath
-\usepackage[vvarbb]{newpxmath}
+%\usepackage{amsmath} % must be loaded before amsthm
+%\usepackage{amsthm}% load before newpxmath
+\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
@@ -594,7 +592,7 @@ Previous to version 1.5, the preceding pages of this document were processed usi
\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 {\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}
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{{%