xcharter (2aug19)

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

4 files changed, 231 insertions, 87 deletions

diff --git a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-Sup.fd b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-Sup.fd
index 3c93c5e359e..f9438beaf0c 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 2018/08/25
+%% Generated by autoinst on 2019/07/31
 %%
 \ProvidesFile{T2ASRBXCharter-Sup.fd}
-    [2018/08/25 (autoinst)  Font definitions for T2ASRB/XCharter-Sup.]
+    [2019/07/31 (autoinst)  Font definitions for T2ASRB/XCharter-Sup.]
 
 \expandafter\ifx\csname XCharter@scale\endcsname\relax
     \let\XCharter@@scale\@empty
@@ -11,28 +11,67 @@
 
 \DeclareFontFamily{T2ASRB}{XCharter-Sup}{}
 
-\DeclareFontShape{T2ASRB}{XCharter-Sup}{m}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2ASRB}{XCharter-Sup}{regular}{sl}{
+      <-> \XCharter@@scale XCharter-Slanted-sup-t2asrb
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-Sup}{regular}{it}{
+      <-> \XCharter@@scale XCharter-Italic-sup-t2asrb
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-Sup}{regular}{n}{
       <-> \XCharter@@scale XCharter-Roman-sup-t2asrb
 }{}
 
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2ASRB}{XCharter-Sup}{bold}{it}{
+      <-> \XCharter@@scale XCharter-BoldItalic-sup-t2asrb
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-Sup}{bold}{n}{
+      <-> \XCharter@@scale XCharter-Bold-sup-t2asrb
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-Sup}{bold}{sl}{
+      <-> \XCharter@@scale XCharter-BoldSlanted-sup-t2asrb
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
 \DeclareFontShape{T2ASRB}{XCharter-Sup}{m}{sl}{
-      <-> \XCharter@@scale XCharter-Slanted-sup-t2asrb
+      <-> ssub * XCharter-Sup/regular/sl
 }{}
 
 \DeclareFontShape{T2ASRB}{XCharter-Sup}{m}{it}{
-      <-> \XCharter@@scale XCharter-Italic-sup-t2asrb
+      <-> ssub * XCharter-Sup/regular/it
 }{}
 
+\DeclareFontShape{T2ASRB}{XCharter-Sup}{m}{n}{
+      <-> ssub * XCharter-Sup/regular/n
+}{}
+
+
+%   b --> bold
+
 \DeclareFontShape{T2ASRB}{XCharter-Sup}{b}{it}{
-      <-> \XCharter@@scale XCharter-BoldItalic-sup-t2asrb
+      <-> ssub * XCharter-Sup/bold/it
 }{}
 
 \DeclareFontShape{T2ASRB}{XCharter-Sup}{b}{n}{
-      <-> \XCharter@@scale XCharter-Bold-sup-t2asrb
+      <-> ssub * XCharter-Sup/bold/n
 }{}
 
 \DeclareFontShape{T2ASRB}{XCharter-Sup}{b}{sl}{
-      <-> \XCharter@@scale XCharter-BoldSlanted-sup-t2asrb
+      <-> ssub * XCharter-Sup/bold/sl
 }{}
 
 \DeclareFontShape{T2ASRB}{XCharter-Sup}{bx}{it}{
diff --git a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TLF.fd b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TLF.fd
index 4d1e7b165e5..6af49a38429 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 2018/08/25
+%% Generated by autoinst on 2019/07/31
 %%
 \ProvidesFile{T2ASRBXCharter-TLF.fd}
-    [2018/08/25 (autoinst)  Font definitions for T2ASRB/XCharter-TLF.]
+    [2019/07/31 (autoinst)  Font definitions for T2ASRB/XCharter-TLF.]
 
 \expandafter\ifx\csname XCharter@scale\endcsname\relax
     \let\XCharter@@scale\@empty
@@ -11,76 +11,139 @@
 
 \DeclareFontFamily{T2ASRB}{XCharter-TLF}{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{sl}{
-      <-> \XCharter@@scale XCharter-BoldSlanted-tlf-t2asrb
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{sc}{
+      <-> \XCharter@@scale XCharter-Roman-tlf-sc-t2asrb
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{scsl}{
-      <-> \XCharter@@scale XCharter-BoldSlanted-tlf-sc-t2asrb
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{sl}{
+      <-> \XCharter@@scale XCharter-Slanted-tlf-t2asrb
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{n}{
-      <-> \XCharter@@scale XCharter-Bold-tlf-t2asrb
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{scit}{
+      <-> \XCharter@@scale XCharter-Italic-tlf-sc-t2asrb
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{sc}{
-      <-> \XCharter@@scale XCharter-Bold-tlf-sc-t2asrb
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{scsl}{
+      <-> \XCharter@@scale XCharter-Slanted-tlf-sc-t2asrb
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{it}{
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{n}{
+      <-> \XCharter@@scale XCharter-Roman-tlf-t2asrb
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{regular}{it}{
+      <-> \XCharter@@scale XCharter-Italic-tlf-t2asrb
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{n}{
+      <-> \XCharter@@scale XCharter-Bold-tlf-t2asrb
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{it}{
       <-> \XCharter@@scale XCharter-BoldItalic-tlf-t2asrb
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{scit}{
-      <-> \XCharter@@scale XCharter-BoldItalic-tlf-sc-t2asrb
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{scsl}{
+      <-> \XCharter@@scale XCharter-BoldSlanted-tlf-sc-t2asrb
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{it}{
-      <-> \XCharter@@scale XCharter-Italic-tlf-t2asrb
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{sl}{
+      <-> \XCharter@@scale XCharter-BoldSlanted-tlf-t2asrb
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{scsl}{
-      <-> \XCharter@@scale XCharter-Slanted-tlf-sc-t2asrb
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{scit}{
+      <-> \XCharter@@scale XCharter-BoldItalic-tlf-sc-t2asrb
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{n}{
-      <-> \XCharter@@scale XCharter-Roman-tlf-t2asrb
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{bold}{sc}{
+      <-> \XCharter@@scale XCharter-Bold-tlf-sc-t2asrb
 }{}
 
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
 \DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{sc}{
-      <-> \XCharter@@scale XCharter-Roman-tlf-sc-t2asrb
+      <-> ssub * XCharter-TLF/regular/sc
 }{}
 
 \DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{sl}{
-      <-> \XCharter@@scale XCharter-Slanted-tlf-t2asrb
+      <-> ssub * XCharter-TLF/regular/sl
 }{}
 
 \DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{scit}{
-      <-> \XCharter@@scale XCharter-Italic-tlf-sc-t2asrb
+      <-> ssub * XCharter-TLF/regular/scit
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{sl}{
-      <-> ssub * XCharter-TLF/b/sl
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{scsl}{
+      <-> ssub * XCharter-TLF/regular/scsl
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{scsl}{
-      <-> ssub * XCharter-TLF/b/scsl
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{n}{
+      <-> ssub * XCharter-TLF/regular/n
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{n}{
-      <-> ssub * XCharter-TLF/b/n
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{m}{it}{
+      <-> ssub * XCharter-TLF/regular/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{n}{
+      <-> ssub * XCharter-TLF/bold/n
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{it}{
+      <-> ssub * XCharter-TLF/bold/it
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{scsl}{
+      <-> ssub * XCharter-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{sl}{
+      <-> ssub * XCharter-TLF/bold/sl
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{scit}{
+      <-> ssub * XCharter-TLF/bold/scit
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{b}{sc}{
+      <-> ssub * XCharter-TLF/bold/sc
 }{}
 
 \DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{sc}{
       <-> ssub * XCharter-TLF/b/sc
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{it}{
-      <-> ssub * XCharter-TLF/b/it
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{sl}{
+      <-> ssub * XCharter-TLF/b/sl
 }{}
 
 \DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{scit}{
       <-> ssub * XCharter-TLF/b/scit
 }{}
 
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{scsl}{
+      <-> ssub * XCharter-TLF/b/scsl
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{n}{
+      <-> ssub * XCharter-TLF/b/n
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-TLF}{bx}{it}{
+      <-> ssub * XCharter-TLF/b/it
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TOsF.fd b/Master/texmf-dist/tex/latex/xcharter/T2ASRBXCharter-TOsF.fd
index 1db26431036..545f8724c5a 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 2018/08/25
+%% Generated by autoinst on 2019/07/31
 %%
 \ProvidesFile{T2ASRBXCharter-TOsF.fd}
-    [2018/08/25 (autoinst)  Font definitions for T2ASRB/XCharter-TOsF.]
+    [2019/07/31 (autoinst)  Font definitions for T2ASRB/XCharter-TOsF.]
 
 \expandafter\ifx\csname XCharter@scale\endcsname\relax
     \let\XCharter@@scale\@empty
@@ -11,76 +11,139 @@
 
 \DeclareFontFamily{T2ASRB}{XCharter-TOsF}{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{it}{
-      <-> \XCharter@@scale XCharter-Italic-tosf-t2asrb
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{sl}{
+      <-> \XCharter@@scale XCharter-BoldSlanted-tosf-t2asrb
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{sl}{
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{scit}{
+      <-> \XCharter@@scale XCharter-BoldItalic-tosf-sc-t2asrb
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{sc}{
+      <-> \XCharter@@scale XCharter-Bold-tosf-sc-t2asrb
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{n}{
+      <-> \XCharter@@scale XCharter-Bold-tosf-t2asrb
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{it}{
+      <-> \XCharter@@scale XCharter-BoldItalic-tosf-t2asrb
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bold}{scsl}{
+      <-> \XCharter@@scale XCharter-BoldSlanted-tosf-sc-t2asrb
+}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{scit}{
+      <-> \XCharter@@scale XCharter-Italic-tosf-sc-t2asrb
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{sl}{
       <-> \XCharter@@scale XCharter-Slanted-tosf-t2asrb
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{n}{
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{sc}{
+      <-> \XCharter@@scale XCharter-Roman-tosf-sc-t2asrb
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{it}{
+      <-> \XCharter@@scale XCharter-Italic-tosf-t2asrb
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{n}{
       <-> \XCharter@@scale XCharter-Roman-tosf-t2asrb
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{scsl}{
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{regular}{scsl}{
       <-> \XCharter@@scale XCharter-Slanted-tosf-sc-t2asrb
 }{}
 
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{scit}{
+      <-> ssub * XCharter-TOsF/regular/scit
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{sl}{
+      <-> ssub * XCharter-TOsF/regular/sl
+}{}
+
 \DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{sc}{
-      <-> \XCharter@@scale XCharter-Roman-tosf-sc-t2asrb
+      <-> ssub * XCharter-TOsF/regular/sc
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{scit}{
-      <-> \XCharter@@scale XCharter-Italic-tosf-sc-t2asrb
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{it}{
+      <-> ssub * XCharter-TOsF/regular/it
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{n}{
-      <-> \XCharter@@scale XCharter-Bold-tosf-t2asrb
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{n}{
+      <-> ssub * XCharter-TOsF/regular/n
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{scsl}{
-      <-> \XCharter@@scale XCharter-BoldSlanted-tosf-sc-t2asrb
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{m}{scsl}{
+      <-> ssub * XCharter-TOsF/regular/scsl
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{sl}{
+      <-> ssub * XCharter-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{scit}{
+      <-> ssub * XCharter-TOsF/bold/scit
 }{}
 
 \DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{sc}{
-      <-> \XCharter@@scale XCharter-Bold-tosf-sc-t2asrb
+      <-> ssub * XCharter-TOsF/bold/sc
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{sl}{
-      <-> \XCharter@@scale XCharter-BoldSlanted-tosf-t2asrb
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{n}{
+      <-> ssub * XCharter-TOsF/bold/n
 }{}
 
 \DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{it}{
-      <-> \XCharter@@scale XCharter-BoldItalic-tosf-t2asrb
+      <-> ssub * XCharter-TOsF/bold/it
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{scit}{
-      <-> \XCharter@@scale XCharter-BoldItalic-tosf-sc-t2asrb
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{b}{scsl}{
+      <-> ssub * XCharter-TOsF/bold/scsl
 }{}
 
 \DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{n}{
       <-> ssub * XCharter-TOsF/b/n
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{scsl}{
-      <-> ssub * XCharter-TOsF/b/scsl
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{it}{
+      <-> ssub * XCharter-TOsF/b/it
 }{}
 
-\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{sc}{
-      <-> ssub * XCharter-TOsF/b/sc
+\DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{scsl}{
+      <-> ssub * XCharter-TOsF/b/scsl
 }{}
 
 \DeclareFontShape{T2ASRB}{XCharter-TOsF}{bx}{sl}{
       <-> ssub * XCharter-TOsF/b/sl
 }{}
 
-\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}{sc}{
+      <-> ssub * XCharter-TOsF/b/sc
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/xcharter/t2asrbcmr.fd b/Master/texmf-dist/tex/latex/xcharter/t2asrbcmr.fd
deleted file mode 100644
index bea4b51ba0d..00000000000
--- a/Master/texmf-dist/tex/latex/xcharter/t2asrbcmr.fd
+++ /dev/null
@@ -1,21 +0,0 @@
-%%
-%% This is file `t2asrbcmr.fd',
-%% adapted from t2acmr.fd
-\ProvidesFile{t2asrbcmr.fd}
-  [2001/08/11 v1.0a Computer Modern Cyrillic font definitions]
-\providecommand{\EC@family}[5]{%
-  \DeclareFontShape{#1}{#2}{#3}{#4}%
-  {<5><6><7><8><9><10><10.95><12><14.4>%
-   <17.28><20.74><24.88><29.86><35.83>genb*#5}{}}
-\DeclareFontFamily{T2ASRB}{cmr}{}
-\DeclareFontShape{T2ASRB}{cmr}{m}{n}{<-> ec-lmr10}{}
-\DeclareFontShape{T2ASRB}{cmr}{m}{sl}{<-> ec-lmro10}{}
-\DeclareFontShape{T2ASRB}{cmr}{m}{it}{<-> ec-lmri10}{}
-\DeclareFontShape{T2ASRB}{cmr}{m}{sc}{<-> ec-lmcsc}{}
-\DeclareFontShape{T2ASRB}{cmr}{bx}{n}{<-> ec-lmbx10}{}
-\DeclareFontShape{T2ASRB}{cmr}{b}{n}{<-> ec-lmb10}{}
-\DeclareFontShape{T2ASRB}{cmr}{bx}{it}{<-> ec-lmbxi10}{}
-\DeclareFontShape{T2ASRB}{cmr}{bx}{sl}{<-> ec-lmbxo10}{}
-\endinput
-%%
-%% End of file `t2asrbcmr.fd'.