diff options
Diffstat (limited to 'Master/texmf-dist/tex')
46 files changed, 494 insertions, 439 deletions
diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Dnom.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Dnom.fd index 0c1f4a773ad..17e4107ebe2 100644 --- a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Dnom.fd +++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Dnom.fd @@ -4,9 +4,9 @@ [2017/06/25 (autoinst) Font definitions for LY1/XCharter-Dnom.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Inf.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Inf.fd index dffadfaf630..a1a462285bd 100644 --- a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Inf.fd +++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Inf.fd @@ -4,9 +4,9 @@ [2017/06/25 (autoinst) Font definitions for LY1/XCharter-Inf.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi \DeclareFontFamily{LY1}{XCharter-Inf}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-LF.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-LF.fd index f1996e065be..5f38a70ac7d 100644 --- a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-LF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-LF.fd @@ -4,11 +4,12 @@ [2022/02/17 (autoinst and msharpe) Font definitions for LY1/XCharter-LF.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi + \DeclareFontFamily{LY1}{XCharter-LF}{} \DeclareFontShape{LY1}{XCharter-LF}{b}{sc}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Numr.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Numr.fd index 32a546c0590..4e8e9cb4cd2 100644 --- a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Numr.fd +++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Numr.fd @@ -4,9 +4,9 @@ [2017/06/25 (autoinst) Font definitions for LY1/XCharter-Numr.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi \DeclareFontFamily{LY1}{XCharter-Numr}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-OsF.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-OsF.fd index 2370f613452..7a5211570b6 100644 --- a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-OsF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-OsF.fd @@ -4,16 +4,16 @@ [2022/02/17 (autoinst and msharpe) Font definitions for LY1/XCharter-OsF.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi \expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty + \global\let\XCharter@@altone\@empty \else - \edef\XCharter@@altone{\XCharter@altone}% + \xdef\XCharter@@altone{\XCharter@altone}% \fi \DeclareFontFamily{LY1}{XCharter-OsF}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Sup.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Sup.fd index d1d89cb597e..56262d6b907 100644 --- a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Sup.fd +++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Sup.fd @@ -4,9 +4,9 @@ [2017/06/25 (autoinst) Font definitions for LY1/XCharter-Sup.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi \DeclareFontFamily{LY1}{XCharter-Sup}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TLF.fd index 6cf512287ef..8634d90eb7b 100644 --- a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TLF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TLF.fd @@ -4,9 +4,9 @@ [2017/06/25 (autoinst) Font definitions for LY1/XCharter-TLF.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi \DeclareFontFamily{LY1}{XCharter-TLF}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TOsF.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TOsF.fd index cb0bb0d9adc..45e1a74ec64 100644 --- a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TOsF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TOsF.fd @@ -4,16 +4,16 @@ [2017/06/25 (autoinst) Font definitions for LY1/XCharter-TOsF.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi \expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty + \global\let\XCharter@@altone\@empty \else - \edef\XCharter@@altone{\XCharter@altone}% + \xdef\XCharter@@altone{\XCharter@altone}% \fi \DeclareFontFamily{LY1}{XCharter-TOsF}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharterTH-osf.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharterTH-osf.fd index a12eb7ef28d..9e29239c34d 100644 --- a/Master/texmf-dist/tex/latex/xcharter/LY1XCharterTH-osf.fd +++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharterTH-osf.fd @@ -1,9 +1,9 @@ \ProvidesFile{LY1XCharterTH-osf.fd}[2021/05/28 v1.0 font definition file for LY1/XCharterTH/osf] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty% + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi \DeclareFontFamily{LY1}{XCharterTH-osf}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharterTH-tlf.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharterTH-tlf.fd index 8088f1afe85..d143dccf1c1 100644 --- a/Master/texmf-dist/tex/latex/xcharter/LY1XCharterTH-tlf.fd +++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharterTH-tlf.fd @@ -1,9 +1,9 @@ \ProvidesFile{LY1XCharterTH-tlf.fd}[2021/05/28 v1.0 font definition file for LY1/XCharterTH/tlf] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty% + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi \DeclareFontFamily{LY1}{XCharterTH-tlf}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Dnom.fd b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Dnom.fd index 6953e107fee..fd0af7ddd7b 100644 --- a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Dnom.fd +++ b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Dnom.fd @@ -4,9 +4,9 @@ [2017/06/25 (autoinst) Font definitions for OT1/XCharter-Dnom.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi \DeclareFontFamily{OT1}{XCharter-Dnom}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Inf.fd b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Inf.fd index ad44ba894e7..6cb52478425 100644 --- a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Inf.fd +++ b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Inf.fd @@ -4,11 +4,12 @@ [2017/06/25 (autoinst) Font definitions for OT1/XCharter-Inf.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi + \DeclareFontFamily{OT1}{XCharter-Inf}{} \DeclareFontShape{OT1}{XCharter-Inf}{b}{it}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-LF.fd b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-LF.fd index 2453e1663e1..5697344a0de 100644 --- a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-LF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-LF.fd @@ -4,11 +4,16 @@ [2022/02/17 (autoinst and msharpe) Font definitions for OT1/XCharter-LF.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi +\expandafter\ifx\csname XCharter@altone\endcsname\relax + \global\let\XCharter@@altone\@empty +\else + \xdef\XCharter@@altone{\XCharter@altone}% +\fi \DeclareFontFamily{OT1}{XCharter-LF}{} \DeclareFontShape{OT1}{XCharter-LF}{b}{sc}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Numr.fd b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Numr.fd index c3cf438f13d..7a8f86fca0d 100644 --- a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Numr.fd +++ b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Numr.fd @@ -4,9 +4,9 @@ [2017/06/25 (autoinst) Font definitions for OT1/XCharter-Numr.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi \DeclareFontFamily{OT1}{XCharter-Numr}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-OsF.fd b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-OsF.fd index 8b138ee8f57..6876965a27d 100644 --- a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-OsF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-OsF.fd @@ -4,16 +4,16 @@ [2022/02/17 (autoinst and msharpe) Font definitions for OT1/XCharter-OsF.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi \expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty + \global\let\XCharter@@altone\@empty \else - \edef\XCharter@@altone{\XCharter@altone}% + \xdef\XCharter@@altone{\XCharter@altone}% \fi \DeclareFontFamily{OT1}{XCharter-OsF}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Sup.fd b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Sup.fd index 386f2120bad..3a6752b991d 100644 --- a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Sup.fd +++ b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Sup.fd @@ -4,11 +4,12 @@ [2017/06/25 (autoinst) Font definitions for OT1/XCharter-Sup.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi + \DeclareFontFamily{OT1}{XCharter-Sup}{} \DeclareFontShape{OT1}{XCharter-Sup}{b}{it}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TLF.fd index 4b132d28925..ec816ecb197 100644 --- a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TLF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TLF.fd @@ -4,11 +4,12 @@ [2017/06/25 (autoinst) Font definitions for OT1/XCharter-TLF.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi + \DeclareFontFamily{OT1}{XCharter-TLF}{} \DeclareFontShape{OT1}{XCharter-TLF}{b}{sc}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TOsF.fd b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TOsF.fd index 2de1fee0f76..b1bd55b9e46 100644 --- a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TOsF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TOsF.fd @@ -4,16 +4,16 @@ [2017/06/25 (autoinst) Font definitions for OT1/XCharter-TOsF.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi \expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty + \global\let\XCharter@@altone\@empty \else - \edef\XCharter@@altone{\XCharter@altone}% + \xdef\XCharter@@altone{\XCharter@altone}% \fi \DeclareFontFamily{OT1}{XCharter-TOsF}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/OT1XCharterTH-osf.fd b/Master/texmf-dist/tex/latex/xcharter/OT1XCharterTH-osf.fd index d073663f7aa..526cab5cb93 100644 --- a/Master/texmf-dist/tex/latex/xcharter/OT1XCharterTH-osf.fd +++ b/Master/texmf-dist/tex/latex/xcharter/OT1XCharterTH-osf.fd @@ -1,11 +1,12 @@ \ProvidesFile{OOT1XCharterTH-osf.fd}[2021/05/28 v1.0 font definition file for OT1/XCharterTH/osf] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty% + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi + \DeclareFontFamily{OT1}{XCharterTH-osf}{} \DeclareFontShape{OT1}{XCharterTH-osf}{m}{it}{<-> \XCharter@@scale XCharter1TH-Italic-osf-ot1}{} \DeclareFontShape{OT1}{XCharterTH-osf}{b}{it}{<-> \XCharter@@scale XCharter1TH-BoldItalic-osf-ot1}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/OT1XCharterTH-tlf.fd b/Master/texmf-dist/tex/latex/xcharter/OT1XCharterTH-tlf.fd index c1a07153c34..5279a55a55d 100644 --- a/Master/texmf-dist/tex/latex/xcharter/OT1XCharterTH-tlf.fd +++ b/Master/texmf-dist/tex/latex/xcharter/OT1XCharterTH-tlf.fd @@ -1,11 +1,12 @@ \ProvidesFile{OT1XCharterTH-tlf.fd}[2021/05/28 v1.0 font definition file for OT1/XCharterTH/tlf] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty% + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi + \DeclareFontFamily{OT1}{XCharterTH-tlf}{} \DeclareFontShape{OT1}{XCharterTH-tlf}{m}{it}{<-> \XCharter@@scale XCharter1TH-Italic-tlf-ot1}{} \DeclareFontShape{OT1}{XCharterTH-tlf}{b}{it}{<-> \XCharter@@scale XCharter1TH-BoldItalic-tlf-ot1}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/OT2XCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/OT2XCharter-TLF.fd index 9d05b9d3399..6e0cd695e28 100644 --- a/Master/texmf-dist/tex/latex/xcharter/OT2XCharter-TLF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/OT2XCharter-TLF.fd @@ -8,11 +8,12 @@ [2017/06/15 Fontinst v1.933 font definitions for OT2/xcharter-tlf.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi + \DeclareFontFamily{OT2}{XCharter-TLF}{} \DeclareFontShape{OT2}{XCharter-TLF}{m}{n}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Dnom.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Dnom.fd index a5b8d86416e..3674fbc130f 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Dnom.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Dnom.fd @@ -4,9 +4,9 @@ [2017/06/25 (autoinst) Font definitions for T1/XCharter-Dnom.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi \DeclareFontFamily{T1}{XCharter-Dnom}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Inf.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Inf.fd index b600c79b0b2..7b46c6454f7 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Inf.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Inf.fd @@ -4,11 +4,12 @@ [2017/06/25 (autoinst) Font definitions for T1/XCharter-Inf.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi + \DeclareFontFamily{T1}{XCharter-Inf}{} \DeclareFontShape{T1}{XCharter-Inf}{b}{n}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-LF.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-LF.fd index bf350b2dc89..475dbe0520b 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-LF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-LF.fd @@ -4,11 +4,12 @@ [2022/02/17 (autoinst and msharpe) Font definitions for T1/XCharter-LF.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi + \DeclareFontFamily{T1}{XCharter-LF}{} \DeclareFontShape{T1}{XCharter-LF}{m}{sl}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Numr.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Numr.fd index 302b55c19df..8fed8fe90cf 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Numr.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Numr.fd @@ -4,11 +4,12 @@ [2017/06/25 (autoinst) Font definitions for T1/XCharter-Numr.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi + \DeclareFontFamily{T1}{XCharter-Numr}{} \DeclareFontShape{T1}{XCharter-Numr}{b}{n}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-OsF.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-OsF.fd index 95c41838eae..f4aecbd21fa 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-OsF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-OsF.fd @@ -4,16 +4,16 @@ [2022/02/17 (autoinst and msharpe) Font definitions for T1/XCharter-OsF.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi \expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty + \global\let\XCharter@@altone\@empty \else - \edef\XCharter@@altone{\XCharter@altone}% + \xdef\XCharter@@altone{\XCharter@altone}% \fi \DeclareFontFamily{T1}{XCharter-OsF}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Sup.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Sup.fd index be496ee6b46..1903799b777 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Sup.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Sup.fd @@ -4,11 +4,12 @@ [2017/06/25 (autoinst) Font definitions for T1/XCharter-Sup.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi + \DeclareFontFamily{T1}{XCharter-Sup}{} \DeclareFontShape{T1}{XCharter-Sup}{b}{sl}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TLF.fd index c37155b916a..ee9fc58bd7b 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TLF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TLF.fd @@ -4,11 +4,12 @@ [2017/06/25 (autoinst) Font definitions for T1/XCharter-TLF.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi + \DeclareFontFamily{T1}{XCharter-TLF}{} \DeclareFontShape{T1}{XCharter-TLF}{m}{sl}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TOsF.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TOsF.fd index cabffa9efe1..6a1cb909439 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TOsF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TOsF.fd @@ -1,19 +1,18 @@ -%% Generated by autoinst on 2017/06/25 %% \ProvidesFile{T1XCharter-TOsF.fd} [2017/06/25 (autoinst) Font definitions for T1/XCharter-TOsF.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi \expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty + \global\let\XCharter@@altone\@empty \else - \edef\XCharter@@altone{\XCharter@altone}% + \xdef\XCharter@@altone{\XCharter@altone}% \fi \DeclareFontFamily{T1}{XCharter-TOsF}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharterTH-osf.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharterTH-osf.fd index b75ebb25df9..a8666273c0d 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T1XCharterTH-osf.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharterTH-osf.fd @@ -1,11 +1,12 @@ \ProvidesFile{T1XCharterTH-osf.fd}[2021/05/28 v1.0 font definition file for T1/XCharterTH/osf] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty% + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi + \DeclareFontFamily{T1}{XCharterTH-osf}{} \DeclareFontShape{T1}{XCharterTH-osf}{m}{it}{<-> \XCharter@@scale XCharter1TH-Italic-osf-t1}{} \DeclareFontShape{T1}{XCharterTH-osf}{b}{it}{<-> \XCharter@@scale XCharter1TH-BoldItalic-osf-t1}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharterTH-tlf.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharterTH-tlf.fd index d054fc4e9fb..6f90ba314a7 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T1XCharterTH-tlf.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharterTH-tlf.fd @@ -1,9 +1,9 @@ \ProvidesFile{T1XCharterTH-tlf.fd}[2021/05/28 v1.0 font definition file for T1/XCharterTH/tlf] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty% + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi \DeclareFontFamily{T1}{XCharterTH-tlf}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-LF.fd b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-LF.fd index 33c69a98747..a62f1040a18 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-LF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2022/02/23 +%% Generated by autoinst on 2023/02/09 %% \ProvidesFile{T2ASRBXCharter-LF.fd} - [2022/02/23 (autoinst) Font definitions for T2ASRB/XCharter-LF.] + [2023/02/09 (autoinst) Font definitions for T2ASRB/XCharter-LF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -22,6 +22,14 @@ % ---- m = regular ---- +\DeclareFontShape{T2ASRB}{XCharter-LF}{m}{sl}{ + <-> \XCharter@@scale XCharter-Slanted-lf-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-LF}{regular}{sl}{ + <-> alias * XCharter-LF/m/sl +}{} + \DeclareFontShape{T2ASRB}{XCharter-LF}{m}{n}{ <-> \XCharter@@scale XCharter-Roman-lf-t2asrb }{} @@ -46,12 +54,12 @@ <-> alias * XCharter-LF/m/it }{} -\DeclareFontShape{T2ASRB}{XCharter-LF}{m}{sl}{ - <-> \XCharter@@scale XCharter-Slanted-lf-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-LF}{m}{sc}{ + <-> \XCharter@@scale XCharter-Roman-lf-sc-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-LF}{regular}{sl}{ - <-> alias * XCharter-LF/m/sl +\DeclareFontShape{T2ASRB}{XCharter-LF}{regular}{sc}{ + <-> alias * XCharter-LF/m/sc }{} \DeclareFontShape{T2ASRB}{XCharter-LF}{m}{scsl}{ @@ -62,25 +70,9 @@ <-> alias * XCharter-LF/m/scsl }{} -\DeclareFontShape{T2ASRB}{XCharter-LF}{m}{sc}{ - <-> \XCharter@@scale XCharter-Roman-lf-sc-t2asrb -}{} - -\DeclareFontShape{T2ASRB}{XCharter-LF}{regular}{sc}{ - <-> alias * XCharter-LF/m/sc -}{} - % ---- b = bold ---- -\DeclareFontShape{T2ASRB}{XCharter-LF}{b}{sl}{ - <-> \XCharter@@scale XCharter-BoldSlanted-lf-t2asrb -}{} - -\DeclareFontShape{T2ASRB}{XCharter-LF}{bold}{sl}{ - <-> alias * XCharter-LF/b/sl -}{} - \DeclareFontShape{T2ASRB}{XCharter-LF}{b}{n}{ <-> \XCharter@@scale XCharter-Bold-lf-t2asrb }{} @@ -89,12 +81,12 @@ <-> alias * XCharter-LF/b/n }{} -\DeclareFontShape{T2ASRB}{XCharter-LF}{b}{it}{ - <-> \XCharter@@scale XCharter-BoldItalic-lf-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-LF}{b}{sl}{ + <-> \XCharter@@scale XCharter-BoldSlanted-lf-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-LF}{bold}{it}{ - <-> alias * XCharter-LF/b/it +\DeclareFontShape{T2ASRB}{XCharter-LF}{bold}{sl}{ + <-> alias * XCharter-LF/b/sl }{} \DeclareFontShape{T2ASRB}{XCharter-LF}{b}{scit}{ @@ -113,6 +105,14 @@ <-> alias * XCharter-LF/b/sc }{} +\DeclareFontShape{T2ASRB}{XCharter-LF}{b}{it}{ + <-> \XCharter@@scale XCharter-BoldItalic-lf-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-LF}{bold}{it}{ + <-> alias * XCharter-LF/b/it +}{} + \DeclareFontShape{T2ASRB}{XCharter-LF}{b}{scsl}{ <-> \XCharter@@scale XCharter-BoldSlanted-lf-sc-t2asrb }{} @@ -124,28 +124,28 @@ % ---- Extra 'ssub' rules to map 'bx' to 'b' ---- -\DeclareFontShape{T2ASRB}{XCharter-LF}{bx}{sl}{ - <-> ssub * XCharter-LF/b/sl +\DeclareFontShape{T2ASRB}{XCharter-LF}{bx}{scit}{ + <-> ssub * XCharter-LF/b/scit }{} \DeclareFontShape{T2ASRB}{XCharter-LF}{bx}{n}{ <-> ssub * XCharter-LF/b/n }{} -\DeclareFontShape{T2ASRB}{XCharter-LF}{bx}{it}{ - <-> ssub * XCharter-LF/b/it +\DeclareFontShape{T2ASRB}{XCharter-LF}{bx}{sl}{ + <-> ssub * XCharter-LF/b/sl }{} -\DeclareFontShape{T2ASRB}{XCharter-LF}{bx}{scit}{ - <-> ssub * XCharter-LF/b/scit +\DeclareFontShape{T2ASRB}{XCharter-LF}{bx}{scsl}{ + <-> ssub * XCharter-LF/b/scsl }{} \DeclareFontShape{T2ASRB}{XCharter-LF}{bx}{sc}{ <-> ssub * XCharter-LF/b/sc }{} -\DeclareFontShape{T2ASRB}{XCharter-LF}{bx}{scsl}{ - <-> ssub * XCharter-LF/b/scsl +\DeclareFontShape{T2ASRB}{XCharter-LF}{bx}{it}{ + <-> ssub * XCharter-LF/b/it }{} \endinput diff --git a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-OsF.fd b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-OsF.fd index c46bcc6d833..808eedfec41 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-OsF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2022/02/23 +%% Generated by autoinst on 2023/02/09 %% \ProvidesFile{T2ASRBXCharter-OsF.fd} - [2022/02/23 (autoinst) Font definitions for T2ASRB/XCharter-OsF.] + [2023/02/09 (autoinst) Font definitions for T2ASRB/XCharter-OsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,132 +20,132 @@ \DeclareFontFamily{T2ASRB}{XCharter-OsF}{} -% ---- b = bold ---- +% ---- m = regular ---- -\DeclareFontShape{T2ASRB}{XCharter-OsF}{b}{sl}{ - <-> \XCharter@@scale XCharter-BoldSlanted-osf-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-OsF}{m}{sl}{ + <-> \XCharter@@scale XCharter-Slanted-osf-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{bold}{sl}{ - <-> alias * XCharter-OsF/b/sl +\DeclareFontShape{T2ASRB}{XCharter-OsF}{regular}{sl}{ + <-> alias * XCharter-OsF/m/sl }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{b}{n}{ - <-> \XCharter@@scale XCharter-Bold-osf-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-OsF}{m}{n}{ + <-> \XCharter@@scale XCharter-Roman-osf-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{bold}{n}{ - <-> alias * XCharter-OsF/b/n +\DeclareFontShape{T2ASRB}{XCharter-OsF}{regular}{n}{ + <-> alias * XCharter-OsF/m/n }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{b}{it}{ - <-> \XCharter@@scale XCharter-BoldItalic-osf-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-OsF}{m}{scit}{ + <-> \XCharter@@scale XCharter-Italic-osf-sc-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{bold}{it}{ - <-> alias * XCharter-OsF/b/it +\DeclareFontShape{T2ASRB}{XCharter-OsF}{regular}{scit}{ + <-> alias * XCharter-OsF/m/scit }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{b}{scit}{ - <-> \XCharter@@scale XCharter-BoldItalic-osf-sc-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-OsF}{m}{it}{ + <-> \XCharter@@scale XCharter-Italic-osf-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{bold}{scit}{ - <-> alias * XCharter-OsF/b/scit +\DeclareFontShape{T2ASRB}{XCharter-OsF}{regular}{it}{ + <-> alias * XCharter-OsF/m/it }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{b}{sc}{ - <-> \XCharter@@scale XCharter-Bold-osf-sc-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-OsF}{m}{sc}{ + <-> \XCharter@@scale XCharter-Roman-osf-sc-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{bold}{sc}{ - <-> alias * XCharter-OsF/b/sc +\DeclareFontShape{T2ASRB}{XCharter-OsF}{regular}{sc}{ + <-> alias * XCharter-OsF/m/sc }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{b}{scsl}{ - <-> \XCharter@@scale XCharter-BoldSlanted-osf-sc-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-OsF}{m}{scsl}{ + <-> \XCharter@@scale XCharter-Slanted-osf-sc-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{bold}{scsl}{ - <-> alias * XCharter-OsF/b/scsl +\DeclareFontShape{T2ASRB}{XCharter-OsF}{regular}{scsl}{ + <-> alias * XCharter-OsF/m/scsl }{} -% ---- m = regular ---- +% ---- b = bold ---- -\DeclareFontShape{T2ASRB}{XCharter-OsF}{m}{it}{ - <-> \XCharter@@scale XCharter-Italic-osf-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-OsF}{b}{sc}{ + <-> \XCharter@@scale XCharter-Bold-osf-sc-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{regular}{it}{ - <-> alias * XCharter-OsF/m/it +\DeclareFontShape{T2ASRB}{XCharter-OsF}{bold}{sc}{ + <-> alias * XCharter-OsF/b/sc }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{m}{scit}{ - <-> \XCharter@@scale XCharter-Italic-osf-sc-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-OsF}{b}{it}{ + <-> \XCharter@@scale XCharter-BoldItalic-osf-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{regular}{scit}{ - <-> alias * XCharter-OsF/m/scit +\DeclareFontShape{T2ASRB}{XCharter-OsF}{bold}{it}{ + <-> alias * XCharter-OsF/b/it }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{m}{n}{ - <-> \XCharter@@scale XCharter-Roman-osf-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-OsF}{b}{scsl}{ + <-> \XCharter@@scale XCharter-BoldSlanted-osf-sc-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{regular}{n}{ - <-> alias * XCharter-OsF/m/n +\DeclareFontShape{T2ASRB}{XCharter-OsF}{bold}{scsl}{ + <-> alias * XCharter-OsF/b/scsl }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{m}{sl}{ - <-> \XCharter@@scale XCharter-Slanted-osf-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-OsF}{b}{n}{ + <-> \XCharter@@scale XCharter-Bold-osf-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{regular}{sl}{ - <-> alias * XCharter-OsF/m/sl +\DeclareFontShape{T2ASRB}{XCharter-OsF}{bold}{n}{ + <-> alias * XCharter-OsF/b/n }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{m}{scsl}{ - <-> \XCharter@@scale XCharter-Slanted-osf-sc-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-OsF}{b}{sl}{ + <-> \XCharter@@scale XCharter-BoldSlanted-osf-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{regular}{scsl}{ - <-> alias * XCharter-OsF/m/scsl +\DeclareFontShape{T2ASRB}{XCharter-OsF}{bold}{sl}{ + <-> alias * XCharter-OsF/b/sl }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{m}{sc}{ - <-> \XCharter@@scale XCharter-Roman-osf-sc-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-OsF}{b}{scit}{ + <-> \XCharter@@scale XCharter-BoldItalic-osf-sc-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{regular}{sc}{ - <-> alias * XCharter-OsF/m/sc +\DeclareFontShape{T2ASRB}{XCharter-OsF}{bold}{scit}{ + <-> alias * XCharter-OsF/b/scit }{} % ---- Extra 'ssub' rules to map 'bx' to 'b' ---- -\DeclareFontShape{T2ASRB}{XCharter-OsF}{bx}{scsl}{ - <-> ssub * XCharter-OsF/b/scsl -}{} - -\DeclareFontShape{T2ASRB}{XCharter-OsF}{bx}{sc}{ - <-> ssub * XCharter-OsF/b/sc +\DeclareFontShape{T2ASRB}{XCharter-OsF}{bx}{scit}{ + <-> ssub * XCharter-OsF/b/scit }{} \DeclareFontShape{T2ASRB}{XCharter-OsF}{bx}{n}{ <-> ssub * XCharter-OsF/b/n }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{bx}{scit}{ - <-> ssub * XCharter-OsF/b/scit +\DeclareFontShape{T2ASRB}{XCharter-OsF}{bx}{sl}{ + <-> ssub * XCharter-OsF/b/sl }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{bx}{it}{ - <-> ssub * XCharter-OsF/b/it +\DeclareFontShape{T2ASRB}{XCharter-OsF}{bx}{scsl}{ + <-> ssub * XCharter-OsF/b/scsl }{} -\DeclareFontShape{T2ASRB}{XCharter-OsF}{bx}{sl}{ - <-> ssub * XCharter-OsF/b/sl +\DeclareFontShape{T2ASRB}{XCharter-OsF}{bx}{sc}{ + <-> ssub * XCharter-OsF/b/sc +}{} + +\DeclareFontShape{T2ASRB}{XCharter-OsF}{bx}{it}{ + <-> ssub * XCharter-OsF/b/it }{} \endinput diff --git a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-Sup.fd b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-Sup.fd index dc6f93386de..610dc522d9a 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-Sup.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2022/02/23 +%% Generated by autoinst on 2023/02/09 %% \ProvidesFile{T2ASRBXCharter-Sup.fd} - [2022/02/23 (autoinst) Font definitions for T2ASRB/XCharter-Sup.] + [2023/02/09 (autoinst) Font definitions for T2ASRB/XCharter-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,57 +20,57 @@ \DeclareFontFamily{T2ASRB}{XCharter-Sup}{} -% ---- b = bold ---- +% ---- m = regular ---- -\DeclareFontShape{T2ASRB}{XCharter-Sup}{b}{it}{ - <-> \XCharter@@scale XCharter-BoldItalic-sup-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-Sup}{m}{it}{ + <-> \XCharter@@scale XCharter-Italic-sup-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-Sup}{bold}{it}{ - <-> alias * XCharter-Sup/b/it +\DeclareFontShape{T2ASRB}{XCharter-Sup}{regular}{it}{ + <-> alias * XCharter-Sup/m/it }{} -\DeclareFontShape{T2ASRB}{XCharter-Sup}{b}{n}{ - <-> \XCharter@@scale XCharter-Bold-sup-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-Sup}{m}{sl}{ + <-> \XCharter@@scale XCharter-Slanted-sup-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-Sup}{bold}{n}{ - <-> alias * XCharter-Sup/b/n +\DeclareFontShape{T2ASRB}{XCharter-Sup}{regular}{sl}{ + <-> alias * XCharter-Sup/m/sl }{} -\DeclareFontShape{T2ASRB}{XCharter-Sup}{b}{sl}{ - <-> \XCharter@@scale XCharter-BoldSlanted-sup-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-Sup}{m}{n}{ + <-> \XCharter@@scale XCharter-Roman-sup-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-Sup}{bold}{sl}{ - <-> alias * XCharter-Sup/b/sl +\DeclareFontShape{T2ASRB}{XCharter-Sup}{regular}{n}{ + <-> alias * XCharter-Sup/m/n }{} -% ---- m = regular ---- +% ---- b = bold ---- -\DeclareFontShape{T2ASRB}{XCharter-Sup}{m}{sl}{ - <-> \XCharter@@scale XCharter-Slanted-sup-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-Sup}{b}{it}{ + <-> \XCharter@@scale XCharter-BoldItalic-sup-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-Sup}{regular}{sl}{ - <-> alias * XCharter-Sup/m/sl +\DeclareFontShape{T2ASRB}{XCharter-Sup}{bold}{it}{ + <-> alias * XCharter-Sup/b/it }{} -\DeclareFontShape{T2ASRB}{XCharter-Sup}{m}{it}{ - <-> \XCharter@@scale XCharter-Italic-sup-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-Sup}{b}{n}{ + <-> \XCharter@@scale XCharter-Bold-sup-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-Sup}{regular}{it}{ - <-> alias * XCharter-Sup/m/it +\DeclareFontShape{T2ASRB}{XCharter-Sup}{bold}{n}{ + <-> alias * XCharter-Sup/b/n }{} -\DeclareFontShape{T2ASRB}{XCharter-Sup}{m}{n}{ - <-> \XCharter@@scale XCharter-Roman-sup-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-Sup}{b}{sl}{ + <-> \XCharter@@scale XCharter-BoldSlanted-sup-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-Sup}{regular}{n}{ - <-> alias * XCharter-Sup/m/n +\DeclareFontShape{T2ASRB}{XCharter-Sup}{bold}{sl}{ + <-> alias * XCharter-Sup/b/sl }{} diff --git a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TLF.fd index 34552458e60..40ecde620ce 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TLF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2022/02/23 +%% Generated by autoinst on 2023/02/09 %% \ProvidesFile{T2ASRBXCharter-TLF.fd} - [2022/02/23 (autoinst) Font definitions for T2ASRB/XCharter-TLF.] + [2023/02/09 (autoinst) Font definitions for T2ASRB/XCharter-TLF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -22,20 +22,12 @@ % ---- b = bold ---- -\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{sc}{ - <-> \XCharter@@scale XCharter-Bold-tlf-sc-t2asrb -}{} - -\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{sc}{ - <-> alias * XCharter-TLF/b/sc -}{} - -\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{scsl}{ - <-> \XCharter@@scale XCharter-BoldSlanted-tlf-sc-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{scit}{ + <-> \XCharter@@scale XCharter-BoldItalic-tlf-sc-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{scsl}{ - <-> alias * XCharter-TLF/b/scsl +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{scit}{ + <-> alias * XCharter-TLF/b/scit }{} \DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{sl}{ @@ -54,12 +46,12 @@ <-> alias * XCharter-TLF/b/n }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{scit}{ - <-> \XCharter@@scale XCharter-BoldItalic-tlf-sc-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{scsl}{ + <-> \XCharter@@scale XCharter-BoldSlanted-tlf-sc-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{scit}{ - <-> alias * XCharter-TLF/b/scit +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{scsl}{ + <-> alias * XCharter-TLF/b/scsl }{} \DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{it}{ @@ -70,23 +62,23 @@ <-> alias * XCharter-TLF/b/it }{} - -% ---- m = regular ---- - -\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{it}{ - <-> \XCharter@@scale XCharter-Italic-tlf-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{sc}{ + <-> \XCharter@@scale XCharter-Bold-tlf-sc-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{it}{ - <-> alias * XCharter-TLF/m/it +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{sc}{ + <-> alias * XCharter-TLF/b/sc }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{scit}{ - <-> \XCharter@@scale XCharter-Italic-tlf-sc-t2asrb + +% ---- m = regular ---- + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{sl}{ + <-> \XCharter@@scale XCharter-Slanted-tlf-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{scit}{ - <-> alias * XCharter-TLF/m/scit +\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{sl}{ + <-> alias * XCharter-TLF/m/sl }{} \DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{n}{ @@ -97,20 +89,20 @@ <-> alias * XCharter-TLF/m/n }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{sl}{ - <-> \XCharter@@scale XCharter-Slanted-tlf-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{scit}{ + <-> \XCharter@@scale XCharter-Italic-tlf-sc-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{sl}{ - <-> alias * XCharter-TLF/m/sl +\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{scit}{ + <-> alias * XCharter-TLF/m/scit }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{scsl}{ - <-> \XCharter@@scale XCharter-Slanted-tlf-sc-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{it}{ + <-> \XCharter@@scale XCharter-Italic-tlf-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{scsl}{ - <-> alias * XCharter-TLF/m/scsl +\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{it}{ + <-> alias * XCharter-TLF/m/it }{} \DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{sc}{ @@ -121,6 +113,14 @@ <-> alias * XCharter-TLF/m/sc }{} +\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{scsl}{ + <-> \XCharter@@scale XCharter-Slanted-tlf-sc-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{scsl}{ + <-> alias * XCharter-TLF/m/scsl +}{} + % ---- Extra 'ssub' rules to map 'bx' to 'b' ---- @@ -128,18 +128,10 @@ <-> ssub * XCharter-TLF/b/sc }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{sl}{ - <-> ssub * XCharter-TLF/b/sl -}{} - \DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{it}{ <-> ssub * XCharter-TLF/b/it }{} -\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{scit}{ - <-> ssub * XCharter-TLF/b/scit -}{} - \DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{scsl}{ <-> ssub * XCharter-TLF/b/scsl }{} @@ -148,4 +140,12 @@ <-> ssub * XCharter-TLF/b/n }{} +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{sl}{ + <-> ssub * XCharter-TLF/b/sl +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{scit}{ + <-> ssub * XCharter-TLF/b/scit +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TOsF.fd b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TOsF.fd index 10ec418218c..4a3b75705c4 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TOsF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2022/02/23 +%% Generated by autoinst on 2023/02/09 %% \ProvidesFile{T2ASRBXCharter-TOsF.fd} - [2022/02/23 (autoinst) Font definitions for T2ASRB/XCharter-TOsF.] + [2023/02/09 (autoinst) Font definitions for T2ASRB/XCharter-TOsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -22,20 +22,12 @@ % ---- m = regular ---- -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{sc}{ - <-> \XCharter@@scale XCharter-Roman-tosf-sc-t2asrb -}{} - -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{sc}{ - <-> alias * XCharter-TOsF/m/sc -}{} - -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{scsl}{ - <-> \XCharter@@scale XCharter-Slanted-tosf-sc-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{scit}{ + <-> \XCharter@@scale XCharter-Italic-tosf-sc-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{scsl}{ - <-> alias * XCharter-TOsF/m/scsl +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{scit}{ + <-> alias * XCharter-TOsF/m/scit }{} \DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{sl}{ @@ -54,12 +46,12 @@ <-> alias * XCharter-TOsF/m/n }{} -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{scit}{ - <-> \XCharter@@scale XCharter-Italic-tosf-sc-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{scsl}{ + <-> \XCharter@@scale XCharter-Slanted-tosf-sc-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{scit}{ - <-> alias * XCharter-TOsF/m/scit +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{scsl}{ + <-> alias * XCharter-TOsF/m/scsl }{} \DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{it}{ @@ -70,15 +62,23 @@ <-> alias * XCharter-TOsF/m/it }{} +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{sc}{ + <-> \XCharter@@scale XCharter-Roman-tosf-sc-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{sc}{ + <-> alias * XCharter-TOsF/m/sc +}{} + % ---- b = bold ---- -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{scsl}{ - <-> \XCharter@@scale XCharter-BoldSlanted-tosf-sc-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{it}{ + <-> \XCharter@@scale XCharter-BoldItalic-tosf-t2asrb }{} -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{scsl}{ - <-> alias * XCharter-TOsF/b/scsl +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{it}{ + <-> alias * XCharter-TOsF/b/it }{} \DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{sc}{ @@ -89,6 +89,22 @@ <-> alias * XCharter-TOsF/b/sc }{} +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{scsl}{ + <-> \XCharter@@scale XCharter-BoldSlanted-tosf-sc-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{scsl}{ + <-> alias * XCharter-TOsF/b/scsl +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{sl}{ + <-> \XCharter@@scale XCharter-BoldSlanted-tosf-t2asrb +}{} + +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{sl}{ + <-> alias * XCharter-TOsF/b/sl +}{} + \DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{n}{ <-> \XCharter@@scale XCharter-Bold-tosf-t2asrb }{} @@ -105,24 +121,20 @@ <-> alias * XCharter-TOsF/b/scit }{} -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{it}{ - <-> \XCharter@@scale XCharter-BoldItalic-tosf-t2asrb -}{} -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{it}{ - <-> alias * XCharter-TOsF/b/it -}{} +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{sl}{ - <-> \XCharter@@scale XCharter-BoldSlanted-tosf-t2asrb +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{scit}{ + <-> ssub * XCharter-TOsF/b/scit }{} -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{sl}{ - <-> alias * XCharter-TOsF/b/sl +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{n}{ + <-> ssub * XCharter-TOsF/b/n }{} - -% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- +\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{sl}{ + <-> ssub * XCharter-TOsF/b/sl +}{} \DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{scsl}{ <-> ssub * XCharter-TOsF/b/scsl @@ -132,20 +144,8 @@ <-> ssub * XCharter-TOsF/b/sc }{} -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{n}{ - <-> ssub * XCharter-TOsF/b/n -}{} - \DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{it}{ <-> ssub * XCharter-TOsF/b/it }{} -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{scit}{ - <-> ssub * XCharter-TOsF/b/scit -}{} - -\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{sl}{ - <-> ssub * XCharter-TOsF/b/sl -}{} - \endinput diff --git a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-LF.fd b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-LF.fd index 732ae7564f9..4357520d756 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-LF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2022/02/23 +%% Generated by autoinst on 2023/02/09 %% \ProvidesFile{T2AXCharter-LF.fd} - [2022/02/23 (autoinst) Font definitions for T2A/XCharter-LF.] + [2023/02/09 (autoinst) Font definitions for T2A/XCharter-LF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,116 +20,120 @@ \DeclareFontFamily{T2A}{XCharter-LF}{} -% ---- m = regular ---- +% ---- b = bold ---- -\DeclareFontShape{T2A}{XCharter-LF}{m}{it}{ - <-> \XCharter@@scale XCharter-Italic-lf-t2a +\DeclareFontShape{T2A}{XCharter-LF}{b}{n}{ + <-> \XCharter@@scale XCharter-Bold-lf-t2a }{} -\DeclareFontShape{T2A}{XCharter-LF}{regular}{it}{ - <-> alias * XCharter-LF/m/it +\DeclareFontShape{T2A}{XCharter-LF}{bold}{n}{ + <-> alias * XCharter-LF/b/n }{} -\DeclareFontShape{T2A}{XCharter-LF}{m}{sl}{ - <-> \XCharter@@scale XCharter-Slanted-lf-t2a +\DeclareFontShape{T2A}{XCharter-LF}{b}{sl}{ + <-> \XCharter@@scale XCharter-BoldSlanted-lf-t2a }{} -\DeclareFontShape{T2A}{XCharter-LF}{regular}{sl}{ - <-> alias * XCharter-LF/m/sl +\DeclareFontShape{T2A}{XCharter-LF}{bold}{sl}{ + <-> alias * XCharter-LF/b/sl }{} -\DeclareFontShape{T2A}{XCharter-LF}{m}{n}{ - <-> \XCharter@@scale XCharter-Roman-lf-t2a +\DeclareFontShape{T2A}{XCharter-LF}{b}{sc}{ + <-> \XCharter@@scale XCharter-Bold-lf-sc-t2a }{} -\DeclareFontShape{T2A}{XCharter-LF}{regular}{n}{ - <-> alias * XCharter-LF/m/n +\DeclareFontShape{T2A}{XCharter-LF}{bold}{sc}{ + <-> alias * XCharter-LF/b/sc }{} -\DeclareFontShape{T2A}{XCharter-LF}{m}{scit}{ - <-> \XCharter@@scale XCharter-Italic-lf-sc-t2a +\DeclareFontShape{T2A}{XCharter-LF}{b}{scit}{ + <-> \XCharter@@scale XCharter-BoldItalic-lf-sc-t2a }{} -\DeclareFontShape{T2A}{XCharter-LF}{regular}{scit}{ - <-> alias * XCharter-LF/m/scit +\DeclareFontShape{T2A}{XCharter-LF}{bold}{scit}{ + <-> alias * XCharter-LF/b/scit }{} -\DeclareFontShape{T2A}{XCharter-LF}{m}{sc}{ - <-> \XCharter@@scale XCharter-Roman-lf-sc-t2a +\DeclareFontShape{T2A}{XCharter-LF}{b}{scsl}{ + <-> \XCharter@@scale XCharter-BoldSlanted-lf-sc-t2a }{} -\DeclareFontShape{T2A}{XCharter-LF}{regular}{sc}{ - <-> alias * XCharter-LF/m/sc +\DeclareFontShape{T2A}{XCharter-LF}{bold}{scsl}{ + <-> alias * XCharter-LF/b/scsl }{} -\DeclareFontShape{T2A}{XCharter-LF}{m}{scsl}{ - <-> \XCharter@@scale XCharter-Slanted-lf-sc-t2a +\DeclareFontShape{T2A}{XCharter-LF}{b}{it}{ + <-> \XCharter@@scale XCharter-BoldItalic-lf-t2a }{} -\DeclareFontShape{T2A}{XCharter-LF}{regular}{scsl}{ - <-> alias * XCharter-LF/m/scsl +\DeclareFontShape{T2A}{XCharter-LF}{bold}{it}{ + <-> alias * XCharter-LF/b/it }{} -% ---- b = bold ---- +% ---- m = regular ---- -\DeclareFontShape{T2A}{XCharter-LF}{b}{scit}{ - <-> \XCharter@@scale XCharter-BoldItalic-lf-sc-t2a +\DeclareFontShape{T2A}{XCharter-LF}{m}{sc}{ + <-> \XCharter@@scale XCharter-Roman-lf-sc-t2a }{} -\DeclareFontShape{T2A}{XCharter-LF}{bold}{scit}{ - <-> alias * XCharter-LF/b/scit +\DeclareFontShape{T2A}{XCharter-LF}{regular}{sc}{ + <-> alias * XCharter-LF/m/sc }{} -\DeclareFontShape{T2A}{XCharter-LF}{b}{sl}{ - <-> \XCharter@@scale XCharter-BoldSlanted-lf-t2a +\DeclareFontShape{T2A}{XCharter-LF}{m}{scit}{ + <-> \XCharter@@scale XCharter-Italic-lf-sc-t2a }{} -\DeclareFontShape{T2A}{XCharter-LF}{bold}{sl}{ - <-> alias * XCharter-LF/b/sl +\DeclareFontShape{T2A}{XCharter-LF}{regular}{scit}{ + <-> alias * XCharter-LF/m/scit }{} -\DeclareFontShape{T2A}{XCharter-LF}{b}{n}{ - <-> \XCharter@@scale XCharter-Bold-lf-t2a +\DeclareFontShape{T2A}{XCharter-LF}{m}{scsl}{ + <-> \XCharter@@scale XCharter-Slanted-lf-sc-t2a }{} -\DeclareFontShape{T2A}{XCharter-LF}{bold}{n}{ - <-> alias * XCharter-LF/b/n +\DeclareFontShape{T2A}{XCharter-LF}{regular}{scsl}{ + <-> alias * XCharter-LF/m/scsl }{} -\DeclareFontShape{T2A}{XCharter-LF}{b}{it}{ - <-> \XCharter@@scale XCharter-BoldItalic-lf-t2a +\DeclareFontShape{T2A}{XCharter-LF}{m}{it}{ + <-> \XCharter@@scale XCharter-Italic-lf-t2a }{} -\DeclareFontShape{T2A}{XCharter-LF}{bold}{it}{ - <-> alias * XCharter-LF/b/it +\DeclareFontShape{T2A}{XCharter-LF}{regular}{it}{ + <-> alias * XCharter-LF/m/it }{} -\DeclareFontShape{T2A}{XCharter-LF}{b}{scsl}{ - <-> \XCharter@@scale XCharter-BoldSlanted-lf-sc-t2a +\DeclareFontShape{T2A}{XCharter-LF}{m}{n}{ + <-> \XCharter@@scale XCharter-Roman-lf-t2a }{} -\DeclareFontShape{T2A}{XCharter-LF}{bold}{scsl}{ - <-> alias * XCharter-LF/b/scsl +\DeclareFontShape{T2A}{XCharter-LF}{regular}{n}{ + <-> alias * XCharter-LF/m/n }{} -\DeclareFontShape{T2A}{XCharter-LF}{b}{sc}{ - <-> \XCharter@@scale XCharter-Bold-lf-sc-t2a +\DeclareFontShape{T2A}{XCharter-LF}{m}{sl}{ + <-> \XCharter@@scale XCharter-Slanted-lf-t2a }{} -\DeclareFontShape{T2A}{XCharter-LF}{bold}{sc}{ - <-> alias * XCharter-LF/b/sc +\DeclareFontShape{T2A}{XCharter-LF}{regular}{sl}{ + <-> alias * XCharter-LF/m/sl }{} % ---- Extra 'ssub' rules to map 'bx' to 'b' ---- +\DeclareFontShape{T2A}{XCharter-LF}{bx}{it}{ + <-> ssub * XCharter-LF/b/it +}{} + \DeclareFontShape{T2A}{XCharter-LF}{bx}{scsl}{ <-> ssub * XCharter-LF/b/scsl }{} -\DeclareFontShape{T2A}{XCharter-LF}{bx}{sc}{ - <-> ssub * XCharter-LF/b/sc +\DeclareFontShape{T2A}{XCharter-LF}{bx}{sl}{ + <-> ssub * XCharter-LF/b/sl }{} \DeclareFontShape{T2A}{XCharter-LF}{bx}{n}{ @@ -140,12 +144,8 @@ <-> ssub * XCharter-LF/b/scit }{} -\DeclareFontShape{T2A}{XCharter-LF}{bx}{sl}{ - <-> ssub * XCharter-LF/b/sl -}{} - -\DeclareFontShape{T2A}{XCharter-LF}{bx}{it}{ - <-> ssub * XCharter-LF/b/it +\DeclareFontShape{T2A}{XCharter-LF}{bx}{sc}{ + <-> ssub * XCharter-LF/b/sc }{} \endinput diff --git a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-OsF.fd b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-OsF.fd index cc15e2a1c6d..aa70aa39bfa 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-OsF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2022/02/23 +%% Generated by autoinst on 2023/02/09 %% \ProvidesFile{T2AXCharter-OsF.fd} - [2022/02/23 (autoinst) Font definitions for T2A/XCharter-OsF.] + [2023/02/09 (autoinst) Font definitions for T2A/XCharter-OsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -22,20 +22,20 @@ % ---- m = regular ---- -\DeclareFontShape{T2A}{XCharter-OsF}{m}{sl}{ - <-> \XCharter@@scale XCharter-Slanted-osf-t2a +\DeclareFontShape{T2A}{XCharter-OsF}{m}{scsl}{ + <-> \XCharter@@scale XCharter-Slanted-osf-sc-t2a }{} -\DeclareFontShape{T2A}{XCharter-OsF}{regular}{sl}{ - <-> alias * XCharter-OsF/m/sl +\DeclareFontShape{T2A}{XCharter-OsF}{regular}{scsl}{ + <-> alias * XCharter-OsF/m/scsl }{} -\DeclareFontShape{T2A}{XCharter-OsF}{m}{n}{ - <-> \XCharter@@scale XCharter-Roman-osf-t2a +\DeclareFontShape{T2A}{XCharter-OsF}{m}{it}{ + <-> \XCharter@@scale XCharter-Italic-osf-t2a }{} -\DeclareFontShape{T2A}{XCharter-OsF}{regular}{n}{ - <-> alias * XCharter-OsF/m/n +\DeclareFontShape{T2A}{XCharter-OsF}{regular}{it}{ + <-> alias * XCharter-OsF/m/it }{} \DeclareFontShape{T2A}{XCharter-OsF}{m}{scit}{ @@ -46,47 +46,47 @@ <-> alias * XCharter-OsF/m/scit }{} -\DeclareFontShape{T2A}{XCharter-OsF}{m}{it}{ - <-> \XCharter@@scale XCharter-Italic-osf-t2a +\DeclareFontShape{T2A}{XCharter-OsF}{m}{sc}{ + <-> \XCharter@@scale XCharter-Roman-osf-sc-t2a }{} -\DeclareFontShape{T2A}{XCharter-OsF}{regular}{it}{ - <-> alias * XCharter-OsF/m/it +\DeclareFontShape{T2A}{XCharter-OsF}{regular}{sc}{ + <-> alias * XCharter-OsF/m/sc }{} -\DeclareFontShape{T2A}{XCharter-OsF}{m}{scsl}{ - <-> \XCharter@@scale XCharter-Slanted-osf-sc-t2a +\DeclareFontShape{T2A}{XCharter-OsF}{m}{sl}{ + <-> \XCharter@@scale XCharter-Slanted-osf-t2a }{} -\DeclareFontShape{T2A}{XCharter-OsF}{regular}{scsl}{ - <-> alias * XCharter-OsF/m/scsl +\DeclareFontShape{T2A}{XCharter-OsF}{regular}{sl}{ + <-> alias * XCharter-OsF/m/sl }{} -\DeclareFontShape{T2A}{XCharter-OsF}{m}{sc}{ - <-> \XCharter@@scale XCharter-Roman-osf-sc-t2a +\DeclareFontShape{T2A}{XCharter-OsF}{m}{n}{ + <-> \XCharter@@scale XCharter-Roman-osf-t2a }{} -\DeclareFontShape{T2A}{XCharter-OsF}{regular}{sc}{ - <-> alias * XCharter-OsF/m/sc +\DeclareFontShape{T2A}{XCharter-OsF}{regular}{n}{ + <-> alias * XCharter-OsF/m/n }{} % ---- b = bold ---- -\DeclareFontShape{T2A}{XCharter-OsF}{b}{sc}{ - <-> \XCharter@@scale XCharter-Bold-osf-sc-t2a +\DeclareFontShape{T2A}{XCharter-OsF}{b}{scit}{ + <-> \XCharter@@scale XCharter-BoldItalic-osf-sc-t2a }{} -\DeclareFontShape{T2A}{XCharter-OsF}{bold}{sc}{ - <-> alias * XCharter-OsF/b/sc +\DeclareFontShape{T2A}{XCharter-OsF}{bold}{scit}{ + <-> alias * XCharter-OsF/b/scit }{} -\DeclareFontShape{T2A}{XCharter-OsF}{b}{scsl}{ - <-> \XCharter@@scale XCharter-BoldSlanted-osf-sc-t2a +\DeclareFontShape{T2A}{XCharter-OsF}{b}{sc}{ + <-> \XCharter@@scale XCharter-Bold-osf-sc-t2a }{} -\DeclareFontShape{T2A}{XCharter-OsF}{bold}{scsl}{ - <-> alias * XCharter-OsF/b/scsl +\DeclareFontShape{T2A}{XCharter-OsF}{bold}{sc}{ + <-> alias * XCharter-OsF/b/sc }{} \DeclareFontShape{T2A}{XCharter-OsF}{b}{it}{ @@ -97,6 +97,14 @@ <-> alias * XCharter-OsF/b/it }{} +\DeclareFontShape{T2A}{XCharter-OsF}{b}{scsl}{ + <-> \XCharter@@scale XCharter-BoldSlanted-osf-sc-t2a +}{} + +\DeclareFontShape{T2A}{XCharter-OsF}{bold}{scsl}{ + <-> alias * XCharter-OsF/b/scsl +}{} + \DeclareFontShape{T2A}{XCharter-OsF}{b}{sl}{ <-> \XCharter@@scale XCharter-BoldSlanted-osf-t2a }{} @@ -113,39 +121,31 @@ <-> alias * XCharter-OsF/b/n }{} -\DeclareFontShape{T2A}{XCharter-OsF}{b}{scit}{ - <-> \XCharter@@scale XCharter-BoldItalic-osf-sc-t2a -}{} - -\DeclareFontShape{T2A}{XCharter-OsF}{bold}{scit}{ - <-> alias * XCharter-OsF/b/scit -}{} - % ---- Extra 'ssub' rules to map 'bx' to 'b' ---- -\DeclareFontShape{T2A}{XCharter-OsF}{bx}{scit}{ - <-> ssub * XCharter-OsF/b/scit +\DeclareFontShape{T2A}{XCharter-OsF}{bx}{n}{ + <-> ssub * XCharter-OsF/b/n +}{} + +\DeclareFontShape{T2A}{XCharter-OsF}{bx}{it}{ + <-> ssub * XCharter-OsF/b/it }{} \DeclareFontShape{T2A}{XCharter-OsF}{bx}{sl}{ <-> ssub * XCharter-OsF/b/sl }{} -\DeclareFontShape{T2A}{XCharter-OsF}{bx}{it}{ - <-> ssub * XCharter-OsF/b/it +\DeclareFontShape{T2A}{XCharter-OsF}{bx}{scsl}{ + <-> ssub * XCharter-OsF/b/scsl }{} \DeclareFontShape{T2A}{XCharter-OsF}{bx}{sc}{ <-> ssub * XCharter-OsF/b/sc }{} -\DeclareFontShape{T2A}{XCharter-OsF}{bx}{n}{ - <-> ssub * XCharter-OsF/b/n -}{} - -\DeclareFontShape{T2A}{XCharter-OsF}{bx}{scsl}{ - <-> ssub * XCharter-OsF/b/scsl +\DeclareFontShape{T2A}{XCharter-OsF}{bx}{scit}{ + <-> ssub * XCharter-OsF/b/scit }{} \endinput diff --git a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-Sup.fd b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-Sup.fd index 6e915c2bc11..f5fbde59c1f 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-Sup.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-Sup.fd @@ -4,11 +4,12 @@ [2017/06/25 (autoinst) Font definitions for T2A/XCharter-Sup.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi + \def\XCharter@@srb{} \def\XCharter@@@srb{\if@XCh@srb srb\fi} \expandafter\ifx\csname @XCh@srbtrue\endcsname\relax diff --git a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TLF.fd index ae188ee5a7e..7593458f518 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TLF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TLF.fd @@ -4,11 +4,12 @@ [2017/06/25 (autoinst) Font definitions for T2A/XCharter-TLF.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi + \def\XCharter@@srb{} \def\XCharter@@@srb{\if@XCh@srb srb\fi} \expandafter\ifx\csname @XCh@srbtrue\endcsname\relax diff --git a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TOsF.fd b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TOsF.fd index ec642528be0..f18441b7648 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TOsF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TOsF.fd @@ -4,9 +4,16 @@ [2017/06/25 (autoinst) Font definitions for T2A/XCharter-TOsF.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% +\fi + + +\expandafter\ifx\csname XCharter@altone\endcsname\relax + \global\let\XCharter@@altone\@empty +\else + \xdef\XCharter@@altone{\XCharter@altone}% \fi \def\XCharter@@srb{} @@ -16,11 +23,6 @@ \let\XCharter@@srb\XCharter@@@srb \fi -\expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty -\else - \edef\XCharter@@altone{\XCharter@altone}% -\fi \DeclareFontFamily{T2A}{XCharter-TOsF}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-LF.fd b/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-LF.fd index f1503f39b81..71ec928680d 100644 --- a/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-LF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-LF.fd @@ -3,15 +3,16 @@ [2020/05/25 (msharpe) Font definitions for TS1/XCharter-LF.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi + \expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty + \global\let\XCharter@@altone\@empty \else - \edef\XCharter@@altone{\XCharter@altone}% + \xdef\XCharter@@altone{\XCharter@altone}% \fi \DeclareFontFamily{TS1}{XCharter-LF}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-OsF.fd b/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-OsF.fd index 9cb69cdf934..cb139d4960d 100644 --- a/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-OsF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-OsF.fd @@ -3,15 +3,16 @@ [2020/05/25 (msharpe) Font definitions for TS1/XCharter-OsF.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi + \expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty + \global\let\XCharter@@altone\@empty \else - \edef\XCharter@@altone{\XCharter@altone}% + \xdef\XCharter@@altone{\XCharter@altone}% \fi \DeclareFontFamily{TS1}{XCharter-OsF}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TLF.fd index 7a4a026191b..314dab6490a 100644 --- a/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TLF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TLF.fd @@ -3,15 +3,16 @@ [2020/05/25 (msharpe) Font definitions for TS1/XCharter-TLF.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi + \expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty + \global\let\XCharter@@altone\@empty \else - \edef\XCharter@@altone{\XCharter@altone}% + \xdef\XCharter@@altone{\XCharter@altone}% \fi \DeclareFontFamily{TS1}{XCharter-TLF}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TOsF.fd b/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TOsF.fd index fd6693037d6..bcea88a7243 100644 --- a/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TOsF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TOsF.fd @@ -3,15 +3,16 @@ [2020/05/25 (msharpe) Font definitions for TS1/XCharter-TOsF.] \expandafter\ifx\csname XCharter@scale\endcsname\relax - \let\XCharter@@scale\@empty + \global\let\XCharter@@scale\@empty \else - \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% + \xdef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi + \expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty + \global\let\XCharter@@altone\@empty \else - \edef\XCharter@@altone{\XCharter@altone}% + \xdef\XCharter@@altone{\XCharter@altone}% \fi \DeclareFontFamily{TS1}{XCharter-TOsF}{} diff --git a/Master/texmf-dist/tex/latex/xcharter/XCharter.sty b/Master/texmf-dist/tex/latex/xcharter/XCharter.sty index b2a21b4fe6a..799181391c7 100644 --- a/Master/texmf-dist/tex/latex/xcharter/XCharter.sty +++ b/Master/texmf-dist/tex/latex/xcharter/XCharter.sty @@ -1,10 +1,18 @@ %% XCharter is an extension of the Bitstream Charter fonts, adding osf, -% small caps and superior figures. Generated 2022/02/20 by Michael Sharpe. +% small caps and superior and inferior letters figures. +% Modified 2023/07/21 by Michael Sharpe. %% +% The type1 fonts contain two distinct glyph possibilities for oldstyle +% one. The default is like a shortened 1 (the corresponding tfm files +% have names beginning with "XCharter1-") and the alternate form is like +% a shortened I. The tfm files for the latter begin with "XCharter-". +% Option osf sets figure style to oldstyle with one like short 1. +% Option osfI sets figure style to oldstyle with one like short I. + \NeedsTeXFormat{LaTeX2e} -\def\fileversion{1.24} -\def\filedate{2022/04/16} +\def\fileversion{1.25} +\def\filedate{2023/07/21} \ProvidesPackage{XCharter}[\filedate\space v\fileversion] @@ -28,6 +36,18 @@ \RequirePackage{textcomp} \DeclareEncodingSubset{TS1}{XCharter-*}{0} \fi +\iftutex % may not read latex.ltx +\@ifundefined{textsuperscript}{% +\DeclareRobustCommand*\textsuperscript[1]{% + \@textsuperscript{\selectfont#1}}}{} +\def\@textsuperscript#1{% + {\m@th\ensuremath{^{\mbox{\fontsize\sf@size\sf@size#1}}}}} +\@ifundefined{textsubscript}{%\DeclareRobustCommand*\textsubscript[1]{% + \@textsubscript{\selectfont#1}}% +\def\@textsubscript#1{% + {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\sf@size#1}}}}}{} +\fi + %\newif\ifxch@nofontspec \newif\ifxch@otfmath % newtx check @@ -183,8 +203,8 @@ \DeclareOptionX{aftsolidus}{\gdef\XCharter@aftsolidus{#1}} \DeclareOptionX*{\ifxch@otfmath\PassOptionsToPackage{\CurrentOption}{xcharter-otf}\fi} \ExecuteOptionsX{lining,tabular} -\ProcessOptionsX\relax - +\ProcessOptionsX\relax + %+++++++++++++++++Option consequences++++++++++++++++++++++++ % Check for conflict between nofontspec and others @@ -215,11 +235,12 @@ \fi \def\xch@base{XCharter} \newcommand{\textfrac}[3][]{{% - \mbox{% + \mbox{% \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1] {\textlf{#1}\kern.03em}{}% \textsu{#2\char"2044}% numerator -\textde{\kern-.159em{\addfontfeature{RawFeature=+ss02}\char"2044}#3}% denominator + \textde{%\kern-.159em +{\addfontfeature{RawFeature=+ss02}\char"2044}#3}% denominator }}} \def\xch@dflt{} %\xch@cnt will be 0..7 @@ -246,7 +267,7 @@ \def\sufigures{\@nomath\sufigures \fontfigurestyle{superior}\selectfont} \DeclareTextFontCommand{\textsu}{\sufigures} - \let\textsuperior\textsu + \let\textsup\textsu \fa@naming@exception{figures}{{inferior}{proportional}}{Inf} \fa@naming@exception{figures}{{inferior}{tabular}}{Inf} @@ -502,8 +523,12 @@ } \DeclareRobustCommand{\oldstylenums}{% \not@math@alphabet\oldstylenums\relax - \addfontfeatures{Numbers=OldStyle}% + \addfontfeatures{Numbers=OldStyle, CharacterVariant={1:0}}% } + \DeclareRobustCommand{\oldstyleInums}{% + \not@math@alphabet\oldstyleInums\relax + \addfontfeatures{Numbers=OldStyle, RawFeature=-cv01}% + } \DeclareRobustCommand{\liningnums}{% \not@math@alphabet\liningnums\relax \addfontfeatures{Numbers=Lining}% @@ -702,7 +727,7 @@ %\renewcommand*{\familydefault}{\rmdefault} \let\textthit\textth } -\fi +\fi % type1 %both \let\nustyle\nufigures @@ -710,11 +735,13 @@ \ifxch@notextnu\else\let\textnu=\textnumerator\fi \let\destyle\defigures \DeclareTextFontCommand{\textsu}{\sufigures} -\let\textsuperior\textsu +\let\sustyle\sufigures +\let\textsup\textsu \DeclareTextFontCommand{\textde}{\defigures} \let\textdenominator\textde \DeclareTextFontCommand{\textinf}{\infigures} \let\textinferior\textinf +\let\textsub\textinf \DeclareTextFontCommand{\textosf}{\osfstyle} \DeclareTextFontCommand{\texttosf}{\tosfstyle} \DeclareTextFontCommand{\texttlf}{\tlfstyle} @@ -746,5 +773,8 @@ {\thfamily #1}% } % - +%\expandafter\show\csname textsuperscript \endcsname +%\makeatletter +%\show\@textsuperscript +%\makeatother \endinput |