From d9235fca5b84633eeba24dab8a8b5418f343bea6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 28 Jun 2017 21:42:53 +0000 Subject: xcharter (28jun17) git-svn-id: svn://tug.org/texlive/trunk@44718 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/xcharter/LY1XCharter-Dnom.fd | 18 +++++-------- .../tex/latex/xcharter/LY1XCharter-Inf.fd | 19 +++++-------- .../tex/latex/xcharter/LY1XCharter-Numr.fd | 19 +++++-------- .../tex/latex/xcharter/LY1XCharter-Sup.fd | 19 +++++-------- .../tex/latex/xcharter/LY1XCharter-TLF.fd | 31 +++++++++------------- .../tex/latex/xcharter/OT1XCharter-Dnom.fd | 19 +++++-------- .../tex/latex/xcharter/OT1XCharter-Inf.fd | 19 +++++-------- .../tex/latex/xcharter/OT1XCharter-Numr.fd | 19 +++++-------- .../tex/latex/xcharter/OT1XCharter-Sup.fd | 19 +++++-------- .../tex/latex/xcharter/OT1XCharter-TLF.fd | 31 +++++++++------------- .../tex/latex/xcharter/T1XCharter-Dnom.fd | 19 +++++-------- .../tex/latex/xcharter/T1XCharter-Inf.fd | 19 +++++-------- .../tex/latex/xcharter/T1XCharter-Numr.fd | 19 +++++-------- .../tex/latex/xcharter/T1XCharter-Sup.fd | 19 +++++-------- .../tex/latex/xcharter/T1XCharter-TLF.fd | 31 +++++++++------------- .../tex/latex/xcharter/T2AXCharter-Sup.fd | 19 +++++-------- .../tex/latex/xcharter/T2AXCharter-TLF.fd | 31 +++++++++------------- .../tex/latex/xcharter/TS1XCharter-TLF.fd | 19 +++++-------- .../tex/latex/xcharter/TS1XCharter-TOsF.fd | 19 +++++-------- 19 files changed, 138 insertions(+), 270 deletions(-) (limited to 'Master/texmf-dist/tex/latex/xcharter') diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Dnom.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Dnom.fd index 6c9f4fbfa29..0c1f4a773ad 100644 --- a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Dnom.fd +++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Dnom.fd @@ -10,36 +10,30 @@ \fi -\expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty -\else - \edef\XCharter@@altone{\XCharter@altone}% -\fi - \DeclareFontFamily{LY1}{XCharter-Dnom}{} \DeclareFontShape{LY1}{XCharter-Dnom}{m}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-dnom-ly1 + <-> \XCharter@@scale XCharter-Slanted-dnom-ly1 }{} \DeclareFontShape{LY1}{XCharter-Dnom}{m}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-dnom-ly1 + <-> \XCharter@@scale XCharter-Roman-dnom-ly1 }{} \DeclareFontShape{LY1}{XCharter-Dnom}{m}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-dnom-ly1 + <-> \XCharter@@scale XCharter-Italic-dnom-ly1 }{} \DeclareFontShape{LY1}{XCharter-Dnom}{b}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-dnom-ly1 + <-> \XCharter@@scale XCharter-Bold-dnom-ly1 }{} \DeclareFontShape{LY1}{XCharter-Dnom}{b}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-dnom-ly1 + <-> \XCharter@@scale XCharter-BoldSlanted-dnom-ly1 }{} \DeclareFontShape{LY1}{XCharter-Dnom}{b}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-dnom-ly1 + <-> \XCharter@@scale XCharter-BoldItalic-dnom-ly1 }{} \DeclareFontShape{LY1}{XCharter-Dnom}{bx}{n}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Inf.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Inf.fd index 695de4abf75..dffadfaf630 100644 --- a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Inf.fd +++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Inf.fd @@ -9,37 +9,30 @@ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi - -\expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty -\else - \edef\XCharter@@altone{\XCharter@altone}% -\fi - \DeclareFontFamily{LY1}{XCharter-Inf}{} \DeclareFontShape{LY1}{XCharter-Inf}{b}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-inf-ly1 + <-> \XCharter@@scale XCharter-BoldItalic-inf-ly1 }{} \DeclareFontShape{LY1}{XCharter-Inf}{b}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-inf-ly1 + <-> \XCharter@@scale XCharter-Bold-inf-ly1 }{} \DeclareFontShape{LY1}{XCharter-Inf}{b}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-inf-ly1 + <-> \XCharter@@scale XCharter-BoldSlanted-inf-ly1 }{} \DeclareFontShape{LY1}{XCharter-Inf}{m}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-inf-ly1 + <-> \XCharter@@scale XCharter-Roman-inf-ly1 }{} \DeclareFontShape{LY1}{XCharter-Inf}{m}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-inf-ly1 + <-> \XCharter@@scale XCharter-Slanted-inf-ly1 }{} \DeclareFontShape{LY1}{XCharter-Inf}{m}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-inf-ly1 + <-> \XCharter@@scale XCharter-Italic-inf-ly1 }{} \DeclareFontShape{LY1}{XCharter-Inf}{bx}{it}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Numr.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Numr.fd index c2cecc7338f..32a546c0590 100644 --- a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Numr.fd +++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Numr.fd @@ -9,37 +9,30 @@ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi - -\expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty -\else - \edef\XCharter@@altone{\XCharter@altone}% -\fi - \DeclareFontFamily{LY1}{XCharter-Numr}{} \DeclareFontShape{LY1}{XCharter-Numr}{m}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-numr-ly1 + <-> \XCharter@@scale XCharter-Roman-numr-ly1 }{} \DeclareFontShape{LY1}{XCharter-Numr}{m}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-numr-ly1 + <-> \XCharter@@scale XCharter-Slanted-numr-ly1 }{} \DeclareFontShape{LY1}{XCharter-Numr}{m}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-numr-ly1 + <-> \XCharter@@scale XCharter-Italic-numr-ly1 }{} \DeclareFontShape{LY1}{XCharter-Numr}{b}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-numr-ly1 + <-> \XCharter@@scale XCharter-Bold-numr-ly1 }{} \DeclareFontShape{LY1}{XCharter-Numr}{b}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-numr-ly1 + <-> \XCharter@@scale XCharter-BoldSlanted-numr-ly1 }{} \DeclareFontShape{LY1}{XCharter-Numr}{b}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-numr-ly1 + <-> \XCharter@@scale XCharter-BoldItalic-numr-ly1 }{} \DeclareFontShape{LY1}{XCharter-Numr}{bx}{n}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Sup.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Sup.fd index 3aa0418247f..d1d89cb597e 100644 --- a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Sup.fd +++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-Sup.fd @@ -9,37 +9,30 @@ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi - -\expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty -\else - \edef\XCharter@@altone{\XCharter@altone}% -\fi - \DeclareFontFamily{LY1}{XCharter-Sup}{} \DeclareFontShape{LY1}{XCharter-Sup}{m}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-sup-ly1 + <-> \XCharter@@scale XCharter-Slanted-sup-ly1 }{} \DeclareFontShape{LY1}{XCharter-Sup}{m}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-sup-ly1 + <-> \XCharter@@scale XCharter-Roman-sup-ly1 }{} \DeclareFontShape{LY1}{XCharter-Sup}{m}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-sup-ly1 + <-> \XCharter@@scale XCharter-Italic-sup-ly1 }{} \DeclareFontShape{LY1}{XCharter-Sup}{b}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-sup-ly1 + <-> \XCharter@@scale XCharter-BoldItalic-sup-ly1 }{} \DeclareFontShape{LY1}{XCharter-Sup}{b}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-sup-ly1 + <-> \XCharter@@scale XCharter-Bold-sup-ly1 }{} \DeclareFontShape{LY1}{XCharter-Sup}{b}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-sup-ly1 + <-> \XCharter@@scale XCharter-BoldSlanted-sup-ly1 }{} \DeclareFontShape{LY1}{XCharter-Sup}{bx}{it}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TLF.fd index 5728c6266f3..6cf512287ef 100644 --- a/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TLF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/LY1XCharter-TLF.fd @@ -9,61 +9,54 @@ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi - -\expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty -\else - \edef\XCharter@@altone{\XCharter@altone}% -\fi - \DeclareFontFamily{LY1}{XCharter-TLF}{} \DeclareFontShape{LY1}{XCharter-TLF}{b}{sc}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tlf-sc-ly1 + <-> \XCharter@@scale XCharter-Bold-tlf-sc-ly1 }{} \DeclareFontShape{LY1}{XCharter-TLF}{b}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tlf-ly1 + <-> \XCharter@@scale XCharter-BoldItalic-tlf-ly1 }{} \DeclareFontShape{LY1}{XCharter-TLF}{b}{scit}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tlf-sc-ly1 + <-> \XCharter@@scale XCharter-BoldItalic-tlf-sc-ly1 }{} \DeclareFontShape{LY1}{XCharter-TLF}{b}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tlf-ly1 + <-> \XCharter@@scale XCharter-BoldSlanted-tlf-ly1 }{} \DeclareFontShape{LY1}{XCharter-TLF}{b}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tlf-ly1 + <-> \XCharter@@scale XCharter-Bold-tlf-ly1 }{} \DeclareFontShape{LY1}{XCharter-TLF}{b}{scsl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tlf-sc-ly1 + <-> \XCharter@@scale XCharter-BoldSlanted-tlf-sc-ly1 }{} \DeclareFontShape{LY1}{XCharter-TLF}{m}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tlf-ly1 + <-> \XCharter@@scale XCharter-Slanted-tlf-ly1 }{} \DeclareFontShape{LY1}{XCharter-TLF}{m}{scsl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tlf-sc-ly1 + <-> \XCharter@@scale XCharter-Slanted-tlf-sc-ly1 }{} \DeclareFontShape{LY1}{XCharter-TLF}{m}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tlf-ly1 + <-> \XCharter@@scale XCharter-Roman-tlf-ly1 }{} \DeclareFontShape{LY1}{XCharter-TLF}{m}{scit}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tlf-sc-ly1 + <-> \XCharter@@scale XCharter-Italic-tlf-sc-ly1 }{} \DeclareFontShape{LY1}{XCharter-TLF}{m}{sc}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tlf-sc-ly1 + <-> \XCharter@@scale XCharter-Roman-tlf-sc-ly1 }{} \DeclareFontShape{LY1}{XCharter-TLF}{m}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tlf-ly1 + <-> \XCharter@@scale XCharter-Italic-tlf-ly1 }{} \DeclareFontShape{LY1}{XCharter-TLF}{bx}{sc}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Dnom.fd b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Dnom.fd index e8ad316bb17..6953e107fee 100644 --- a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Dnom.fd +++ b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Dnom.fd @@ -9,37 +9,30 @@ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi - -\expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty -\else - \edef\XCharter@@altone{\XCharter@altone}% -\fi - \DeclareFontFamily{OT1}{XCharter-Dnom}{} \DeclareFontShape{OT1}{XCharter-Dnom}{b}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-dnom-ot1 + <-> \XCharter@@scale XCharter-BoldItalic-dnom-ot1 }{} \DeclareFontShape{OT1}{XCharter-Dnom}{b}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-dnom-ot1 + <-> \XCharter@@scale XCharter-BoldSlanted-dnom-ot1 }{} \DeclareFontShape{OT1}{XCharter-Dnom}{b}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-dnom-ot1 + <-> \XCharter@@scale XCharter-Bold-dnom-ot1 }{} \DeclareFontShape{OT1}{XCharter-Dnom}{m}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-dnom-ot1 + <-> \XCharter@@scale XCharter-Slanted-dnom-ot1 }{} \DeclareFontShape{OT1}{XCharter-Dnom}{m}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-dnom-ot1 + <-> \XCharter@@scale XCharter-Roman-dnom-ot1 }{} \DeclareFontShape{OT1}{XCharter-Dnom}{m}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-dnom-ot1 + <-> \XCharter@@scale XCharter-Italic-dnom-ot1 }{} \DeclareFontShape{OT1}{XCharter-Dnom}{bx}{it}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Inf.fd b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Inf.fd index 84e945259b2..ad44ba894e7 100644 --- a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Inf.fd +++ b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Inf.fd @@ -9,37 +9,30 @@ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi - -\expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty -\else - \edef\XCharter@@altone{\XCharter@altone}% -\fi - \DeclareFontFamily{OT1}{XCharter-Inf}{} \DeclareFontShape{OT1}{XCharter-Inf}{b}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-inf-ot1 + <-> \XCharter@@scale XCharter-BoldItalic-inf-ot1 }{} \DeclareFontShape{OT1}{XCharter-Inf}{b}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-inf-ot1 + <-> \XCharter@@scale XCharter-Bold-inf-ot1 }{} \DeclareFontShape{OT1}{XCharter-Inf}{b}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-inf-ot1 + <-> \XCharter@@scale XCharter-BoldSlanted-inf-ot1 }{} \DeclareFontShape{OT1}{XCharter-Inf}{m}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-inf-ot1 + <-> \XCharter@@scale XCharter-Roman-inf-ot1 }{} \DeclareFontShape{OT1}{XCharter-Inf}{m}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-inf-ot1 + <-> \XCharter@@scale XCharter-Slanted-inf-ot1 }{} \DeclareFontShape{OT1}{XCharter-Inf}{m}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-inf-ot1 + <-> \XCharter@@scale XCharter-Italic-inf-ot1 }{} \DeclareFontShape{OT1}{XCharter-Inf}{bx}{it}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Numr.fd b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Numr.fd index f9dbabfa371..c3cf438f13d 100644 --- a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Numr.fd +++ b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Numr.fd @@ -9,37 +9,30 @@ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi - -\expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty -\else - \edef\XCharter@@altone{\XCharter@altone}% -\fi - \DeclareFontFamily{OT1}{XCharter-Numr}{} \DeclareFontShape{OT1}{XCharter-Numr}{b}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-numr-ot1 + <-> \XCharter@@scale XCharter-BoldSlanted-numr-ot1 }{} \DeclareFontShape{OT1}{XCharter-Numr}{b}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-numr-ot1 + <-> \XCharter@@scale XCharter-Bold-numr-ot1 }{} \DeclareFontShape{OT1}{XCharter-Numr}{b}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-numr-ot1 + <-> \XCharter@@scale XCharter-BoldItalic-numr-ot1 }{} \DeclareFontShape{OT1}{XCharter-Numr}{m}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-numr-ot1 + <-> \XCharter@@scale XCharter-Italic-numr-ot1 }{} \DeclareFontShape{OT1}{XCharter-Numr}{m}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-numr-ot1 + <-> \XCharter@@scale XCharter-Roman-numr-ot1 }{} \DeclareFontShape{OT1}{XCharter-Numr}{m}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-numr-ot1 + <-> \XCharter@@scale XCharter-Slanted-numr-ot1 }{} \DeclareFontShape{OT1}{XCharter-Numr}{bx}{sl}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Sup.fd b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Sup.fd index e2b73e3ef8c..386f2120bad 100644 --- a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Sup.fd +++ b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-Sup.fd @@ -9,37 +9,30 @@ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi - -\expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty -\else - \edef\XCharter@@altone{\XCharter@altone}% -\fi - \DeclareFontFamily{OT1}{XCharter-Sup}{} \DeclareFontShape{OT1}{XCharter-Sup}{b}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-sup-ot1 + <-> \XCharter@@scale XCharter-BoldItalic-sup-ot1 }{} \DeclareFontShape{OT1}{XCharter-Sup}{b}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-sup-ot1 + <-> \XCharter@@scale XCharter-Bold-sup-ot1 }{} \DeclareFontShape{OT1}{XCharter-Sup}{b}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-sup-ot1 + <-> \XCharter@@scale XCharter-BoldSlanted-sup-ot1 }{} \DeclareFontShape{OT1}{XCharter-Sup}{m}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-sup-ot1 + <-> \XCharter@@scale XCharter-Italic-sup-ot1 }{} \DeclareFontShape{OT1}{XCharter-Sup}{m}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-sup-ot1 + <-> \XCharter@@scale XCharter-Slanted-sup-ot1 }{} \DeclareFontShape{OT1}{XCharter-Sup}{m}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-sup-ot1 + <-> \XCharter@@scale XCharter-Roman-sup-ot1 }{} \DeclareFontShape{OT1}{XCharter-Sup}{bx}{it}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TLF.fd index 567e953a608..534debf5de0 100644 --- a/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TLF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/OT1XCharter-TLF.fd @@ -9,61 +9,54 @@ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi - -\expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty -\else - \edef\XCharter@@altone{\XCharter@altone}% -\fi - \DeclareFontFamily{OT1}{XCharter-TLF}{} \DeclareFontShape{OT1}{XCharter-TLF}{b}{sc}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tlf-sc-ot1 + <-> \XCharter@@scale XCharter-Bold-tlf-sc-ot1 }{} \DeclareFontShape{OT1}{XCharter-TLF}{b}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tlf-ot1 + <-> \XCharter@@scale XCharter-BoldItalic-tlf-ot1 }{} \DeclareFontShape{OT1}{XCharter-TLF}{b}{scit}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tlf-sc-ot1 + <-> \XCharter@@scale XCharter-BoldItalic-tlf-sc-ot1 }{} \DeclareFontShape{OT1}{XCharter-TLF}{b}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tlf-ot1 + <-> \XCharter@@scale XCharter-BoldSlanted-tlf-ot1 }{} \DeclareFontShape{OT1}{XCharter-TLF}{b}{scsl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tlf-sc-ot1 + <-> \XCharter@@scale XCharter-BoldSlanted-tlf-sc-ot1 }{} \DeclareFontShape{OT1}{XCharter-TLF}{b}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tlf-ot1 + <-> \XCharter@@scale XCharter-Bold-tlf-ot1 }{} \DeclareFontShape{OT1}{XCharter-TLF}{m}{scsl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tlf-sc-ot1 + <-> \XCharter@@scale XCharter-Slanted-tlf-sc-ot1 }{} \DeclareFontShape{OT1}{XCharter-TLF}{m}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tlf-ot1 + <-> \XCharter@@scale XCharter-Roman-tlf-ot1 }{} \DeclareFontShape{OT1}{XCharter-TLF}{m}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tlf-ot1 + <-> \XCharter@@scale XCharter-Slanted-tlf-ot1 }{} \DeclareFontShape{OT1}{XCharter-TLF}{m}{scit}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tlf-sc-ot1 + <-> \XCharter@@scale XCharter-Italic-tlf-sc-ot1 }{} \DeclareFontShape{OT1}{XCharter-TLF}{m}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tlf-ot1 + <-> \XCharter@@scale XCharter-Italic-tlf-ot1 }{} \DeclareFontShape{OT1}{XCharter-TLF}{m}{sc}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tlf-sc-ot1 + <-> \XCharter@@scale XCharter-Roman-tlf-sc-ot1 }{} \DeclareFontShape{OT1}{XCharter-TLF}{bx}{sc}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Dnom.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Dnom.fd index cce63c88399..a5b8d86416e 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Dnom.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Dnom.fd @@ -9,37 +9,30 @@ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi - -\expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty -\else - \edef\XCharter@@altone{\XCharter@altone}% -\fi - \DeclareFontFamily{T1}{XCharter-Dnom}{} \DeclareFontShape{T1}{XCharter-Dnom}{b}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-dnom-t1 + <-> \XCharter@@scale XCharter-BoldSlanted-dnom-t1 }{} \DeclareFontShape{T1}{XCharter-Dnom}{b}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-dnom-t1 + <-> \XCharter@@scale XCharter-Bold-dnom-t1 }{} \DeclareFontShape{T1}{XCharter-Dnom}{b}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-dnom-t1 + <-> \XCharter@@scale XCharter-BoldItalic-dnom-t1 }{} \DeclareFontShape{T1}{XCharter-Dnom}{m}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-dnom-t1 + <-> \XCharter@@scale XCharter-Slanted-dnom-t1 }{} \DeclareFontShape{T1}{XCharter-Dnom}{m}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-dnom-t1 + <-> \XCharter@@scale XCharter-Roman-dnom-t1 }{} \DeclareFontShape{T1}{XCharter-Dnom}{m}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-dnom-t1 + <-> \XCharter@@scale XCharter-Italic-dnom-t1 }{} \DeclareFontShape{T1}{XCharter-Dnom}{bx}{sl}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Inf.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Inf.fd index 371423bf9d1..b600c79b0b2 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Inf.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Inf.fd @@ -9,37 +9,30 @@ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi - -\expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty -\else - \edef\XCharter@@altone{\XCharter@altone}% -\fi - \DeclareFontFamily{T1}{XCharter-Inf}{} \DeclareFontShape{T1}{XCharter-Inf}{b}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-inf-t1 + <-> \XCharter@@scale XCharter-Bold-inf-t1 }{} \DeclareFontShape{T1}{XCharter-Inf}{b}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-inf-t1 + <-> \XCharter@@scale XCharter-BoldSlanted-inf-t1 }{} \DeclareFontShape{T1}{XCharter-Inf}{b}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-inf-t1 + <-> \XCharter@@scale XCharter-BoldItalic-inf-t1 }{} \DeclareFontShape{T1}{XCharter-Inf}{m}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-inf-t1 + <-> \XCharter@@scale XCharter-Roman-inf-t1 }{} \DeclareFontShape{T1}{XCharter-Inf}{m}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-inf-t1 + <-> \XCharter@@scale XCharter-Slanted-inf-t1 }{} \DeclareFontShape{T1}{XCharter-Inf}{m}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-inf-t1 + <-> \XCharter@@scale XCharter-Italic-inf-t1 }{} \DeclareFontShape{T1}{XCharter-Inf}{bx}{n}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Numr.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Numr.fd index ed218e58ae1..302b55c19df 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Numr.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Numr.fd @@ -9,37 +9,30 @@ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi - -\expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty -\else - \edef\XCharter@@altone{\XCharter@altone}% -\fi - \DeclareFontFamily{T1}{XCharter-Numr}{} \DeclareFontShape{T1}{XCharter-Numr}{b}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-numr-t1 + <-> \XCharter@@scale XCharter-Bold-numr-t1 }{} \DeclareFontShape{T1}{XCharter-Numr}{b}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-numr-t1 + <-> \XCharter@@scale XCharter-BoldSlanted-numr-t1 }{} \DeclareFontShape{T1}{XCharter-Numr}{b}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-numr-t1 + <-> \XCharter@@scale XCharter-BoldItalic-numr-t1 }{} \DeclareFontShape{T1}{XCharter-Numr}{m}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-numr-t1 + <-> \XCharter@@scale XCharter-Italic-numr-t1 }{} \DeclareFontShape{T1}{XCharter-Numr}{m}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-numr-t1 + <-> \XCharter@@scale XCharter-Roman-numr-t1 }{} \DeclareFontShape{T1}{XCharter-Numr}{m}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-numr-t1 + <-> \XCharter@@scale XCharter-Slanted-numr-t1 }{} \DeclareFontShape{T1}{XCharter-Numr}{bx}{n}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Sup.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Sup.fd index 736a7519468..be496ee6b46 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Sup.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-Sup.fd @@ -9,37 +9,30 @@ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi - -\expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty -\else - \edef\XCharter@@altone{\XCharter@altone}% -\fi - \DeclareFontFamily{T1}{XCharter-Sup}{} \DeclareFontShape{T1}{XCharter-Sup}{b}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-sup-t1 + <-> \XCharter@@scale XCharter-BoldSlanted-sup-t1 }{} \DeclareFontShape{T1}{XCharter-Sup}{b}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-sup-t1 + <-> \XCharter@@scale XCharter-Bold-sup-t1 }{} \DeclareFontShape{T1}{XCharter-Sup}{b}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-sup-t1 + <-> \XCharter@@scale XCharter-BoldItalic-sup-t1 }{} \DeclareFontShape{T1}{XCharter-Sup}{m}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-sup-t1 + <-> \XCharter@@scale XCharter-Slanted-sup-t1 }{} \DeclareFontShape{T1}{XCharter-Sup}{m}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-sup-t1 + <-> \XCharter@@scale XCharter-Roman-sup-t1 }{} \DeclareFontShape{T1}{XCharter-Sup}{m}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-sup-t1 + <-> \XCharter@@scale XCharter-Italic-sup-t1 }{} \DeclareFontShape{T1}{XCharter-Sup}{bx}{sl}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TLF.fd index 318cc757eee..c37155b916a 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TLF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T1XCharter-TLF.fd @@ -9,61 +9,54 @@ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi - -\expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty -\else - \edef\XCharter@@altone{\XCharter@altone}% -\fi - \DeclareFontFamily{T1}{XCharter-TLF}{} \DeclareFontShape{T1}{XCharter-TLF}{m}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tlf-t1 + <-> \XCharter@@scale XCharter-Slanted-tlf-t1 }{} \DeclareFontShape{T1}{XCharter-TLF}{m}{scsl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tlf-sc-t1 + <-> \XCharter@@scale XCharter-Slanted-tlf-sc-t1 }{} \DeclareFontShape{T1}{XCharter-TLF}{m}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tlf-t1 + <-> \XCharter@@scale XCharter-Roman-tlf-t1 }{} \DeclareFontShape{T1}{XCharter-TLF}{m}{sc}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tlf-sc-t1 + <-> \XCharter@@scale XCharter-Roman-tlf-sc-t1 }{} \DeclareFontShape{T1}{XCharter-TLF}{m}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tlf-t1 + <-> \XCharter@@scale XCharter-Italic-tlf-t1 }{} \DeclareFontShape{T1}{XCharter-TLF}{m}{scit}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tlf-sc-t1 + <-> \XCharter@@scale XCharter-Italic-tlf-sc-t1 }{} \DeclareFontShape{T1}{XCharter-TLF}{b}{sc}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tlf-sc-t1 + <-> \XCharter@@scale XCharter-Bold-tlf-sc-t1 }{} \DeclareFontShape{T1}{XCharter-TLF}{b}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tlf-t1 + <-> \XCharter@@scale XCharter-BoldItalic-tlf-t1 }{} \DeclareFontShape{T1}{XCharter-TLF}{b}{scit}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tlf-sc-t1 + <-> \XCharter@@scale XCharter-BoldItalic-tlf-sc-t1 }{} \DeclareFontShape{T1}{XCharter-TLF}{b}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tlf-t1 + <-> \XCharter@@scale XCharter-BoldSlanted-tlf-t1 }{} \DeclareFontShape{T1}{XCharter-TLF}{b}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tlf-t1 + <-> \XCharter@@scale XCharter-Bold-tlf-t1 }{} \DeclareFontShape{T1}{XCharter-TLF}{b}{scsl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tlf-sc-t1 + <-> \XCharter@@scale XCharter-BoldSlanted-tlf-sc-t1 }{} \DeclareFontShape{T1}{XCharter-TLF}{bx}{sc}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-Sup.fd b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-Sup.fd index e52998f9c3c..9b45f84f258 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-Sup.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-Sup.fd @@ -9,37 +9,30 @@ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi - -\expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty -\else - \edef\XCharter@@altone{\XCharter@altone}% -\fi - \DeclareFontFamily{T2A}{XCharter-Sup}{} \DeclareFontShape{T2A}{XCharter-Sup}{b}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-sup-t2a + <-> \XCharter@@scale XCharter-BoldSlanted-sup-t2a }{} \DeclareFontShape{T2A}{XCharter-Sup}{b}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-sup-t2a + <-> \XCharter@@scale XCharter-BoldItalic-sup-t2a }{} \DeclareFontShape{T2A}{XCharter-Sup}{b}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-sup-t2a + <-> \XCharter@@scale XCharter-Bold-sup-t2a }{} \DeclareFontShape{T2A}{XCharter-Sup}{m}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-sup-t2a + <-> \XCharter@@scale XCharter-Slanted-sup-t2a }{} \DeclareFontShape{T2A}{XCharter-Sup}{m}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-sup-t2a + <-> \XCharter@@scale XCharter-Italic-sup-t2a }{} \DeclareFontShape{T2A}{XCharter-Sup}{m}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-sup-t2a + <-> \XCharter@@scale XCharter-Roman-sup-t2a }{} \DeclareFontShape{T2A}{XCharter-Sup}{bx}{sl}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TLF.fd index 27e737511c6..cb65bf904e1 100644 --- a/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TLF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/T2AXCharter-TLF.fd @@ -9,61 +9,54 @@ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi - -\expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty -\else - \edef\XCharter@@altone{\XCharter@altone}% -\fi - \DeclareFontFamily{T2A}{XCharter-TLF}{} \DeclareFontShape{T2A}{XCharter-TLF}{b}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tlf-t2a + <-> \XCharter@@scale XCharter-BoldItalic-tlf-t2a }{} \DeclareFontShape{T2A}{XCharter-TLF}{b}{sc}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tlf-sc-t2a + <-> \XCharter@@scale XCharter-Bold-tlf-sc-t2a }{} \DeclareFontShape{T2A}{XCharter-TLF}{b}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tlf-t2a + <-> \XCharter@@scale XCharter-BoldSlanted-tlf-t2a }{} \DeclareFontShape{T2A}{XCharter-TLF}{b}{scsl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tlf-sc-t2a + <-> \XCharter@@scale XCharter-BoldSlanted-tlf-sc-t2a }{} \DeclareFontShape{T2A}{XCharter-TLF}{b}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tlf-t2a + <-> \XCharter@@scale XCharter-Bold-tlf-t2a }{} \DeclareFontShape{T2A}{XCharter-TLF}{b}{scit}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tlf-sc-t2a + <-> \XCharter@@scale XCharter-BoldItalic-tlf-sc-t2a }{} \DeclareFontShape{T2A}{XCharter-TLF}{m}{scit}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tlf-sc-t2a + <-> \XCharter@@scale XCharter-Italic-tlf-sc-t2a }{} \DeclareFontShape{T2A}{XCharter-TLF}{m}{scsl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tlf-sc-t2a + <-> \XCharter@@scale XCharter-Slanted-tlf-sc-t2a }{} \DeclareFontShape{T2A}{XCharter-TLF}{m}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tlf-t2a + <-> \XCharter@@scale XCharter-Roman-tlf-t2a }{} \DeclareFontShape{T2A}{XCharter-TLF}{m}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tlf-t2a + <-> \XCharter@@scale XCharter-Slanted-tlf-t2a }{} \DeclareFontShape{T2A}{XCharter-TLF}{m}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tlf-t2a + <-> \XCharter@@scale XCharter-Italic-tlf-t2a }{} \DeclareFontShape{T2A}{XCharter-TLF}{m}{sc}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tlf-sc-t2a + <-> \XCharter@@scale XCharter-Roman-tlf-sc-t2a }{} \DeclareFontShape{T2A}{XCharter-TLF}{bx}{it}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TLF.fd index 1402d1ef699..0cd91d03a6f 100644 --- a/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TLF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TLF.fd @@ -9,37 +9,30 @@ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi - -\expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty -\else - \edef\XCharter@@altone{\XCharter@altone}% -\fi - \DeclareFontFamily{TS1}{XCharter-TLF}{} \DeclareFontShape{TS1}{XCharter-TLF}{b}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tlf-ts1 + <-> \XCharter@@scale XCharter-BoldItalic-tlf-ts1 }{} \DeclareFontShape{TS1}{XCharter-TLF}{b}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tlf-ts1 + <-> \XCharter@@scale XCharter-BoldSlanted-tlf-ts1 }{} \DeclareFontShape{TS1}{XCharter-TLF}{b}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tlf-ts1 + <-> \XCharter@@scale XCharter-Bold-tlf-ts1 }{} \DeclareFontShape{TS1}{XCharter-TLF}{m}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tlf-ts1 + <-> \XCharter@@scale XCharter-Roman-tlf-ts1 }{} \DeclareFontShape{TS1}{XCharter-TLF}{m}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tlf-ts1 + <-> \XCharter@@scale XCharter-Slanted-tlf-ts1 }{} \DeclareFontShape{TS1}{XCharter-TLF}{m}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tlf-ts1 + <-> \XCharter@@scale XCharter-Italic-tlf-ts1 }{} \DeclareFontShape{TS1}{XCharter-TLF}{bx}{it}{ diff --git a/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TOsF.fd b/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TOsF.fd index 631db322fcf..04fc700b7cf 100644 --- a/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TOsF.fd +++ b/Master/texmf-dist/tex/latex/xcharter/TS1XCharter-TOsF.fd @@ -9,37 +9,30 @@ \edef\XCharter@@scale{s*[\csname XCharter@scale\endcsname]}% \fi - -\expandafter\ifx\csname XCharter@altone\endcsname\relax - \let\XCharter@@altone\@empty -\else - \edef\XCharter@@altone{\XCharter@altone}% -\fi - \DeclareFontFamily{TS1}{XCharter-TOsF}{} \DeclareFontShape{TS1}{XCharter-TOsF}{b}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldItalic-tosf-ts1 + <-> \XCharter@@scale XCharter-BoldItalic-tosf-ts1 }{} \DeclareFontShape{TS1}{XCharter-TOsF}{b}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Bold-tosf-ts1 + <-> \XCharter@@scale XCharter-Bold-tosf-ts1 }{} \DeclareFontShape{TS1}{XCharter-TOsF}{b}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-BoldSlanted-tosf-ts1 + <-> \XCharter@@scale XCharter-BoldSlanted-tosf-ts1 }{} \DeclareFontShape{TS1}{XCharter-TOsF}{m}{sl}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Slanted-tosf-ts1 + <-> \XCharter@@scale XCharter-Slanted-tosf-ts1 }{} \DeclareFontShape{TS1}{XCharter-TOsF}{m}{n}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Roman-tosf-ts1 + <-> \XCharter@@scale XCharter-Roman-tosf-ts1 }{} \DeclareFontShape{TS1}{XCharter-TOsF}{m}{it}{ - <-> \XCharter@@scale XCharter\XCharter@@altone-Italic-tosf-ts1 + <-> \XCharter@@scale XCharter-Italic-tosf-ts1 }{} \DeclareFontShape{TS1}{XCharter-TOsF}{bx}{it}{ -- cgit v1.2.3