From 3350516623348f356456f21cfc0694f36e94aeaf Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 3 Sep 2021 03:01:08 +0000 Subject: CTAN sync 202109030301 --- fonts/xcharter/README | 8 ++++- fonts/xcharter/afm/XCharterMathBMI.afm | 8 ++--- fonts/xcharter/doc/xcharter-doc.pdf | Bin 777110 -> 759121 bytes fonts/xcharter/doc/xcharter-doc.tex | 6 ++-- fonts/xcharter/tex/XCharter.sty | 50 ++++++++++++++++++++++++++++--- fonts/xcharter/tfm/XCharterMathBMI.tfm | Bin 1540 -> 1540 bytes fonts/xcharter/tfm/zchbmi.tfm | Bin 3256 -> 3256 bytes fonts/xcharter/tfm/zchbmi0.tfm | Bin 3256 -> 3256 bytes fonts/xcharter/tfm/zchbmi2.tfm | Bin 3256 -> 3256 bytes fonts/xcharter/tfm/zchbmi3.tfm | Bin 3256 -> 3256 bytes fonts/xcharter/tfm/zchmi.tfm | Bin 3252 -> 3256 bytes fonts/xcharter/tfm/zchmi0.tfm | Bin 3248 -> 3252 bytes fonts/xcharter/tfm/zchmi2.tfm | Bin 3252 -> 3256 bytes fonts/xcharter/tfm/zchmi3.tfm | Bin 3248 -> 3252 bytes fonts/xcharter/type1/XCharterMathBMI.pfb | Bin 32788 -> 32788 bytes fonts/xcharter/vf/zchbmi.vf | Bin 2448 -> 2448 bytes fonts/xcharter/vf/zchbmi0.vf | Bin 2448 -> 2448 bytes fonts/xcharter/vf/zchbmi2.vf | Bin 2448 -> 2448 bytes fonts/xcharter/vf/zchbmi3.vf | Bin 2448 -> 2448 bytes fonts/xcharter/vf/zchmi.vf | Bin 2360 -> 2364 bytes fonts/xcharter/vf/zchmi0.vf | Bin 2360 -> 2364 bytes fonts/xcharter/vf/zchmi2.vf | Bin 2360 -> 2364 bytes fonts/xcharter/vf/zchmi3.vf | Bin 2360 -> 2364 bytes 23 files changed, 60 insertions(+), 12 deletions(-) (limited to 'fonts/xcharter') diff --git a/fonts/xcharter/README b/fonts/xcharter/README index ff73c24e8b..71253c12f9 100644 --- a/fonts/xcharter/README +++ b/fonts/xcharter/README @@ -21,7 +21,13 @@ Original Bitstream Free font license: Portions of the font modifications are Copyright (c) 2009--2012, Andrey Panov; Copyright (c) 2013--2021, Michael Sharpe. -Current version: 1.221 2021-05-30 +Current version 1.222 2021-09-01 + +Changes in version 1.222 +1. Corrected the Bold Italic Greek math font so that epsilon and varepsilon are no longer interchanged. (Thanks Holger Gerhardt.) +2. Renamed \textin to \textinf (denominator figures) so as not to conflict with hyperref usage. + +Changes in version 1.221 Removed a number of empty tfm files and references to them in some fd files. Changes in version 1.22 (never distributed) diff --git a/fonts/xcharter/afm/XCharterMathBMI.afm b/fonts/xcharter/afm/XCharterMathBMI.afm index 7400c08365..7c98bf6364 100644 --- a/fonts/xcharter/afm/XCharterMathBMI.afm +++ b/fonts/xcharter/afm/XCharterMathBMI.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 -Comment Generated by FontForge 20190801 -Comment Creation Date: Thu Nov 21 11:12:51 2019 +Comment Generated by FontForge 20200314 +Comment Creation Date: Sun Aug 29 11:43:57 2021 FontName XCharterMathBMI FullName XCharter Math Bold Italic FamilyName XCharterMath @@ -53,7 +53,7 @@ C 34 ; WX 709 ; N u1D736 ; B 44 -11 665 499 ; C 35 ; WX 628 ; N u1D737 ; B -30 -218 591 744 ; C 36 ; WX 567 ; N u1D738 ; B 25 -222 524 499 ; C 37 ; WX 598 ; N u1D739 ; B 24 -11 562 744 ; -C 38 ; WX 519 ; N u1D750 ; B 28 -11 475 499 ; +C 38 ; WX 519 ; N u1D73A ; B 28 -11 475 499 ; C 39 ; WX 563 ; N u1D73B ; B 34 -225 543 744 ; C 40 ; WX 558 ; N u1D73C ; B 24 -219 514 499 ; C 41 ; WX 637 ; N u1D73D ; B 34 -11 592 744 ; @@ -72,7 +72,7 @@ C 53 ; WX 762 ; N u1D753 ; B 34 -219 709 739 ; C 54 ; WX 596 ; N u1D74C ; B -87 -219 562 499 ; C 55 ; WX 805 ; N u1D74D ; B 23 -219 747 739 ; C 56 ; WX 793 ; N u1D74E ; B 22 -11 761 499 ; -C 57 ; WX 511 ; N u1D73A ; B 24 -11 467 499 ; +C 57 ; WX 511 ; N u1D750 ; B 24 -11 467 499 ; C 58 ; WX 662 ; N u1D751 ; B 33 -11 639 744 ; C 59 ; WX 1001 ; N u1D755 ; B 33 -11 948 486 ; C 60 ; WX 611 ; N u1D754 ; B 24 -218 566 492 ; diff --git a/fonts/xcharter/doc/xcharter-doc.pdf b/fonts/xcharter/doc/xcharter-doc.pdf index e0c467b125..8b2eb014dc 100644 Binary files a/fonts/xcharter/doc/xcharter-doc.pdf and b/fonts/xcharter/doc/xcharter-doc.pdf differ diff --git a/fonts/xcharter/doc/xcharter-doc.tex b/fonts/xcharter/doc/xcharter-doc.tex index 76be5e5e89..e3e4e0ae48 100644 --- a/fonts/xcharter/doc/xcharter-doc.tex +++ b/fonts/xcharter/doc/xcharter-doc.tex @@ -5,7 +5,7 @@ \input glyphtounicode.tex \InputIfFileExists{glyphtounicode-cmr.tex}{}{} \InputIfFileExists{glyphtounicode-ntx.tex}{}{} -\usepackage[a-1b]{pdfx} % version 1.6.4 or higher +%\usepackage[a-1b]{pdfx} % version 1.6.4 or higher \usepackage[margin=1in]{geometry} \usepackage[parfill]{parskip} \usepackage{graphicx} @@ -64,7 +64,7 @@ one slot in upright and slanted shapes and five slots in italic shapes, as expec \verb|\useosf| (usable only in the preamble) may be used for changing the text figure style to {\tt osf} though math mode will use lining figures. \item \verb|\useosfI| (usable only in the preamble) may be used for changing the text figure style to {\tt osfI} though math mode will use lining figures. \item \verb|\textsu| prints its argument in superior figures, e.g., \verb|\textsu{12}| results in \textsu{12}. The effect is the same with \verb|{\sustyle 12}|. -\item \verb|\textin| prints its argument in inferior figures, e.g., \verb|\textin{12}| results in \textin{12}. The effect is the same with \verb|{\instyle 12}|. +\item \verb|\textinf| prints its argument in inferior figures, e.g., \verb|\textinf{12}| results in \textinf{12}. The effect is the same with \verb|{\instyle 12}|. (In versions of {\tt XCharter} prior to $1.221$, \verb|\textinf| was named \verb|\textin|, but the latter conflicts with {\tt hyperref} which redefines it to point to U+2208.) \item \verb|\textlf| prints its argument in lining figures, e.g., \verb|\textlf{12}| results in \textlf{12}. The effect is the same with \verb|{\lfstyle 12}|. \item \verb|{\osfstyle 23}| prints \textosf{23} using whatever oldstyle option is in force. \item \verb|\textosf| prints its argument in oldstyle figures using, in effect, the {\tt osf} option---e.g., \verb|\textosf{12}| results in \textosf{12}. @@ -207,7 +207,7 @@ As of version $1.206$, {\tt XCharter} has essentially full support for {\tt text \textsc{XCharter-Roman-ts1} \fonttable{XCharter-Roman-ts1} -\newpage +%\newpage \section{Usage with fontspec} Because the package supplies a file named {\tt XCharter.fontspec} whose contents list the {\tt otf} files that correspond to each of Regular, Bold, Italic, BoldItalic, Slanted and BoldSlanted, you may load XCharter with just \begin{verbatim} diff --git a/fonts/xcharter/tex/XCharter.sty b/fonts/xcharter/tex/XCharter.sty index 72240550fc..1eea759aa7 100644 --- a/fonts/xcharter/tex/XCharter.sty +++ b/fonts/xcharter/tex/XCharter.sty @@ -3,8 +3,8 @@ %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{1.213} -\def\filedate{2020/11/25} +\def\fileversion{1.222} +\def\filedate{2021/09/01} \ProvidesPackage{XCharter}[\filedate\space v\fileversion] @@ -30,8 +30,8 @@ \fa@naming@exception{figures}{{inferior}{tabular}}{Inf} \def\infigures{\@nomath\infigures \fontfigurestyle{inferior}\selectfont} - \DeclareTextFontCommand{\textin}{\infigures} - \let\textinferior\textin + \DeclareTextFontCommand{\textinf}{\infigures} + \let\textinferior\textinf \fa@naming@exception{figures}{{numerators}{proportional}}{Numr} \fa@naming@exception{figures}{{numerators}{tabular}}{Numr} @@ -87,6 +87,7 @@ \fontfamily{XCharter-TOsF}\selectfont } \def\textlf#1{{\lfstyle #1}} %\def\textosf#1{{\osfstyle #1}} +\edef\XCh@dfltfigurestyle{TLF} \newcommand*{\XCharter@scale}{1} \IfFileExists{xkeyval.sty}{ @@ -106,6 +107,8 @@ %\ifdefined\bbl@tempa \XCh@babeltrue\fi \newif\if@XCh@scosf \newif\if@XCh@srb +\newif\ifXCh@thrm + \def\XCharter@altone{1}% default is to use 1, not I \newif\if@XCh@sups \DeclareOptionX{foresolidus}{\gdef\XCh@foresolidus{#1}} @@ -116,6 +119,7 @@ \edef\XCharter@altone{1}} \DeclareOptionX{oldstyleI}{\edef\XCharter@figurestyle{TOsF}% \edef\XCharter@altone{}} +\DeclareOptionX{theoremfont}{\XCh@thrmtrue} \DeclareOptionX{osf}{\edef\XCharter@figurestyle{TOsF}\edef\XCharter@altone{1}} \DeclareOptionX{osfI}{\edef\XCharter@figurestyle{TOsF}\edef\XCharter@altone{}} \DeclareOptionX{sups}{\@XCh@supstrue} @@ -136,6 +140,23 @@ \newcommand{\textosf}[1]{{\fontencoding{T1}\fontfamily{XCharterx}\selectfont #1}}% to get XCharter osf \newcommand{\textosfI}[1]{{\fontencoding{T1}\fontfamily{XChartery}\selectfont #1}}% to get XCharter osfI +\ifXCh@thrm + %\RequirePackage{amsmath,amsthm} % in case of theoremfont + \ifdefined\newtheoremstyle %amsthm and ntheorem, not theorem.sty + \@ifpackageloaded{ntheorem}\relax{% + \newtheoremstyle{plain} + {\medskipamount} % ABOVESPACE, was \topsep + {\medskipamount} % BELOWSPACE, was \topsep + {\thfamily} % BODYFONT--\thfamily is italic with upright figures and punctuation + {} % INDENT (empty value is the same as 0pt) + {\bfseries} % HEADFONT--you may want to add \tlfstyle so the number is tab lining, regardless of text figure selection + {.} % HEADPUNCT + {5pt plus 1pt minus 1pt} % HEADSPACE + {} % CUSTOM-HEAD-SPEC\newtheorem{thm}{Theorem}[section] + } % end @ifpackageloaded + \fi% +\fi%} + \renewcommand*{\bfdefault}{b} \renewcommand*{\scdefault}{sc}% for better compatibility with mathdesign @@ -221,8 +242,29 @@ % \renewcommand*{\rmdefault}{XCharter-\XCharter@figurestyle} % \normalfont %\else + +\DeclareRobustCommand\thfamily % new family for theorem font + {\not@math@alphabet\thfamily\relax + \fontfamily\thdefault\fontshape{it}\selectfont} +\DeclareRobustCommand{\textth}[1]{% + {\thfamily #1}% +} +\let\textthit\textth + \AtEndPreamble{% \renewcommand*{\rmdefault}{XCharter-\XCharter@figurestyle} +%\def\XCharter@thfigurestyle{\XCharter@figurestyle} +\ifx\XCharter@figurestyle\XCh@dfltfigurestyle + \def\XCharter@thfigurestyle{tlf} +\else + \def\XCharter@thfigurestyle{osf} +\fi % there just two possible figure styles for the theorem font + +\newcommand*{\thdefault}{XCharterTH-\XCharter@thfigurestyle} +\ifXCh@thrm + \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 \normalfont} %\fi diff --git a/fonts/xcharter/tfm/XCharterMathBMI.tfm b/fonts/xcharter/tfm/XCharterMathBMI.tfm index e03cde8ebf..f16db632c4 100644 Binary files a/fonts/xcharter/tfm/XCharterMathBMI.tfm and b/fonts/xcharter/tfm/XCharterMathBMI.tfm differ diff --git a/fonts/xcharter/tfm/zchbmi.tfm b/fonts/xcharter/tfm/zchbmi.tfm index d836024ea0..c74178d22e 100644 Binary files a/fonts/xcharter/tfm/zchbmi.tfm and b/fonts/xcharter/tfm/zchbmi.tfm differ diff --git a/fonts/xcharter/tfm/zchbmi0.tfm b/fonts/xcharter/tfm/zchbmi0.tfm index 1831f4db86..5bbe7a6d73 100644 Binary files a/fonts/xcharter/tfm/zchbmi0.tfm and b/fonts/xcharter/tfm/zchbmi0.tfm differ diff --git a/fonts/xcharter/tfm/zchbmi2.tfm b/fonts/xcharter/tfm/zchbmi2.tfm index 9d330162f9..d34f971c29 100644 Binary files a/fonts/xcharter/tfm/zchbmi2.tfm and b/fonts/xcharter/tfm/zchbmi2.tfm differ diff --git a/fonts/xcharter/tfm/zchbmi3.tfm b/fonts/xcharter/tfm/zchbmi3.tfm index a1ba3d8935..caee22786e 100644 Binary files a/fonts/xcharter/tfm/zchbmi3.tfm and b/fonts/xcharter/tfm/zchbmi3.tfm differ diff --git a/fonts/xcharter/tfm/zchmi.tfm b/fonts/xcharter/tfm/zchmi.tfm index f579c26674..85502a6654 100644 Binary files a/fonts/xcharter/tfm/zchmi.tfm and b/fonts/xcharter/tfm/zchmi.tfm differ diff --git a/fonts/xcharter/tfm/zchmi0.tfm b/fonts/xcharter/tfm/zchmi0.tfm index 734b151988..a4c6354f1a 100644 Binary files a/fonts/xcharter/tfm/zchmi0.tfm and b/fonts/xcharter/tfm/zchmi0.tfm differ diff --git a/fonts/xcharter/tfm/zchmi2.tfm b/fonts/xcharter/tfm/zchmi2.tfm index 490bee12af..f1be5e3922 100644 Binary files a/fonts/xcharter/tfm/zchmi2.tfm and b/fonts/xcharter/tfm/zchmi2.tfm differ diff --git a/fonts/xcharter/tfm/zchmi3.tfm b/fonts/xcharter/tfm/zchmi3.tfm index 3211080340..2852d29dde 100644 Binary files a/fonts/xcharter/tfm/zchmi3.tfm and b/fonts/xcharter/tfm/zchmi3.tfm differ diff --git a/fonts/xcharter/type1/XCharterMathBMI.pfb b/fonts/xcharter/type1/XCharterMathBMI.pfb index d12136163d..d1e6de0d70 100644 Binary files a/fonts/xcharter/type1/XCharterMathBMI.pfb and b/fonts/xcharter/type1/XCharterMathBMI.pfb differ diff --git a/fonts/xcharter/vf/zchbmi.vf b/fonts/xcharter/vf/zchbmi.vf index c51f6c291d..4514e6a14a 100644 Binary files a/fonts/xcharter/vf/zchbmi.vf and b/fonts/xcharter/vf/zchbmi.vf differ diff --git a/fonts/xcharter/vf/zchbmi0.vf b/fonts/xcharter/vf/zchbmi0.vf index 1fcad567cd..53a5d505db 100644 Binary files a/fonts/xcharter/vf/zchbmi0.vf and b/fonts/xcharter/vf/zchbmi0.vf differ diff --git a/fonts/xcharter/vf/zchbmi2.vf b/fonts/xcharter/vf/zchbmi2.vf index b4895c3408..f4293068e4 100644 Binary files a/fonts/xcharter/vf/zchbmi2.vf and b/fonts/xcharter/vf/zchbmi2.vf differ diff --git a/fonts/xcharter/vf/zchbmi3.vf b/fonts/xcharter/vf/zchbmi3.vf index c80e7520ec..44f9e884e1 100644 Binary files a/fonts/xcharter/vf/zchbmi3.vf and b/fonts/xcharter/vf/zchbmi3.vf differ diff --git a/fonts/xcharter/vf/zchmi.vf b/fonts/xcharter/vf/zchmi.vf index 3ae45640e4..0dcf8654d8 100644 Binary files a/fonts/xcharter/vf/zchmi.vf and b/fonts/xcharter/vf/zchmi.vf differ diff --git a/fonts/xcharter/vf/zchmi0.vf b/fonts/xcharter/vf/zchmi0.vf index a81f30e257..4b444d965c 100644 Binary files a/fonts/xcharter/vf/zchmi0.vf and b/fonts/xcharter/vf/zchmi0.vf differ diff --git a/fonts/xcharter/vf/zchmi2.vf b/fonts/xcharter/vf/zchmi2.vf index fee041ad98..de7c9869e9 100644 Binary files a/fonts/xcharter/vf/zchmi2.vf and b/fonts/xcharter/vf/zchmi2.vf differ diff --git a/fonts/xcharter/vf/zchmi3.vf b/fonts/xcharter/vf/zchmi3.vf index 96a596f3d2..38b487862e 100644 Binary files a/fonts/xcharter/vf/zchmi3.vf and b/fonts/xcharter/vf/zchmi3.vf differ -- cgit v1.2.3