1 files changed, 86 insertions, 21 deletions

diff --git a/fonts/comicneue/tex/OT1ComicNeue-TLF.fd b/fonts/comicneue/tex/OT1ComicNeue-TLF.fd
index 9db4e1b572..533a956c5f 100644
--- a/fonts/comicneue/tex/OT1ComicNeue-TLF.fd
+++ b/fonts/comicneue/tex/OT1ComicNeue-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2015/07/03
+%% Generated by autoinst on 2020/04/26
 %%
 \ProvidesFile{OT1ComicNeue-TLF.fd}
-    [2015/07/03 (autoinst)  Font definitions for OT1/ComicNeue-TLF.]
+    [2020/04/26 (autoinst)  Font definitions for OT1/ComicNeue-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname ComicNeue@scale\endcsname\relax
     \let\ComicNeue@@scale\@empty
@@ -11,40 +19,101 @@
 
 \DeclareFontFamily{OT1}{ComicNeue-TLF}{}
 
-\DeclareFontShape{OT1}{ComicNeue-TLF}{l}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{ComicNeue-TLF}{regular}{it}{
+      <-> \ComicNeue@@scale ComicNeue-Italic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{ComicNeue-TLF}{regular}{n}{
+      <-> \ComicNeue@@scale ComicNeue-Regular-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{ComicNeue-TLF}{regular}{sl}{
+      <-> ssub * ComicNeue-TLF/regular/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{ComicNeue-TLF}{bold}{n}{
+      <-> \ComicNeue@@scale ComicNeue-Bold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{ComicNeue-TLF}{bold}{it}{
+      <-> \ComicNeue@@scale ComicNeue-BoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{ComicNeue-TLF}{bold}{sl}{
+      <-> ssub * ComicNeue-TLF/bold/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{ComicNeue-TLF}{light}{it}{
+      <-> \ComicNeue@@scale ComicNeue-LightItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{ComicNeue-TLF}{light}{n}{
       <-> \ComicNeue@@scale ComicNeue-Light-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ComicNeue-TLF}{l}{sl}{
-      <-> \ComicNeue@@scale ComicNeue-LightOblique-tlf-ot1
+\DeclareFontShape{OT1}{ComicNeue-TLF}{light}{sl}{
+      <-> ssub * ComicNeue-TLF/light/it
 }{}
 
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
 \DeclareFontShape{OT1}{ComicNeue-TLF}{l}{it}{
-      <-> ssub * ComicNeue-TLF/l/sl
+      <-> alias * ComicNeue-TLF/light/it
 }{}
 
-\DeclareFontShape{OT1}{ComicNeue-TLF}{b}{n}{
-      <-> \ComicNeue@@scale ComicNeue-Bold-tlf-ot1
+\DeclareFontShape{OT1}{ComicNeue-TLF}{l}{n}{
+      <-> alias * ComicNeue-TLF/light/n
 }{}
 
-\DeclareFontShape{OT1}{ComicNeue-TLF}{b}{sl}{
-      <-> \ComicNeue@@scale ComicNeue-BoldOblique-tlf-ot1
+\DeclareFontShape{OT1}{ComicNeue-TLF}{l}{sl}{
+      <-> alias * ComicNeue-TLF/light/sl
 }{}
 
-\DeclareFontShape{OT1}{ComicNeue-TLF}{b}{it}{
-      <-> ssub * ComicNeue-TLF/b/sl
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{ComicNeue-TLF}{m}{it}{
+      <-> alias * ComicNeue-TLF/regular/it
+}{}
+
+\DeclareFontShape{OT1}{ComicNeue-TLF}{m}{n}{
+      <-> alias * ComicNeue-TLF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{ComicNeue-TLF}{m}{sl}{
-      <-> \ComicNeue@@scale ComicNeue-Oblique-tlf-ot1
+      <-> alias * ComicNeue-TLF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{ComicNeue-TLF}{m}{n}{
-      <-> \ComicNeue@@scale ComicNeue-tlf-ot1
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{ComicNeue-TLF}{b}{it}{
+      <-> alias * ComicNeue-TLF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{ComicNeue-TLF}{m}{it}{
-      <-> ssub * ComicNeue-TLF/m/sl
+\DeclareFontShape{OT1}{ComicNeue-TLF}{b}{n}{
+      <-> alias * ComicNeue-TLF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{ComicNeue-TLF}{b}{sl}{
+      <-> alias * ComicNeue-TLF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{ComicNeue-TLF}{bx}{sl}{
+      <-> ssub * ComicNeue-TLF/b/sl
 }{}
 
 \DeclareFontShape{OT1}{ComicNeue-TLF}{bx}{it}{
@@ -55,8 +124,4 @@
       <-> ssub * ComicNeue-TLF/b/n
 }{}
 
-\DeclareFontShape{OT1}{ComicNeue-TLF}{bx}{sl}{
-      <-> ssub * ComicNeue-TLF/b/sl
-}{}
-
 \endinput