xcharter (2sep21)

git-svn-id: svn://tug.org/texlive/trunk@60400 c570f23f-e606-0410-a88d-b1316a301751

23 files changed, 60 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/fonts/xcharter/README b/Master/texmf-dist/doc/fonts/xcharter/README
index ff73c24e8b9..71253c12f99 100644
--- a/Master/texmf-dist/doc/fonts/xcharter/README
+++ b/Master/texmf-dist/doc/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/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf
index e0c467b125b..8b2eb014dcd 100644
--- a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf
+++ b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.pdf
diff --git a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex b/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex
index 76be5e5e891..e3e4e0ae482 100644
--- a/Master/texmf-dist/doc/fonts/xcharter/xcharter-doc.tex
+++ b/Master/texmf-dist/doc/fonts/xcharter/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/Master/texmf-dist/fonts/afm/public/xcharter/XCharterMathBMI.afm b/Master/texmf-dist/fonts/afm/public/xcharter/XCharterMathBMI.afm
index 7400c08365d..7c98bf63640 100644
--- a/Master/texmf-dist/fonts/afm/public/xcharter/XCharterMathBMI.afm
+++ b/Master/texmf-dist/fonts/afm/public/xcharter/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/Master/texmf-dist/fonts/tfm/public/xcharter/XCharterMathBMI.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharterMathBMI.tfm
index e03cde8ebf2..f16db632c40 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/XCharterMathBMI.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/XCharterMathBMI.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/zchbmi.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/zchbmi.tfm
index d836024ea02..c74178d22ea 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/zchbmi.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/zchbmi.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/zchbmi0.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/zchbmi0.tfm
index 1831f4db86e..5bbe7a6d735 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/zchbmi0.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/zchbmi0.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/zchbmi2.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/zchbmi2.tfm
index 9d330162f95..d34f971c299 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/zchbmi2.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/zchbmi2.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/zchbmi3.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/zchbmi3.tfm
index a1ba3d89357..caee22786ef 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/zchbmi3.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/zchbmi3.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/zchmi.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/zchmi.tfm
index f579c26674e..85502a6654a 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/zchmi.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/zchmi.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/zchmi0.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/zchmi0.tfm
index 734b1519889..a4c6354f1a5 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/zchmi0.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/zchmi0.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/zchmi2.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/zchmi2.tfm
index 490bee12af8..f1be5e3922a 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/zchmi2.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/zchmi2.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/xcharter/zchmi3.tfm b/Master/texmf-dist/fonts/tfm/public/xcharter/zchmi3.tfm
index 3211080340a..2852d29dde3 100644
--- a/Master/texmf-dist/fonts/tfm/public/xcharter/zchmi3.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xcharter/zchmi3.tfm
diff --git a/Master/texmf-dist/fonts/type1/public/xcharter/XCharterMathBMI.pfb b/Master/texmf-dist/fonts/type1/public/xcharter/XCharterMathBMI.pfb
index d12136163da..d1e6de0d705 100644
--- a/Master/texmf-dist/fonts/type1/public/xcharter/XCharterMathBMI.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xcharter/XCharterMathBMI.pfb
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/zchbmi.vf b/Master/texmf-dist/fonts/vf/public/xcharter/zchbmi.vf
index c51f6c291d9..4514e6a14a1 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/zchbmi.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/zchbmi.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/zchbmi0.vf b/Master/texmf-dist/fonts/vf/public/xcharter/zchbmi0.vf
index 1fcad567cd6..53a5d505dbc 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/zchbmi0.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/zchbmi0.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/zchbmi2.vf b/Master/texmf-dist/fonts/vf/public/xcharter/zchbmi2.vf
index b4895c34085..f4293068e4a 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/zchbmi2.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/zchbmi2.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/zchbmi3.vf b/Master/texmf-dist/fonts/vf/public/xcharter/zchbmi3.vf
index c80e7520ec3..44f9e884e12 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/zchbmi3.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/zchbmi3.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/zchmi.vf b/Master/texmf-dist/fonts/vf/public/xcharter/zchmi.vf
index 3ae45640e4d..0dcf8654d86 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/zchmi.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/zchmi.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/zchmi0.vf b/Master/texmf-dist/fonts/vf/public/xcharter/zchmi0.vf
index a81f30e257d..4b444d965c4 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/zchmi0.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/zchmi0.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/zchmi2.vf b/Master/texmf-dist/fonts/vf/public/xcharter/zchmi2.vf
index fee041ad982..de7c9869e95 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/zchmi2.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/zchmi2.vf
diff --git a/Master/texmf-dist/fonts/vf/public/xcharter/zchmi3.vf b/Master/texmf-dist/fonts/vf/public/xcharter/zchmi3.vf
index 96a596f3d28..38b487862ed 100644
--- a/Master/texmf-dist/fonts/vf/public/xcharter/zchmi3.vf
+++ b/Master/texmf-dist/fonts/vf/public/xcharter/zchmi3.vf
diff --git a/Master/texmf-dist/tex/latex/xcharter/XCharter.sty b/Master/texmf-dist/tex/latex/xcharter/XCharter.sty
index 72240550fc6..1eea759aa75 100644
--- a/Master/texmf-dist/tex/latex/xcharter/XCharter.sty
+++ b/Master/texmf-dist/tex/latex/xcharter/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