summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/comicneue
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-04-26 21:29:52 +0000
committerKarl Berry <karl@freefriends.org>2020-04-26 21:29:52 +0000
commit232d304274941244ad64db66ab9d030265bdbaeb (patch)
tree7da48581618da77e051ad5818f1d5181958cb018 /Master/texmf-dist/tex/latex/comicneue
parent1b5fdfe77971e3ed36b25a649ff500c2cc91139b (diff)
comicneue (26apr20)
git-svn-id: svn://tug.org/texlive/trunk@54891 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/comicneue')
-rw-r--r--Master/texmf-dist/tex/latex/comicneue/LY1ComicNeue-TLF.fd107
-rw-r--r--Master/texmf-dist/tex/latex/comicneue/LY1ComicNeueAngular-TLF.fd105
-rw-r--r--Master/texmf-dist/tex/latex/comicneue/OT1ComicNeue-TLF.fd107
-rw-r--r--Master/texmf-dist/tex/latex/comicneue/OT1ComicNeueAngular-TLF.fd97
-rw-r--r--Master/texmf-dist/tex/latex/comicneue/T1ComicNeue-TLF.fd103
-rw-r--r--Master/texmf-dist/tex/latex/comicneue/T1ComicNeueAngular-TLF.fd105
-rw-r--r--Master/texmf-dist/tex/latex/comicneue/TS1ComicNeue-TLF.fd101
-rw-r--r--Master/texmf-dist/tex/latex/comicneue/TS1ComicNeueAngular-TLF.fd105
-rw-r--r--Master/texmf-dist/tex/latex/comicneue/comicneue.sty34
9 files changed, 692 insertions, 172 deletions
diff --git a/Master/texmf-dist/tex/latex/comicneue/LY1ComicNeue-TLF.fd b/Master/texmf-dist/tex/latex/comicneue/LY1ComicNeue-TLF.fd
index e7793229950..09a4d293bbf 100644
--- a/Master/texmf-dist/tex/latex/comicneue/LY1ComicNeue-TLF.fd
+++ b/Master/texmf-dist/tex/latex/comicneue/LY1ComicNeue-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2015/07/03
+%% Generated by autoinst on 2020/04/26
%%
\ProvidesFile{LY1ComicNeue-TLF.fd}
- [2015/07/03 (autoinst) Font definitions for LY1/ComicNeue-TLF.]
+ [2020/04/26 (autoinst) Font definitions for LY1/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,52 +19,109 @@
\DeclareFontFamily{LY1}{ComicNeue-TLF}{}
-\DeclareFontShape{LY1}{ComicNeue-TLF}{l}{sl}{
- <-> \ComicNeue@@scale ComicNeue-LightOblique-tlf-ly1
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{ComicNeue-TLF}{bold}{n}{
+ <-> \ComicNeue@@scale ComicNeue-Bold-tlf-ly1
}{}
-\DeclareFontShape{LY1}{ComicNeue-TLF}{l}{n}{
+\DeclareFontShape{LY1}{ComicNeue-TLF}{bold}{it}{
+ <-> \ComicNeue@@scale ComicNeue-BoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{ComicNeue-TLF}{bold}{sl}{
+ <-> ssub * ComicNeue-TLF/bold/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{LY1}{ComicNeue-TLF}{light}{n}{
<-> \ComicNeue@@scale ComicNeue-Light-tlf-ly1
}{}
+\DeclareFontShape{LY1}{ComicNeue-TLF}{light}{it}{
+ <-> \ComicNeue@@scale ComicNeue-LightItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{ComicNeue-TLF}{light}{sl}{
+ <-> ssub * ComicNeue-TLF/light/it
+}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{ComicNeue-TLF}{regular}{it}{
+ <-> \ComicNeue@@scale ComicNeue-Italic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{ComicNeue-TLF}{regular}{n}{
+ <-> \ComicNeue@@scale ComicNeue-Regular-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{ComicNeue-TLF}{regular}{sl}{
+ <-> ssub * ComicNeue-TLF/regular/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% l --> light
+
+\DeclareFontShape{LY1}{ComicNeue-TLF}{l}{sl}{
+ <-> alias * ComicNeue-TLF/light/sl
+}{}
+
\DeclareFontShape{LY1}{ComicNeue-TLF}{l}{it}{
- <-> ssub * ComicNeue-TLF/l/sl
+ <-> alias * ComicNeue-TLF/light/it
}{}
-\DeclareFontShape{LY1}{ComicNeue-TLF}{b}{n}{
- <-> \ComicNeue@@scale ComicNeue-Bold-tlf-ly1
+\DeclareFontShape{LY1}{ComicNeue-TLF}{l}{n}{
+ <-> alias * ComicNeue-TLF/light/n
}{}
-\DeclareFontShape{LY1}{ComicNeue-TLF}{b}{sl}{
- <-> \ComicNeue@@scale ComicNeue-BoldOblique-tlf-ly1
+
+% m --> regular
+
+\DeclareFontShape{LY1}{ComicNeue-TLF}{m}{it}{
+ <-> alias * ComicNeue-TLF/regular/it
}{}
-\DeclareFontShape{LY1}{ComicNeue-TLF}{b}{it}{
- <-> ssub * ComicNeue-TLF/b/sl
+\DeclareFontShape{LY1}{ComicNeue-TLF}{m}{n}{
+ <-> alias * ComicNeue-TLF/regular/n
}{}
\DeclareFontShape{LY1}{ComicNeue-TLF}{m}{sl}{
- <-> \ComicNeue@@scale ComicNeue-Oblique-tlf-ly1
+ <-> alias * ComicNeue-TLF/regular/sl
}{}
-\DeclareFontShape{LY1}{ComicNeue-TLF}{m}{n}{
- <-> \ComicNeue@@scale ComicNeue-tlf-ly1
+
+% b --> bold
+
+\DeclareFontShape{LY1}{ComicNeue-TLF}{b}{n}{
+ <-> alias * ComicNeue-TLF/bold/n
}{}
-\DeclareFontShape{LY1}{ComicNeue-TLF}{m}{it}{
- <-> ssub * ComicNeue-TLF/m/sl
+\DeclareFontShape{LY1}{ComicNeue-TLF}{b}{it}{
+ <-> alias * ComicNeue-TLF/bold/it
}{}
-\DeclareFontShape{LY1}{ComicNeue-TLF}{bx}{sl}{
- <-> ssub * ComicNeue-TLF/b/sl
+\DeclareFontShape{LY1}{ComicNeue-TLF}{b}{sl}{
+ <-> alias * ComicNeue-TLF/bold/sl
}{}
-\DeclareFontShape{LY1}{ComicNeue-TLF}{bx}{n}{
- <-> ssub * ComicNeue-TLF/b/n
+\DeclareFontShape{LY1}{ComicNeue-TLF}{bx}{sl}{
+ <-> ssub * ComicNeue-TLF/b/sl
}{}
\DeclareFontShape{LY1}{ComicNeue-TLF}{bx}{it}{
<-> ssub * ComicNeue-TLF/b/it
}{}
+\DeclareFontShape{LY1}{ComicNeue-TLF}{bx}{n}{
+ <-> ssub * ComicNeue-TLF/b/n
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/comicneue/LY1ComicNeueAngular-TLF.fd b/Master/texmf-dist/tex/latex/comicneue/LY1ComicNeueAngular-TLF.fd
index 42caa1c96ae..2ebfbff91fb 100644
--- a/Master/texmf-dist/tex/latex/comicneue/LY1ComicNeueAngular-TLF.fd
+++ b/Master/texmf-dist/tex/latex/comicneue/LY1ComicNeueAngular-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2015/07/03
+%% Generated by autoinst on 2020/04/26
%%
\ProvidesFile{LY1ComicNeueAngular-TLF.fd}
- [2015/07/03 (autoinst) Font definitions for LY1/ComicNeueAngular-TLF.]
+ [2020/04/26 (autoinst) Font definitions for LY1/ComicNeueAngular-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 ComicNeueAngular@scale\endcsname\relax
\let\ComicNeueAngular@@scale\@empty
@@ -11,52 +19,109 @@
\DeclareFontFamily{LY1}{ComicNeueAngular-TLF}{}
-\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{l}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{bold}{n}{
+ <-> \ComicNeueAngular@@scale ComicNeueAngular-Bold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{bold}{it}{
+ <-> \ComicNeueAngular@@scale ComicNeueAngular-BoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{bold}{sl}{
+ <-> ssub * ComicNeueAngular-TLF/bold/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{light}{it}{
+ <-> \ComicNeueAngular@@scale ComicNeueAngular-LightItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{light}{n}{
<-> \ComicNeueAngular@@scale ComicNeueAngular-Light-tlf-ly1
}{}
+\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{light}{sl}{
+ <-> ssub * ComicNeueAngular-TLF/light/it
+}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{regular}{it}{
+ <-> \ComicNeueAngular@@scale ComicNeueAngular-Italic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{regular}{n}{
+ <-> \ComicNeueAngular@@scale ComicNeueAngular-Regular-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{regular}{sl}{
+ <-> ssub * ComicNeueAngular-TLF/regular/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% l --> light
+
\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{l}{sl}{
- <-> \ComicNeueAngular@@scale ComicNeueAngular-LightOblique-tlf-ly1
+ <-> alias * ComicNeueAngular-TLF/light/sl
}{}
\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{l}{it}{
- <-> ssub * ComicNeueAngular-TLF/l/sl
+ <-> alias * ComicNeueAngular-TLF/light/it
}{}
-\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{b}{sl}{
- <-> \ComicNeueAngular@@scale ComicNeueAngular-BoldOblique-tlf-ly1
+\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{l}{n}{
+ <-> alias * ComicNeueAngular-TLF/light/n
}{}
-\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{b}{n}{
- <-> \ComicNeueAngular@@scale ComicNeueAngular-Bold-tlf-ly1
+
+% m --> regular
+
+\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{m}{it}{
+ <-> alias * ComicNeueAngular-TLF/regular/it
}{}
-\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{b}{it}{
- <-> ssub * ComicNeueAngular-TLF/b/sl
+\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{m}{n}{
+ <-> alias * ComicNeueAngular-TLF/regular/n
}{}
\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{m}{sl}{
- <-> \ComicNeueAngular@@scale ComicNeueAngular-Oblique-tlf-ly1
+ <-> alias * ComicNeueAngular-TLF/regular/sl
}{}
-\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{m}{n}{
- <-> \ComicNeueAngular@@scale ComicNeueAngular-tlf-ly1
+
+% b --> bold
+
+\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{b}{sl}{
+ <-> alias * ComicNeueAngular-TLF/bold/sl
}{}
-\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{m}{it}{
- <-> ssub * ComicNeueAngular-TLF/m/sl
+\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{b}{n}{
+ <-> alias * ComicNeueAngular-TLF/bold/n
}{}
-\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{bx}{it}{
- <-> ssub * ComicNeueAngular-TLF/b/it
+\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{b}{it}{
+ <-> alias * ComicNeueAngular-TLF/bold/it
}{}
-\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{bx}{sl}{
- <-> ssub * ComicNeueAngular-TLF/b/sl
+\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{bx}{it}{
+ <-> ssub * ComicNeueAngular-TLF/b/it
}{}
\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{bx}{n}{
<-> ssub * ComicNeueAngular-TLF/b/n
}{}
+\DeclareFontShape{LY1}{ComicNeueAngular-TLF}{bx}{sl}{
+ <-> ssub * ComicNeueAngular-TLF/b/sl
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/comicneue/OT1ComicNeue-TLF.fd b/Master/texmf-dist/tex/latex/comicneue/OT1ComicNeue-TLF.fd
index 9db4e1b572a..533a956c5ff 100644
--- a/Master/texmf-dist/tex/latex/comicneue/OT1ComicNeue-TLF.fd
+++ b/Master/texmf-dist/tex/latex/comicneue/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
diff --git a/Master/texmf-dist/tex/latex/comicneue/OT1ComicNeueAngular-TLF.fd b/Master/texmf-dist/tex/latex/comicneue/OT1ComicNeueAngular-TLF.fd
index ab37d51ef4b..52966041d0c 100644
--- a/Master/texmf-dist/tex/latex/comicneue/OT1ComicNeueAngular-TLF.fd
+++ b/Master/texmf-dist/tex/latex/comicneue/OT1ComicNeueAngular-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2015/07/03
+%% Generated by autoinst on 2020/04/26
%%
\ProvidesFile{OT1ComicNeueAngular-TLF.fd}
- [2015/07/03 (autoinst) Font definitions for OT1/ComicNeueAngular-TLF.]
+ [2020/04/26 (autoinst) Font definitions for OT1/ComicNeueAngular-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 ComicNeueAngular@scale\endcsname\relax
\let\ComicNeueAngular@@scale\@empty
@@ -11,50 +19,107 @@
\DeclareFontFamily{OT1}{ComicNeueAngular-TLF}{}
-\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{l}{sl}{
- <-> \ComicNeueAngular@@scale ComicNeueAngular-LightOblique-tlf-ot1
+
+% ---- bold ----
+
+\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{bold}{it}{
+ <-> \ComicNeueAngular@@scale ComicNeueAngular-BoldItalic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{l}{n}{
+\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{bold}{n}{
+ <-> \ComicNeueAngular@@scale ComicNeueAngular-Bold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{bold}{sl}{
+ <-> ssub * ComicNeueAngular-TLF/bold/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{light}{n}{
<-> \ComicNeueAngular@@scale ComicNeueAngular-Light-tlf-ot1
}{}
+\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{light}{it}{
+ <-> \ComicNeueAngular@@scale ComicNeueAngular-LightItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{light}{sl}{
+ <-> ssub * ComicNeueAngular-TLF/light/it
+}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{regular}{it}{
+ <-> \ComicNeueAngular@@scale ComicNeueAngular-Italic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{regular}{n}{
+ <-> \ComicNeueAngular@@scale ComicNeueAngular-Regular-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{regular}{sl}{
+ <-> ssub * ComicNeueAngular-TLF/regular/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% l --> light
+
+\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{l}{sl}{
+ <-> alias * ComicNeueAngular-TLF/light/sl
+}{}
+
\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{l}{it}{
- <-> ssub * ComicNeueAngular-TLF/l/sl
+ <-> alias * ComicNeueAngular-TLF/light/it
}{}
+\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{l}{n}{
+ <-> alias * ComicNeueAngular-TLF/light/n
+}{}
+
+
+% m --> regular
+
\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{m}{sl}{
- <-> \ComicNeueAngular@@scale ComicNeueAngular-Oblique-tlf-ot1
+ <-> alias * ComicNeueAngular-TLF/regular/sl
}{}
\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{m}{n}{
- <-> \ComicNeueAngular@@scale ComicNeueAngular-tlf-ot1
+ <-> alias * ComicNeueAngular-TLF/regular/n
}{}
\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{m}{it}{
- <-> ssub * ComicNeueAngular-TLF/m/sl
+ <-> alias * ComicNeueAngular-TLF/regular/it
}{}
-\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{b}{n}{
- <-> \ComicNeueAngular@@scale ComicNeueAngular-Bold-tlf-ot1
-}{}
+
+% b --> bold
\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{b}{sl}{
- <-> \ComicNeueAngular@@scale ComicNeueAngular-BoldOblique-tlf-ot1
+ <-> alias * ComicNeueAngular-TLF/bold/sl
}{}
\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{b}{it}{
- <-> ssub * ComicNeueAngular-TLF/b/sl
+ <-> alias * ComicNeueAngular-TLF/bold/it
}{}
-\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{bx}{n}{
- <-> ssub * ComicNeueAngular-TLF/b/n
+\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{b}{n}{
+ <-> alias * ComicNeueAngular-TLF/bold/n
}{}
\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{bx}{sl}{
<-> ssub * ComicNeueAngular-TLF/b/sl
}{}
+\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{bx}{n}{
+ <-> ssub * ComicNeueAngular-TLF/b/n
+}{}
+
\DeclareFontShape{OT1}{ComicNeueAngular-TLF}{bx}{it}{
<-> ssub * ComicNeueAngular-TLF/b/it
}{}
diff --git a/Master/texmf-dist/tex/latex/comicneue/T1ComicNeue-TLF.fd b/Master/texmf-dist/tex/latex/comicneue/T1ComicNeue-TLF.fd
index a10da227991..36982c99a26 100644
--- a/Master/texmf-dist/tex/latex/comicneue/T1ComicNeue-TLF.fd
+++ b/Master/texmf-dist/tex/latex/comicneue/T1ComicNeue-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2015/07/03
+%% Generated by autoinst on 2020/04/26
%%
\ProvidesFile{T1ComicNeue-TLF.fd}
- [2015/07/03 (autoinst) Font definitions for T1/ComicNeue-TLF.]
+ [2020/04/26 (autoinst) Font definitions for T1/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,44 +19,97 @@
\DeclareFontFamily{T1}{ComicNeue-TLF}{}
-\DeclareFontShape{T1}{ComicNeue-TLF}{l}{sl}{
- <-> \ComicNeue@@scale ComicNeue-LightOblique-tlf-t1
+
+% ---- regular ----
+
+\DeclareFontShape{T1}{ComicNeue-TLF}{regular}{n}{
+ <-> \ComicNeue@@scale ComicNeue-Regular-tlf-t1
}{}
-\DeclareFontShape{T1}{ComicNeue-TLF}{l}{n}{
- <-> \ComicNeue@@scale ComicNeue-Light-tlf-t1
+\DeclareFontShape{T1}{ComicNeue-TLF}{regular}{it}{
+ <-> \ComicNeue@@scale ComicNeue-Italic-tlf-t1
}{}
-\DeclareFontShape{T1}{ComicNeue-TLF}{l}{it}{
- <-> ssub * ComicNeue-TLF/l/sl
+\DeclareFontShape{T1}{ComicNeue-TLF}{regular}{sl}{
+ <-> ssub * ComicNeue-TLF/regular/it
}{}
-\DeclareFontShape{T1}{ComicNeue-TLF}{b}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{ComicNeue-TLF}{bold}{n}{
<-> \ComicNeue@@scale ComicNeue-Bold-tlf-t1
}{}
-\DeclareFontShape{T1}{ComicNeue-TLF}{b}{sl}{
- <-> \ComicNeue@@scale ComicNeue-BoldOblique-tlf-t1
+\DeclareFontShape{T1}{ComicNeue-TLF}{bold}{it}{
+ <-> \ComicNeue@@scale ComicNeue-BoldItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{ComicNeue-TLF}{b}{it}{
- <-> ssub * ComicNeue-TLF/b/sl
+\DeclareFontShape{T1}{ComicNeue-TLF}{bold}{sl}{
+ <-> ssub * ComicNeue-TLF/bold/it
}{}
+
+% ---- light ----
+
+\DeclareFontShape{T1}{ComicNeue-TLF}{light}{it}{
+ <-> \ComicNeue@@scale ComicNeue-LightItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{ComicNeue-TLF}{light}{n}{
+ <-> \ComicNeue@@scale ComicNeue-Light-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{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{T1}{ComicNeue-TLF}{l}{it}{
+ <-> alias * ComicNeue-TLF/light/it
+}{}
+
+\DeclareFontShape{T1}{ComicNeue-TLF}{l}{n}{
+ <-> alias * ComicNeue-TLF/light/n
+}{}
+
+\DeclareFontShape{T1}{ComicNeue-TLF}{l}{sl}{
+ <-> alias * ComicNeue-TLF/light/sl
+}{}
+
+
+% m --> regular
+
\DeclareFontShape{T1}{ComicNeue-TLF}{m}{n}{
- <-> \ComicNeue@@scale ComicNeue-tlf-t1
+ <-> alias * ComicNeue-TLF/regular/n
+}{}
+
+\DeclareFontShape{T1}{ComicNeue-TLF}{m}{it}{
+ <-> alias * ComicNeue-TLF/regular/it
}{}
\DeclareFontShape{T1}{ComicNeue-TLF}{m}{sl}{
- <-> \ComicNeue@@scale ComicNeue-Oblique-tlf-t1
+ <-> alias * ComicNeue-TLF/regular/sl
}{}
-\DeclareFontShape{T1}{ComicNeue-TLF}{m}{it}{
- <-> ssub * ComicNeue-TLF/m/sl
+
+% b --> bold
+
+\DeclareFontShape{T1}{ComicNeue-TLF}{b}{sl}{
+ <-> alias * ComicNeue-TLF/bold/sl
}{}
-\DeclareFontShape{T1}{ComicNeue-TLF}{bx}{it}{
- <-> ssub * ComicNeue-TLF/b/it
+\DeclareFontShape{T1}{ComicNeue-TLF}{b}{it}{
+ <-> alias * ComicNeue-TLF/bold/it
+}{}
+
+\DeclareFontShape{T1}{ComicNeue-TLF}{b}{n}{
+ <-> alias * ComicNeue-TLF/bold/n
}{}
\DeclareFontShape{T1}{ComicNeue-TLF}{bx}{sl}{
@@ -59,4 +120,8 @@
<-> ssub * ComicNeue-TLF/b/n
}{}
+\DeclareFontShape{T1}{ComicNeue-TLF}{bx}{it}{
+ <-> ssub * ComicNeue-TLF/b/it
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/comicneue/T1ComicNeueAngular-TLF.fd b/Master/texmf-dist/tex/latex/comicneue/T1ComicNeueAngular-TLF.fd
index 072f09962cf..fd8da7f7676 100644
--- a/Master/texmf-dist/tex/latex/comicneue/T1ComicNeueAngular-TLF.fd
+++ b/Master/texmf-dist/tex/latex/comicneue/T1ComicNeueAngular-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2015/07/03
+%% Generated by autoinst on 2020/04/26
%%
\ProvidesFile{T1ComicNeueAngular-TLF.fd}
- [2015/07/03 (autoinst) Font definitions for T1/ComicNeueAngular-TLF.]
+ [2020/04/26 (autoinst) Font definitions for T1/ComicNeueAngular-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 ComicNeueAngular@scale\endcsname\relax
\let\ComicNeueAngular@@scale\@empty
@@ -11,44 +19,97 @@
\DeclareFontFamily{T1}{ComicNeueAngular-TLF}{}
-\DeclareFontShape{T1}{ComicNeueAngular-TLF}{m}{sl}{
- <-> \ComicNeueAngular@@scale ComicNeueAngular-Oblique-tlf-t1
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{ComicNeueAngular-TLF}{bold}{n}{
+ <-> \ComicNeueAngular@@scale ComicNeueAngular-Bold-tlf-t1
}{}
-\DeclareFontShape{T1}{ComicNeueAngular-TLF}{m}{n}{
- <-> \ComicNeueAngular@@scale ComicNeueAngular-tlf-t1
+\DeclareFontShape{T1}{ComicNeueAngular-TLF}{bold}{it}{
+ <-> \ComicNeueAngular@@scale ComicNeueAngular-BoldItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{ComicNeueAngular-TLF}{m}{it}{
- <-> ssub * ComicNeueAngular-TLF/m/sl
+\DeclareFontShape{T1}{ComicNeueAngular-TLF}{bold}{sl}{
+ <-> ssub * ComicNeueAngular-TLF/bold/it
}{}
-\DeclareFontShape{T1}{ComicNeueAngular-TLF}{b}{sl}{
- <-> \ComicNeueAngular@@scale ComicNeueAngular-BoldOblique-tlf-t1
+
+% ---- light ----
+
+\DeclareFontShape{T1}{ComicNeueAngular-TLF}{light}{n}{
+ <-> \ComicNeueAngular@@scale ComicNeueAngular-Light-tlf-t1
}{}
-\DeclareFontShape{T1}{ComicNeueAngular-TLF}{b}{n}{
- <-> \ComicNeueAngular@@scale ComicNeueAngular-Bold-tlf-t1
+\DeclareFontShape{T1}{ComicNeueAngular-TLF}{light}{it}{
+ <-> \ComicNeueAngular@@scale ComicNeueAngular-LightItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{ComicNeueAngular-TLF}{b}{it}{
- <-> ssub * ComicNeueAngular-TLF/b/sl
+\DeclareFontShape{T1}{ComicNeueAngular-TLF}{light}{sl}{
+ <-> ssub * ComicNeueAngular-TLF/light/it
+}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{T1}{ComicNeueAngular-TLF}{regular}{it}{
+ <-> \ComicNeueAngular@@scale ComicNeueAngular-Italic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{ComicNeueAngular-TLF}{regular}{n}{
+ <-> \ComicNeueAngular@@scale ComicNeueAngular-Regular-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{ComicNeueAngular-TLF}{regular}{sl}{
+ <-> ssub * ComicNeueAngular-TLF/regular/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% l --> light
+
+\DeclareFontShape{T1}{ComicNeueAngular-TLF}{l}{it}{
+ <-> alias * ComicNeueAngular-TLF/light/it
}{}
\DeclareFontShape{T1}{ComicNeueAngular-TLF}{l}{n}{
- <-> \ComicNeueAngular@@scale ComicNeueAngular-Light-tlf-t1
+ <-> alias * ComicNeueAngular-TLF/light/n
}{}
\DeclareFontShape{T1}{ComicNeueAngular-TLF}{l}{sl}{
- <-> \ComicNeueAngular@@scale ComicNeueAngular-LightOblique-tlf-t1
+ <-> alias * ComicNeueAngular-TLF/light/sl
}{}
-\DeclareFontShape{T1}{ComicNeueAngular-TLF}{l}{it}{
- <-> ssub * ComicNeueAngular-TLF/l/sl
+
+% m --> regular
+
+\DeclareFontShape{T1}{ComicNeueAngular-TLF}{m}{sl}{
+ <-> alias * ComicNeueAngular-TLF/regular/sl
}{}
-\DeclareFontShape{T1}{ComicNeueAngular-TLF}{bx}{it}{
- <-> ssub * ComicNeueAngular-TLF/b/it
+\DeclareFontShape{T1}{ComicNeueAngular-TLF}{m}{n}{
+ <-> alias * ComicNeueAngular-TLF/regular/n
+}{}
+
+\DeclareFontShape{T1}{ComicNeueAngular-TLF}{m}{it}{
+ <-> alias * ComicNeueAngular-TLF/regular/it
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{T1}{ComicNeueAngular-TLF}{b}{sl}{
+ <-> alias * ComicNeueAngular-TLF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{ComicNeueAngular-TLF}{b}{it}{
+ <-> alias * ComicNeueAngular-TLF/bold/it
+}{}
+
+\DeclareFontShape{T1}{ComicNeueAngular-TLF}{b}{n}{
+ <-> alias * ComicNeueAngular-TLF/bold/n
}{}
\DeclareFontShape{T1}{ComicNeueAngular-TLF}{bx}{sl}{
@@ -59,4 +120,8 @@
<-> ssub * ComicNeueAngular-TLF/b/n
}{}
+\DeclareFontShape{T1}{ComicNeueAngular-TLF}{bx}{it}{
+ <-> ssub * ComicNeueAngular-TLF/b/it
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/comicneue/TS1ComicNeue-TLF.fd b/Master/texmf-dist/tex/latex/comicneue/TS1ComicNeue-TLF.fd
index 32eb9a23b3e..d7bb6246b4f 100644
--- a/Master/texmf-dist/tex/latex/comicneue/TS1ComicNeue-TLF.fd
+++ b/Master/texmf-dist/tex/latex/comicneue/TS1ComicNeue-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2015/07/03
+%% Generated by autoinst on 2020/04/26
%%
\ProvidesFile{TS1ComicNeue-TLF.fd}
- [2015/07/03 (autoinst) Font definitions for TS1/ComicNeue-TLF.]
+ [2020/04/26 (autoinst) Font definitions for TS1/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,44 +19,97 @@
\DeclareFontFamily{TS1}{ComicNeue-TLF}{}
+
+% ---- light ----
+
+\DeclareFontShape{TS1}{ComicNeue-TLF}{light}{n}{
+ <-> \ComicNeue@@scale ComicNeue-Light-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{ComicNeue-TLF}{light}{it}{
+ <-> \ComicNeue@@scale ComicNeue-LightItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{ComicNeue-TLF}{light}{sl}{
+ <-> ssub * ComicNeue-TLF/light/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{TS1}{ComicNeue-TLF}{bold}{n}{
+ <-> \ComicNeue@@scale ComicNeue-Bold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{ComicNeue-TLF}{bold}{it}{
+ <-> \ComicNeue@@scale ComicNeue-BoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{ComicNeue-TLF}{bold}{sl}{
+ <-> ssub * ComicNeue-TLF/bold/it
+}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{TS1}{ComicNeue-TLF}{regular}{it}{
+ <-> \ComicNeue@@scale ComicNeue-Italic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{ComicNeue-TLF}{regular}{n}{
+ <-> \ComicNeue@@scale ComicNeue-Regular-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{ComicNeue-TLF}{regular}{sl}{
+ <-> ssub * ComicNeue-TLF/regular/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% l --> light
+
\DeclareFontShape{TS1}{ComicNeue-TLF}{l}{sl}{
- <-> \ComicNeue@@scale ComicNeue-LightOblique-tlf-ts1
+ <-> alias * ComicNeue-TLF/light/sl
}{}
\DeclareFontShape{TS1}{ComicNeue-TLF}{l}{n}{
- <-> \ComicNeue@@scale ComicNeue-Light-tlf-ts1
+ <-> alias * ComicNeue-TLF/light/n
}{}
\DeclareFontShape{TS1}{ComicNeue-TLF}{l}{it}{
- <-> ssub * ComicNeue-TLF/l/sl
+ <-> alias * ComicNeue-TLF/light/it
}{}
-\DeclareFontShape{TS1}{ComicNeue-TLF}{m}{sl}{
- <-> \ComicNeue@@scale ComicNeue-Oblique-tlf-ts1
+
+% m --> regular
+
+\DeclareFontShape{TS1}{ComicNeue-TLF}{m}{it}{
+ <-> alias * ComicNeue-TLF/regular/it
}{}
\DeclareFontShape{TS1}{ComicNeue-TLF}{m}{n}{
- <-> \ComicNeue@@scale ComicNeue-tlf-ts1
+ <-> alias * ComicNeue-TLF/regular/n
}{}
-\DeclareFontShape{TS1}{ComicNeue-TLF}{m}{it}{
- <-> ssub * ComicNeue-TLF/m/sl
+\DeclareFontShape{TS1}{ComicNeue-TLF}{m}{sl}{
+ <-> alias * ComicNeue-TLF/regular/sl
}{}
-\DeclareFontShape{TS1}{ComicNeue-TLF}{b}{sl}{
- <-> \ComicNeue@@scale ComicNeue-BoldOblique-tlf-ts1
-}{}
-\DeclareFontShape{TS1}{ComicNeue-TLF}{b}{n}{
- <-> \ComicNeue@@scale ComicNeue-Bold-tlf-ts1
+% b --> bold
+
+\DeclareFontShape{TS1}{ComicNeue-TLF}{b}{sl}{
+ <-> alias * ComicNeue-TLF/bold/sl
}{}
\DeclareFontShape{TS1}{ComicNeue-TLF}{b}{it}{
- <-> ssub * ComicNeue-TLF/b/sl
+ <-> alias * ComicNeue-TLF/bold/it
}{}
-\DeclareFontShape{TS1}{ComicNeue-TLF}{bx}{it}{
- <-> ssub * ComicNeue-TLF/b/it
+\DeclareFontShape{TS1}{ComicNeue-TLF}{b}{n}{
+ <-> alias * ComicNeue-TLF/bold/n
}{}
\DeclareFontShape{TS1}{ComicNeue-TLF}{bx}{sl}{
@@ -59,4 +120,8 @@
<-> ssub * ComicNeue-TLF/b/n
}{}
+\DeclareFontShape{TS1}{ComicNeue-TLF}{bx}{it}{
+ <-> ssub * ComicNeue-TLF/b/it
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/comicneue/TS1ComicNeueAngular-TLF.fd b/Master/texmf-dist/tex/latex/comicneue/TS1ComicNeueAngular-TLF.fd
index f2ff1bc5059..cf7de1b0371 100644
--- a/Master/texmf-dist/tex/latex/comicneue/TS1ComicNeueAngular-TLF.fd
+++ b/Master/texmf-dist/tex/latex/comicneue/TS1ComicNeueAngular-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2015/07/03
+%% Generated by autoinst on 2020/04/26
%%
\ProvidesFile{TS1ComicNeueAngular-TLF.fd}
- [2015/07/03 (autoinst) Font definitions for TS1/ComicNeueAngular-TLF.]
+ [2020/04/26 (autoinst) Font definitions for TS1/ComicNeueAngular-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 ComicNeueAngular@scale\endcsname\relax
\let\ComicNeueAngular@@scale\@empty
@@ -11,52 +19,109 @@
\DeclareFontFamily{TS1}{ComicNeueAngular-TLF}{}
-\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{l}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{bold}{it}{
+ <-> \ComicNeueAngular@@scale ComicNeueAngular-BoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{bold}{n}{
+ <-> \ComicNeueAngular@@scale ComicNeueAngular-Bold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{bold}{sl}{
+ <-> ssub * ComicNeueAngular-TLF/bold/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{light}{n}{
<-> \ComicNeueAngular@@scale ComicNeueAngular-Light-tlf-ts1
}{}
+\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{light}{it}{
+ <-> \ComicNeueAngular@@scale ComicNeueAngular-LightItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{light}{sl}{
+ <-> ssub * ComicNeueAngular-TLF/light/it
+}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{regular}{it}{
+ <-> \ComicNeueAngular@@scale ComicNeueAngular-Italic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{regular}{n}{
+ <-> \ComicNeueAngular@@scale ComicNeueAngular-Regular-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{regular}{sl}{
+ <-> ssub * ComicNeueAngular-TLF/regular/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% l --> light
+
\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{l}{sl}{
- <-> \ComicNeueAngular@@scale ComicNeueAngular-LightOblique-tlf-ts1
+ <-> alias * ComicNeueAngular-TLF/light/sl
}{}
-\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{l}{it}{
- <-> ssub * ComicNeueAngular-TLF/l/sl
+\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{l}{n}{
+ <-> alias * ComicNeueAngular-TLF/light/n
}{}
-\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{m}{sl}{
- <-> \ComicNeueAngular@@scale ComicNeueAngular-Oblique-tlf-ts1
+\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{l}{it}{
+ <-> alias * ComicNeueAngular-TLF/light/it
}{}
+
+% m --> regular
+
\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{m}{n}{
- <-> \ComicNeueAngular@@scale ComicNeueAngular-tlf-ts1
+ <-> alias * ComicNeueAngular-TLF/regular/n
}{}
\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{m}{it}{
- <-> ssub * ComicNeueAngular-TLF/m/sl
+ <-> alias * ComicNeueAngular-TLF/regular/it
}{}
-\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{b}{n}{
- <-> \ComicNeueAngular@@scale ComicNeueAngular-Bold-tlf-ts1
+\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{m}{sl}{
+ <-> alias * ComicNeueAngular-TLF/regular/sl
}{}
-\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{b}{sl}{
- <-> \ComicNeueAngular@@scale ComicNeueAngular-BoldOblique-tlf-ts1
-}{}
+
+% b --> bold
\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{b}{it}{
- <-> ssub * ComicNeueAngular-TLF/b/sl
+ <-> alias * ComicNeueAngular-TLF/bold/it
}{}
-\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{bx}{sl}{
- <-> ssub * ComicNeueAngular-TLF/b/sl
+\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{b}{n}{
+ <-> alias * ComicNeueAngular-TLF/bold/n
}{}
-\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{bx}{n}{
- <-> ssub * ComicNeueAngular-TLF/b/n
+\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{b}{sl}{
+ <-> alias * ComicNeueAngular-TLF/bold/sl
}{}
\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{bx}{it}{
<-> ssub * ComicNeueAngular-TLF/b/it
}{}
+\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{bx}{n}{
+ <-> ssub * ComicNeueAngular-TLF/b/n
+}{}
+
+\DeclareFontShape{TS1}{ComicNeueAngular-TLF}{bx}{sl}{
+ <-> ssub * ComicNeueAngular-TLF/b/sl
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/comicneue/comicneue.sty b/Master/texmf-dist/tex/latex/comicneue/comicneue.sty
index f521c8fb1be..8dc31ca995c 100644
--- a/Master/texmf-dist/tex/latex/comicneue/comicneue.sty
+++ b/Master/texmf-dist/tex/latex/comicneue/comicneue.sty
@@ -10,8 +10,8 @@
\RequirePackage{ l3keys2e, xparse }
\ProvidesExplClass
{comicneue}
- {2017/01/03}
- {1.1}
+ {2020/04/26}
+ {1.2}
{Craig Rozynski's Comic Neue fonts}
\sys_if_engine_pdftex:F{ \bool_set_true:N \comicneue_otf }
@@ -44,42 +44,42 @@
{ \tl_set:Nn \comicneue_regstyle {Regular} }
\bool_if:NTF \comicneue_angular
- { \tl_set:Nn \comicneue_style {-Angular} }
+ { \tl_set:Nn \comicneue_style {Angular} }
{ \tl_set:Nn \comicneue_style {} }
\defaultfontfeatures {
Ligatures = TeX,
Scale = \comicneue_scale,
Extension = .otf,
- BoldFont = *_Bold,
- BoldItalicFont = *_Bold_Oblique }
+ BoldFont = *-Bold,
+ BoldItalicFont = *-BoldItalic }
\bool_if:NT \comicneue_sfdefault {
\setsansfont
- [ UprightFont = *_\comicneue_regstyle,
- ItalicFont = *_\comicneue_regstyle _Oblique ]
+ [ UprightFont = *-\comicneue_regstyle,
+ ItalicFont = *-\comicneue_regstyle Italic ]
{ComicNeue\comicneue_style}
}
\newfontfamily \comicneue
- [ UprightFont = *_Regular,
- ItalicFont = *_Regular_Oblique ]
+ [ UprightFont = *-Regular,
+ ItalicFont = *-RegularItalic ]
{ComicNeue}
\newfontfamily \comicneuelight
- [ UprightFont = *_Light,
- ItalicFont = *_Light_Oblique ]
+ [ UprightFont = *-Light,
+ ItalicFont = *-LightItalic ]
{ComicNeue}
\newfontfamily \comicneueangular
- [ UprightFont = *_Regular,
- ItalicFont = *_Regular_Oblique ]
- {ComicNeue-Angular}
+ [ UprightFont = *-Regular,
+ ItalicFont = *-RegularItalic ]
+ {ComicNeueAngular}
\newfontfamily \comicneueangularlight
- [ UprightFont = *_Light,
- ItalicFont = *_Light_Oblique ]
- {ComicNeue-Angular}
+ [ UprightFont = *-Light,
+ ItalicFont = *-LightItalic ]
+ {ComicNeueAngular}
\defaultfontfeatures{}
}{