From 95d5657ad19f20d47fa609a8539b36088be56ce2 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 20 Dec 2021 03:02:44 +0000 Subject: CTAN sync 202112200302 --- fonts/etbb/tex/LY1ETbb-Dnom.fd | 68 ++++++++++++++++++--------------------- fonts/etbb/tex/LY1ETbb-Inf.fd | 72 +++++++++++++++++++----------------------- fonts/etbb/tex/LY1ETbb-Sup.fd | 70 +++++++++++++++++++--------------------- fonts/etbb/tex/OT1ETbb-Dnom.fd | 72 +++++++++++++++++++----------------------- fonts/etbb/tex/OT1ETbb-Inf.fd | 68 ++++++++++++++++++--------------------- fonts/etbb/tex/OT1ETbb-Sup.fd | 72 +++++++++++++++++++----------------------- fonts/etbb/tex/T1ETbb-Dnom.fd | 64 +++++++++++++++++-------------------- fonts/etbb/tex/T1ETbb-Inf.fd | 64 +++++++++++++++++-------------------- fonts/etbb/tex/T1ETbb-Sup.fd | 70 +++++++++++++++++++--------------------- fonts/etbb/tex/TS1ETbb-LF.fd | 72 +++++++++++++++++++----------------------- fonts/etbb/tex/TS1ETbb-OsF.fd | 72 +++++++++++++++++++----------------------- fonts/etbb/tex/TS1ETbb-TLF.fd | 70 +++++++++++++++++++--------------------- fonts/etbb/tex/TS1ETbb-TOsF.fd | 72 +++++++++++++++++++----------------------- 13 files changed, 414 insertions(+), 492 deletions(-) (limited to 'fonts/etbb/tex') diff --git a/fonts/etbb/tex/LY1ETbb-Dnom.fd b/fonts/etbb/tex/LY1ETbb-Dnom.fd index 4924d3a55a..448ecacaf3 100644 --- a/fonts/etbb/tex/LY1ETbb-Dnom.fd +++ b/fonts/etbb/tex/LY1ETbb-Dnom.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/07/01 +%% Generated by autoinst on 2021/12/18 %% \ProvidesFile{LY1ETbb-Dnom.fd} - [2020/07/01 (autoinst) Font definitions for LY1/ETbb-Dnom.] + [2021/12/18 (autoinst) Font definitions for LY1/ETbb-Dnom.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,71 +20,61 @@ \DeclareFontFamily{LY1}{ETbb-Dnom}{} -% ---- bold ---- +% ---- b = bold ---- -\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-dnom-ly1 +\DeclareFontShape{LY1}{ETbb-Dnom}{b}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-dnom-ly1 }{} \DeclareFontShape{LY1}{ETbb-Dnom}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-dnom-ly1 + <-> alias * ETbb-Dnom/b/it }{} -\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{sl}{ - <-> ssub * ETbb-Dnom/bold/it +\DeclareFontShape{LY1}{ETbb-Dnom}{b}{n}{ + <-> \ETbb@@scale ETbb-Bold-dnom-ly1 }{} - -% ---- regular ---- - -\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-dnom-ly1 +\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{n}{ + <-> alias * ETbb-Dnom/b/n }{} -\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-dnom-ly1 +\DeclareFontShape{LY1}{ETbb-Dnom}{b}{sl}{ + <-> ssub * ETbb-Dnom/b/it }{} -\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{sl}{ - <-> ssub * ETbb-Dnom/regular/it +\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{sl}{ + <-> ssub * ETbb-Dnom/bold/it }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- m = regular ---- \DeclareFontShape{LY1}{ETbb-Dnom}{m}{n}{ - <-> alias * ETbb-Dnom/regular/n + <-> \ETbb@@scale ETbb-Regular-dnom-ly1 }{} -\DeclareFontShape{LY1}{ETbb-Dnom}{m}{sl}{ - <-> alias * ETbb-Dnom/regular/sl +\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{n}{ + <-> alias * ETbb-Dnom/m/n }{} \DeclareFontShape{LY1}{ETbb-Dnom}{m}{it}{ - <-> alias * ETbb-Dnom/regular/it + <-> \ETbb@@scale ETbb-Italic-dnom-ly1 }{} - -% b --> bold - -\DeclareFontShape{LY1}{ETbb-Dnom}{b}{it}{ - <-> alias * ETbb-Dnom/bold/it +\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{it}{ + <-> alias * ETbb-Dnom/m/it }{} -\DeclareFontShape{LY1}{ETbb-Dnom}{b}{sl}{ - <-> alias * ETbb-Dnom/bold/sl +\DeclareFontShape{LY1}{ETbb-Dnom}{m}{sl}{ + <-> ssub * ETbb-Dnom/m/it }{} -\DeclareFontShape{LY1}{ETbb-Dnom}{b}{n}{ - <-> alias * ETbb-Dnom/bold/n +\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{sl}{ + <-> ssub * ETbb-Dnom/regular/it }{} -\DeclareFontShape{LY1}{ETbb-Dnom}{bx}{it}{ - <-> ssub * ETbb-Dnom/b/it -}{} + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- \DeclareFontShape{LY1}{ETbb-Dnom}{bx}{n}{ <-> ssub * ETbb-Dnom/b/n @@ -94,4 +84,8 @@ <-> ssub * ETbb-Dnom/b/sl }{} +\DeclareFontShape{LY1}{ETbb-Dnom}{bx}{it}{ + <-> ssub * ETbb-Dnom/b/it +}{} + \endinput diff --git a/fonts/etbb/tex/LY1ETbb-Inf.fd b/fonts/etbb/tex/LY1ETbb-Inf.fd index e2c933c86d..2aa77b5a9c 100644 --- a/fonts/etbb/tex/LY1ETbb-Inf.fd +++ b/fonts/etbb/tex/LY1ETbb-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/07/01 +%% Generated by autoinst on 2021/12/18 %% \ProvidesFile{LY1ETbb-Inf.fd} - [2020/07/01 (autoinst) Font definitions for LY1/ETbb-Inf.] + [2021/12/18 (autoinst) Font definitions for LY1/ETbb-Inf.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,66 +20,64 @@ \DeclareFontFamily{LY1}{ETbb-Inf}{} -% ---- regular ---- +% ---- m = regular ---- -\DeclareFontShape{LY1}{ETbb-Inf}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-inf-ly1 +\DeclareFontShape{LY1}{ETbb-Inf}{m}{it}{ + <-> \ETbb@@scale ETbb-Italic-inf-ly1 }{} \DeclareFontShape{LY1}{ETbb-Inf}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-inf-ly1 + <-> alias * ETbb-Inf/m/it }{} -\DeclareFontShape{LY1}{ETbb-Inf}{regular}{sl}{ - <-> ssub * ETbb-Inf/regular/it +\DeclareFontShape{LY1}{ETbb-Inf}{m}{n}{ + <-> \ETbb@@scale ETbb-Regular-inf-ly1 }{} - -% ---- bold ---- - -\DeclareFontShape{LY1}{ETbb-Inf}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-inf-ly1 +\DeclareFontShape{LY1}{ETbb-Inf}{regular}{n}{ + <-> alias * ETbb-Inf/m/n }{} -\DeclareFontShape{LY1}{ETbb-Inf}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-inf-ly1 +\DeclareFontShape{LY1}{ETbb-Inf}{m}{sl}{ + <-> ssub * ETbb-Inf/m/it }{} -\DeclareFontShape{LY1}{ETbb-Inf}{bold}{sl}{ - <-> ssub * ETbb-Inf/bold/it +\DeclareFontShape{LY1}{ETbb-Inf}{regular}{sl}{ + <-> ssub * ETbb-Inf/regular/it }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- b = bold ---- -\DeclareFontShape{LY1}{ETbb-Inf}{m}{it}{ - <-> alias * ETbb-Inf/regular/it +\DeclareFontShape{LY1}{ETbb-Inf}{b}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{ETbb-Inf}{m}{n}{ - <-> alias * ETbb-Inf/regular/n +\DeclareFontShape{LY1}{ETbb-Inf}{bold}{it}{ + <-> alias * ETbb-Inf/b/it }{} -\DeclareFontShape{LY1}{ETbb-Inf}{m}{sl}{ - <-> alias * ETbb-Inf/regular/sl +\DeclareFontShape{LY1}{ETbb-Inf}{b}{n}{ + <-> \ETbb@@scale ETbb-Bold-inf-ly1 }{} +\DeclareFontShape{LY1}{ETbb-Inf}{bold}{n}{ + <-> alias * ETbb-Inf/b/n +}{} -% b --> bold - -\DeclareFontShape{LY1}{ETbb-Inf}{b}{it}{ - <-> alias * ETbb-Inf/bold/it +\DeclareFontShape{LY1}{ETbb-Inf}{b}{sl}{ + <-> ssub * ETbb-Inf/b/it }{} -\DeclareFontShape{LY1}{ETbb-Inf}{b}{n}{ - <-> alias * ETbb-Inf/bold/n +\DeclareFontShape{LY1}{ETbb-Inf}{bold}{sl}{ + <-> ssub * ETbb-Inf/bold/it }{} -\DeclareFontShape{LY1}{ETbb-Inf}{b}{sl}{ - <-> alias * ETbb-Inf/bold/sl + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{LY1}{ETbb-Inf}{bx}{it}{ + <-> ssub * ETbb-Inf/b/it }{} \DeclareFontShape{LY1}{ETbb-Inf}{bx}{n}{ @@ -90,8 +88,4 @@ <-> ssub * ETbb-Inf/b/sl }{} -\DeclareFontShape{LY1}{ETbb-Inf}{bx}{it}{ - <-> ssub * ETbb-Inf/b/it -}{} - \endinput diff --git a/fonts/etbb/tex/LY1ETbb-Sup.fd b/fonts/etbb/tex/LY1ETbb-Sup.fd index ba3f657a21..c00872dbd3 100644 --- a/fonts/etbb/tex/LY1ETbb-Sup.fd +++ b/fonts/etbb/tex/LY1ETbb-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/07/01 +%% Generated by autoinst on 2021/12/18 %% \ProvidesFile{LY1ETbb-Sup.fd} - [2020/07/01 (autoinst) Font definitions for LY1/ETbb-Sup.] + [2021/12/18 (autoinst) Font definitions for LY1/ETbb-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,71 +20,61 @@ \DeclareFontFamily{LY1}{ETbb-Sup}{} -% ---- regular ---- +% ---- m = regular ---- -\DeclareFontShape{LY1}{ETbb-Sup}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-sup-ly1 +\DeclareFontShape{LY1}{ETbb-Sup}{m}{n}{ + <-> \ETbb@@scale ETbb-Regular-sup-ly1 }{} \DeclareFontShape{LY1}{ETbb-Sup}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-sup-ly1 + <-> alias * ETbb-Sup/m/n }{} -\DeclareFontShape{LY1}{ETbb-Sup}{regular}{sl}{ - <-> ssub * ETbb-Sup/regular/it +\DeclareFontShape{LY1}{ETbb-Sup}{m}{it}{ + <-> \ETbb@@scale ETbb-Italic-sup-ly1 }{} - -% ---- bold ---- - -\DeclareFontShape{LY1}{ETbb-Sup}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-sup-ly1 +\DeclareFontShape{LY1}{ETbb-Sup}{regular}{it}{ + <-> alias * ETbb-Sup/m/it }{} -\DeclareFontShape{LY1}{ETbb-Sup}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-sup-ly1 +\DeclareFontShape{LY1}{ETbb-Sup}{m}{sl}{ + <-> ssub * ETbb-Sup/m/it }{} -\DeclareFontShape{LY1}{ETbb-Sup}{bold}{sl}{ - <-> ssub * ETbb-Sup/bold/it +\DeclareFontShape{LY1}{ETbb-Sup}{regular}{sl}{ + <-> ssub * ETbb-Sup/regular/it }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- b = bold ---- -\DeclareFontShape{LY1}{ETbb-Sup}{m}{sl}{ - <-> alias * ETbb-Sup/regular/sl +\DeclareFontShape{LY1}{ETbb-Sup}{b}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{ETbb-Sup}{m}{n}{ - <-> alias * ETbb-Sup/regular/n +\DeclareFontShape{LY1}{ETbb-Sup}{bold}{it}{ + <-> alias * ETbb-Sup/b/it }{} -\DeclareFontShape{LY1}{ETbb-Sup}{m}{it}{ - <-> alias * ETbb-Sup/regular/it +\DeclareFontShape{LY1}{ETbb-Sup}{b}{n}{ + <-> \ETbb@@scale ETbb-Bold-sup-ly1 }{} - -% b --> bold +\DeclareFontShape{LY1}{ETbb-Sup}{bold}{n}{ + <-> alias * ETbb-Sup/b/n +}{} \DeclareFontShape{LY1}{ETbb-Sup}{b}{sl}{ - <-> alias * ETbb-Sup/bold/sl + <-> ssub * ETbb-Sup/b/it }{} -\DeclareFontShape{LY1}{ETbb-Sup}{b}{n}{ - <-> alias * ETbb-Sup/bold/n +\DeclareFontShape{LY1}{ETbb-Sup}{bold}{sl}{ + <-> ssub * ETbb-Sup/bold/it }{} -\DeclareFontShape{LY1}{ETbb-Sup}{b}{it}{ - <-> alias * ETbb-Sup/bold/it -}{} -\DeclareFontShape{LY1}{ETbb-Sup}{bx}{it}{ - <-> ssub * ETbb-Sup/b/it -}{} +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- \DeclareFontShape{LY1}{ETbb-Sup}{bx}{n}{ <-> ssub * ETbb-Sup/b/n @@ -94,4 +84,8 @@ <-> ssub * ETbb-Sup/b/sl }{} +\DeclareFontShape{LY1}{ETbb-Sup}{bx}{it}{ + <-> ssub * ETbb-Sup/b/it +}{} + \endinput diff --git a/fonts/etbb/tex/OT1ETbb-Dnom.fd b/fonts/etbb/tex/OT1ETbb-Dnom.fd index 5638d234ec..47e1d8bf61 100644 --- a/fonts/etbb/tex/OT1ETbb-Dnom.fd +++ b/fonts/etbb/tex/OT1ETbb-Dnom.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/07/01 +%% Generated by autoinst on 2021/12/18 %% \ProvidesFile{OT1ETbb-Dnom.fd} - [2020/07/01 (autoinst) Font definitions for OT1/ETbb-Dnom.] + [2021/12/18 (autoinst) Font definitions for OT1/ETbb-Dnom.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,66 +20,64 @@ \DeclareFontFamily{OT1}{ETbb-Dnom}{} -% ---- regular ---- +% ---- b = bold ---- -\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-dnom-ot1 +\DeclareFontShape{OT1}{ETbb-Dnom}{b}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-dnom-ot1 }{} -\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-dnom-ot1 +\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{it}{ + <-> alias * ETbb-Dnom/b/it }{} -\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{sl}{ - <-> ssub * ETbb-Dnom/regular/it +\DeclareFontShape{OT1}{ETbb-Dnom}{b}{n}{ + <-> \ETbb@@scale ETbb-Bold-dnom-ot1 }{} - -% ---- bold ---- - -\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-dnom-ot1 +\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{n}{ + <-> alias * ETbb-Dnom/b/n }{} -\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-dnom-ot1 +\DeclareFontShape{OT1}{ETbb-Dnom}{b}{sl}{ + <-> ssub * ETbb-Dnom/b/it }{} \DeclareFontShape{OT1}{ETbb-Dnom}{bold}{sl}{ - <-> ssub * ETbb-Dnom/bold/it + <-> ssub * ETbb-Dnom/bold/it }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- m = regular ---- -\DeclareFontShape{OT1}{ETbb-Dnom}{m}{it}{ - <-> alias * ETbb-Dnom/regular/it +\DeclareFontShape{OT1}{ETbb-Dnom}{m}{n}{ + <-> \ETbb@@scale ETbb-Regular-dnom-ot1 }{} -\DeclareFontShape{OT1}{ETbb-Dnom}{m}{sl}{ - <-> alias * ETbb-Dnom/regular/sl +\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{n}{ + <-> alias * ETbb-Dnom/m/n }{} -\DeclareFontShape{OT1}{ETbb-Dnom}{m}{n}{ - <-> alias * ETbb-Dnom/regular/n +\DeclareFontShape{OT1}{ETbb-Dnom}{m}{it}{ + <-> \ETbb@@scale ETbb-Italic-dnom-ot1 }{} +\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{it}{ + <-> alias * ETbb-Dnom/m/it +}{} -% b --> bold - -\DeclareFontShape{OT1}{ETbb-Dnom}{b}{it}{ - <-> alias * ETbb-Dnom/bold/it +\DeclareFontShape{OT1}{ETbb-Dnom}{m}{sl}{ + <-> ssub * ETbb-Dnom/m/it }{} -\DeclareFontShape{OT1}{ETbb-Dnom}{b}{n}{ - <-> alias * ETbb-Dnom/bold/n +\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{sl}{ + <-> ssub * ETbb-Dnom/regular/it }{} -\DeclareFontShape{OT1}{ETbb-Dnom}{b}{sl}{ - <-> alias * ETbb-Dnom/bold/sl + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{OT1}{ETbb-Dnom}{bx}{it}{ + <-> ssub * ETbb-Dnom/b/it }{} \DeclareFontShape{OT1}{ETbb-Dnom}{bx}{n}{ @@ -90,8 +88,4 @@ <-> ssub * ETbb-Dnom/b/sl }{} -\DeclareFontShape{OT1}{ETbb-Dnom}{bx}{it}{ - <-> ssub * ETbb-Dnom/b/it -}{} - \endinput diff --git a/fonts/etbb/tex/OT1ETbb-Inf.fd b/fonts/etbb/tex/OT1ETbb-Inf.fd index d521370a34..9cb1a65d3d 100644 --- a/fonts/etbb/tex/OT1ETbb-Inf.fd +++ b/fonts/etbb/tex/OT1ETbb-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/07/01 +%% Generated by autoinst on 2021/12/18 %% \ProvidesFile{OT1ETbb-Inf.fd} - [2020/07/01 (autoinst) Font definitions for OT1/ETbb-Inf.] + [2021/12/18 (autoinst) Font definitions for OT1/ETbb-Inf.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,72 +20,62 @@ \DeclareFontFamily{OT1}{ETbb-Inf}{} -% ---- bold ---- +% ---- m = regular ---- -\DeclareFontShape{OT1}{ETbb-Inf}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-inf-ot1 +\DeclareFontShape{OT1}{ETbb-Inf}{m}{n}{ + <-> \ETbb@@scale ETbb-Regular-inf-ot1 }{} -\DeclareFontShape{OT1}{ETbb-Inf}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-inf-ot1 +\DeclareFontShape{OT1}{ETbb-Inf}{regular}{n}{ + <-> alias * ETbb-Inf/m/n }{} -\DeclareFontShape{OT1}{ETbb-Inf}{bold}{sl}{ - <-> ssub * ETbb-Inf/bold/it +\DeclareFontShape{OT1}{ETbb-Inf}{m}{it}{ + <-> \ETbb@@scale ETbb-Italic-inf-ot1 }{} - -% ---- regular ---- - \DeclareFontShape{OT1}{ETbb-Inf}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-inf-ot1 + <-> alias * ETbb-Inf/m/it }{} -\DeclareFontShape{OT1}{ETbb-Inf}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-inf-ot1 +\DeclareFontShape{OT1}{ETbb-Inf}{m}{sl}{ + <-> ssub * ETbb-Inf/m/it }{} \DeclareFontShape{OT1}{ETbb-Inf}{regular}{sl}{ - <-> ssub * ETbb-Inf/regular/it + <-> ssub * ETbb-Inf/regular/it }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% - -% m --> regular -\DeclareFontShape{OT1}{ETbb-Inf}{m}{sl}{ - <-> alias * ETbb-Inf/regular/sl -}{} +% ---- b = bold ---- -\DeclareFontShape{OT1}{ETbb-Inf}{m}{n}{ - <-> alias * ETbb-Inf/regular/n +\DeclareFontShape{OT1}{ETbb-Inf}{b}{n}{ + <-> \ETbb@@scale ETbb-Bold-inf-ot1 }{} -\DeclareFontShape{OT1}{ETbb-Inf}{m}{it}{ - <-> alias * ETbb-Inf/regular/it +\DeclareFontShape{OT1}{ETbb-Inf}{bold}{n}{ + <-> alias * ETbb-Inf/b/n }{} - -% b --> bold - \DeclareFontShape{OT1}{ETbb-Inf}{b}{it}{ - <-> alias * ETbb-Inf/bold/it + <-> \ETbb@@scale ETbb-BoldItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{ETbb-Inf}{b}{n}{ - <-> alias * ETbb-Inf/bold/n +\DeclareFontShape{OT1}{ETbb-Inf}{bold}{it}{ + <-> alias * ETbb-Inf/b/it }{} \DeclareFontShape{OT1}{ETbb-Inf}{b}{sl}{ - <-> alias * ETbb-Inf/bold/sl + <-> ssub * ETbb-Inf/b/it }{} -\DeclareFontShape{OT1}{ETbb-Inf}{bx}{it}{ - <-> ssub * ETbb-Inf/b/it +\DeclareFontShape{OT1}{ETbb-Inf}{bold}{sl}{ + <-> ssub * ETbb-Inf/bold/it }{} + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + \DeclareFontShape{OT1}{ETbb-Inf}{bx}{sl}{ <-> ssub * ETbb-Inf/b/sl }{} @@ -94,4 +84,8 @@ <-> ssub * ETbb-Inf/b/n }{} +\DeclareFontShape{OT1}{ETbb-Inf}{bx}{it}{ + <-> ssub * ETbb-Inf/b/it +}{} + \endinput diff --git a/fonts/etbb/tex/OT1ETbb-Sup.fd b/fonts/etbb/tex/OT1ETbb-Sup.fd index f3e90c2142..eaad6bbc2a 100644 --- a/fonts/etbb/tex/OT1ETbb-Sup.fd +++ b/fonts/etbb/tex/OT1ETbb-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/07/01 +%% Generated by autoinst on 2021/12/18 %% \ProvidesFile{OT1ETbb-Sup.fd} - [2020/07/01 (autoinst) Font definitions for OT1/ETbb-Sup.] + [2021/12/18 (autoinst) Font definitions for OT1/ETbb-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,66 +20,64 @@ \DeclareFontFamily{OT1}{ETbb-Sup}{} -% ---- regular ---- +% ---- m = regular ---- -\DeclareFontShape{OT1}{ETbb-Sup}{regular}{it}{ +\DeclareFontShape{OT1}{ETbb-Sup}{m}{it}{ <-> \ETbb@@scale ETbb-Italic-sup-ot1 }{} -\DeclareFontShape{OT1}{ETbb-Sup}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-sup-ot1 +\DeclareFontShape{OT1}{ETbb-Sup}{regular}{it}{ + <-> alias * ETbb-Sup/m/it }{} -\DeclareFontShape{OT1}{ETbb-Sup}{regular}{sl}{ - <-> ssub * ETbb-Sup/regular/it +\DeclareFontShape{OT1}{ETbb-Sup}{m}{n}{ + <-> \ETbb@@scale ETbb-Regular-sup-ot1 }{} - -% ---- bold ---- - -\DeclareFontShape{OT1}{ETbb-Sup}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-sup-ot1 +\DeclareFontShape{OT1}{ETbb-Sup}{regular}{n}{ + <-> alias * ETbb-Sup/m/n }{} -\DeclareFontShape{OT1}{ETbb-Sup}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-sup-ot1 +\DeclareFontShape{OT1}{ETbb-Sup}{m}{sl}{ + <-> ssub * ETbb-Sup/m/it }{} -\DeclareFontShape{OT1}{ETbb-Sup}{bold}{sl}{ - <-> ssub * ETbb-Sup/bold/it +\DeclareFontShape{OT1}{ETbb-Sup}{regular}{sl}{ + <-> ssub * ETbb-Sup/regular/it }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- b = bold ---- -\DeclareFontShape{OT1}{ETbb-Sup}{m}{n}{ - <-> alias * ETbb-Sup/regular/n +\DeclareFontShape{OT1}{ETbb-Sup}{b}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{ETbb-Sup}{m}{sl}{ - <-> alias * ETbb-Sup/regular/sl +\DeclareFontShape{OT1}{ETbb-Sup}{bold}{it}{ + <-> alias * ETbb-Sup/b/it }{} -\DeclareFontShape{OT1}{ETbb-Sup}{m}{it}{ - <-> alias * ETbb-Sup/regular/it +\DeclareFontShape{OT1}{ETbb-Sup}{b}{n}{ + <-> \ETbb@@scale ETbb-Bold-sup-ot1 }{} +\DeclareFontShape{OT1}{ETbb-Sup}{bold}{n}{ + <-> alias * ETbb-Sup/b/n +}{} -% b --> bold - -\DeclareFontShape{OT1}{ETbb-Sup}{b}{it}{ - <-> alias * ETbb-Sup/bold/it +\DeclareFontShape{OT1}{ETbb-Sup}{b}{sl}{ + <-> ssub * ETbb-Sup/b/it }{} -\DeclareFontShape{OT1}{ETbb-Sup}{b}{n}{ - <-> alias * ETbb-Sup/bold/n +\DeclareFontShape{OT1}{ETbb-Sup}{bold}{sl}{ + <-> ssub * ETbb-Sup/bold/it }{} -\DeclareFontShape{OT1}{ETbb-Sup}{b}{sl}{ - <-> alias * ETbb-Sup/bold/sl + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{OT1}{ETbb-Sup}{bx}{it}{ + <-> ssub * ETbb-Sup/b/it }{} \DeclareFontShape{OT1}{ETbb-Sup}{bx}{n}{ @@ -90,8 +88,4 @@ <-> ssub * ETbb-Sup/b/sl }{} -\DeclareFontShape{OT1}{ETbb-Sup}{bx}{it}{ - <-> ssub * ETbb-Sup/b/it -}{} - \endinput diff --git a/fonts/etbb/tex/T1ETbb-Dnom.fd b/fonts/etbb/tex/T1ETbb-Dnom.fd index d3c5e75942..4e6cb6ec8b 100644 --- a/fonts/etbb/tex/T1ETbb-Dnom.fd +++ b/fonts/etbb/tex/T1ETbb-Dnom.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/07/01 +%% Generated by autoinst on 2021/12/18 %% \ProvidesFile{T1ETbb-Dnom.fd} - [2020/07/01 (autoinst) Font definitions for T1/ETbb-Dnom.] + [2021/12/18 (autoinst) Font definitions for T1/ETbb-Dnom.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,67 +20,61 @@ \DeclareFontFamily{T1}{ETbb-Dnom}{} -% ---- bold ---- +% ---- m = regular ---- -\DeclareFontShape{T1}{ETbb-Dnom}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-dnom-t1 +\DeclareFontShape{T1}{ETbb-Dnom}{m}{it}{ + <-> \ETbb@@scale ETbb-Italic-dnom-t1 }{} -\DeclareFontShape{T1}{ETbb-Dnom}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-dnom-t1 +\DeclareFontShape{T1}{ETbb-Dnom}{regular}{it}{ + <-> alias * ETbb-Dnom/m/it }{} -\DeclareFontShape{T1}{ETbb-Dnom}{bold}{sl}{ - <-> ssub * ETbb-Dnom/bold/it +\DeclareFontShape{T1}{ETbb-Dnom}{m}{n}{ + <-> \ETbb@@scale ETbb-Regular-dnom-t1 }{} - -% ---- regular ---- - -\DeclareFontShape{T1}{ETbb-Dnom}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-dnom-t1 +\DeclareFontShape{T1}{ETbb-Dnom}{regular}{n}{ + <-> alias * ETbb-Dnom/m/n }{} -\DeclareFontShape{T1}{ETbb-Dnom}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-dnom-t1 +\DeclareFontShape{T1}{ETbb-Dnom}{m}{sl}{ + <-> ssub * ETbb-Dnom/m/it }{} \DeclareFontShape{T1}{ETbb-Dnom}{regular}{sl}{ - <-> ssub * ETbb-Dnom/regular/it + <-> ssub * ETbb-Dnom/regular/it }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- b = bold ---- -\DeclareFontShape{T1}{ETbb-Dnom}{m}{sl}{ - <-> alias * ETbb-Dnom/regular/sl +\DeclareFontShape{T1}{ETbb-Dnom}{b}{n}{ + <-> \ETbb@@scale ETbb-Bold-dnom-t1 }{} -\DeclareFontShape{T1}{ETbb-Dnom}{m}{n}{ - <-> alias * ETbb-Dnom/regular/n +\DeclareFontShape{T1}{ETbb-Dnom}{bold}{n}{ + <-> alias * ETbb-Dnom/b/n }{} -\DeclareFontShape{T1}{ETbb-Dnom}{m}{it}{ - <-> alias * ETbb-Dnom/regular/it +\DeclareFontShape{T1}{ETbb-Dnom}{b}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-dnom-t1 }{} - -% b --> bold +\DeclareFontShape{T1}{ETbb-Dnom}{bold}{it}{ + <-> alias * ETbb-Dnom/b/it +}{} \DeclareFontShape{T1}{ETbb-Dnom}{b}{sl}{ - <-> alias * ETbb-Dnom/bold/sl + <-> ssub * ETbb-Dnom/b/it }{} -\DeclareFontShape{T1}{ETbb-Dnom}{b}{n}{ - <-> alias * ETbb-Dnom/bold/n +\DeclareFontShape{T1}{ETbb-Dnom}{bold}{sl}{ + <-> ssub * ETbb-Dnom/bold/it }{} -\DeclareFontShape{T1}{ETbb-Dnom}{b}{it}{ - <-> alias * ETbb-Dnom/bold/it -}{} + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- \DeclareFontShape{T1}{ETbb-Dnom}{bx}{sl}{ <-> ssub * ETbb-Dnom/b/sl diff --git a/fonts/etbb/tex/T1ETbb-Inf.fd b/fonts/etbb/tex/T1ETbb-Inf.fd index a207ba97ea..4992550b05 100644 --- a/fonts/etbb/tex/T1ETbb-Inf.fd +++ b/fonts/etbb/tex/T1ETbb-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/07/01 +%% Generated by autoinst on 2021/12/18 %% \ProvidesFile{T1ETbb-Inf.fd} - [2020/07/01 (autoinst) Font definitions for T1/ETbb-Inf.] + [2021/12/18 (autoinst) Font definitions for T1/ETbb-Inf.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,68 +20,62 @@ \DeclareFontFamily{T1}{ETbb-Inf}{} -% ---- bold ---- +% ---- b = bold ---- -\DeclareFontShape{T1}{ETbb-Inf}{bold}{it}{ +\DeclareFontShape{T1}{ETbb-Inf}{b}{it}{ <-> \ETbb@@scale ETbb-BoldItalic-inf-t1 }{} -\DeclareFontShape{T1}{ETbb-Inf}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-inf-t1 +\DeclareFontShape{T1}{ETbb-Inf}{bold}{it}{ + <-> alias * ETbb-Inf/b/it }{} -\DeclareFontShape{T1}{ETbb-Inf}{bold}{sl}{ - <-> ssub * ETbb-Inf/bold/it +\DeclareFontShape{T1}{ETbb-Inf}{b}{n}{ + <-> \ETbb@@scale ETbb-Bold-inf-t1 }{} - -% ---- regular ---- - -\DeclareFontShape{T1}{ETbb-Inf}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-inf-t1 +\DeclareFontShape{T1}{ETbb-Inf}{bold}{n}{ + <-> alias * ETbb-Inf/b/n }{} -\DeclareFontShape{T1}{ETbb-Inf}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-inf-t1 +\DeclareFontShape{T1}{ETbb-Inf}{b}{sl}{ + <-> ssub * ETbb-Inf/b/it }{} -\DeclareFontShape{T1}{ETbb-Inf}{regular}{sl}{ - <-> ssub * ETbb-Inf/regular/it +\DeclareFontShape{T1}{ETbb-Inf}{bold}{sl}{ + <-> ssub * ETbb-Inf/bold/it }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- m = regular ---- -\DeclareFontShape{T1}{ETbb-Inf}{m}{sl}{ - <-> alias * ETbb-Inf/regular/sl +\DeclareFontShape{T1}{ETbb-Inf}{m}{n}{ + <-> \ETbb@@scale ETbb-Regular-inf-t1 }{} -\DeclareFontShape{T1}{ETbb-Inf}{m}{n}{ - <-> alias * ETbb-Inf/regular/n +\DeclareFontShape{T1}{ETbb-Inf}{regular}{n}{ + <-> alias * ETbb-Inf/m/n }{} \DeclareFontShape{T1}{ETbb-Inf}{m}{it}{ - <-> alias * ETbb-Inf/regular/it + <-> \ETbb@@scale ETbb-Italic-inf-t1 }{} - -% b --> bold - -\DeclareFontShape{T1}{ETbb-Inf}{b}{n}{ - <-> alias * ETbb-Inf/bold/n +\DeclareFontShape{T1}{ETbb-Inf}{regular}{it}{ + <-> alias * ETbb-Inf/m/it }{} -\DeclareFontShape{T1}{ETbb-Inf}{b}{sl}{ - <-> alias * ETbb-Inf/bold/sl +\DeclareFontShape{T1}{ETbb-Inf}{m}{sl}{ + <-> ssub * ETbb-Inf/m/it }{} -\DeclareFontShape{T1}{ETbb-Inf}{b}{it}{ - <-> alias * ETbb-Inf/bold/it +\DeclareFontShape{T1}{ETbb-Inf}{regular}{sl}{ + <-> ssub * ETbb-Inf/regular/it }{} + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + \DeclareFontShape{T1}{ETbb-Inf}{bx}{it}{ <-> ssub * ETbb-Inf/b/it }{} diff --git a/fonts/etbb/tex/T1ETbb-Sup.fd b/fonts/etbb/tex/T1ETbb-Sup.fd index 378a6ad038..1404d80d0f 100644 --- a/fonts/etbb/tex/T1ETbb-Sup.fd +++ b/fonts/etbb/tex/T1ETbb-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/07/01 +%% Generated by autoinst on 2021/12/18 %% \ProvidesFile{T1ETbb-Sup.fd} - [2020/07/01 (autoinst) Font definitions for T1/ETbb-Sup.] + [2021/12/18 (autoinst) Font definitions for T1/ETbb-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,78 +20,72 @@ \DeclareFontFamily{T1}{ETbb-Sup}{} -% ---- regular ---- +% ---- b = bold ---- -\DeclareFontShape{T1}{ETbb-Sup}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-sup-t1 +\DeclareFontShape{T1}{ETbb-Sup}{b}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-sup-t1 }{} -\DeclareFontShape{T1}{ETbb-Sup}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-sup-t1 +\DeclareFontShape{T1}{ETbb-Sup}{bold}{it}{ + <-> alias * ETbb-Sup/b/it }{} -\DeclareFontShape{T1}{ETbb-Sup}{regular}{sl}{ - <-> ssub * ETbb-Sup/regular/it +\DeclareFontShape{T1}{ETbb-Sup}{b}{n}{ + <-> \ETbb@@scale ETbb-Bold-sup-t1 }{} - -% ---- bold ---- - -\DeclareFontShape{T1}{ETbb-Sup}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-sup-t1 +\DeclareFontShape{T1}{ETbb-Sup}{bold}{n}{ + <-> alias * ETbb-Sup/b/n }{} -\DeclareFontShape{T1}{ETbb-Sup}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-sup-t1 +\DeclareFontShape{T1}{ETbb-Sup}{b}{sl}{ + <-> ssub * ETbb-Sup/b/it }{} \DeclareFontShape{T1}{ETbb-Sup}{bold}{sl}{ - <-> ssub * ETbb-Sup/bold/it + <-> ssub * ETbb-Sup/bold/it }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- m = regular ---- \DeclareFontShape{T1}{ETbb-Sup}{m}{n}{ - <-> alias * ETbb-Sup/regular/n + <-> \ETbb@@scale ETbb-Regular-sup-t1 }{} -\DeclareFontShape{T1}{ETbb-Sup}{m}{sl}{ - <-> alias * ETbb-Sup/regular/sl +\DeclareFontShape{T1}{ETbb-Sup}{regular}{n}{ + <-> alias * ETbb-Sup/m/n }{} \DeclareFontShape{T1}{ETbb-Sup}{m}{it}{ - <-> alias * ETbb-Sup/regular/it + <-> \ETbb@@scale ETbb-Italic-sup-t1 }{} - -% b --> bold - -\DeclareFontShape{T1}{ETbb-Sup}{b}{it}{ - <-> alias * ETbb-Sup/bold/it +\DeclareFontShape{T1}{ETbb-Sup}{regular}{it}{ + <-> alias * ETbb-Sup/m/it }{} -\DeclareFontShape{T1}{ETbb-Sup}{b}{sl}{ - <-> alias * ETbb-Sup/bold/sl +\DeclareFontShape{T1}{ETbb-Sup}{m}{sl}{ + <-> ssub * ETbb-Sup/m/it }{} -\DeclareFontShape{T1}{ETbb-Sup}{b}{n}{ - <-> alias * ETbb-Sup/bold/n +\DeclareFontShape{T1}{ETbb-Sup}{regular}{sl}{ + <-> ssub * ETbb-Sup/regular/it }{} -\DeclareFontShape{T1}{ETbb-Sup}{bx}{sl}{ - <-> ssub * ETbb-Sup/b/sl + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{T1}{ETbb-Sup}{bx}{it}{ + <-> ssub * ETbb-Sup/b/it }{} \DeclareFontShape{T1}{ETbb-Sup}{bx}{n}{ <-> ssub * ETbb-Sup/b/n }{} -\DeclareFontShape{T1}{ETbb-Sup}{bx}{it}{ - <-> ssub * ETbb-Sup/b/it +\DeclareFontShape{T1}{ETbb-Sup}{bx}{sl}{ + <-> ssub * ETbb-Sup/b/sl }{} \endinput diff --git a/fonts/etbb/tex/TS1ETbb-LF.fd b/fonts/etbb/tex/TS1ETbb-LF.fd index ad3ef7c562..1851e42908 100644 --- a/fonts/etbb/tex/TS1ETbb-LF.fd +++ b/fonts/etbb/tex/TS1ETbb-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/07/01 +%% Generated by autoinst on 2021/12/18 %% \ProvidesFile{TS1ETbb-LF.fd} - [2020/07/01 (autoinst) Font definitions for TS1/ETbb-LF.] + [2021/12/18 (autoinst) Font definitions for TS1/ETbb-LF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,71 +20,61 @@ \DeclareFontFamily{TS1}{ETbb-LF}{} -% ---- bold ---- +% ---- b = bold ---- -\DeclareFontShape{TS1}{ETbb-LF}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-lf-ts1 +\DeclareFontShape{TS1}{ETbb-LF}{b}{n}{ + <-> \ETbb@@scale ETbb-Bold-lf-ts1 }{} \DeclareFontShape{TS1}{ETbb-LF}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-lf-ts1 + <-> alias * ETbb-LF/b/n }{} -\DeclareFontShape{TS1}{ETbb-LF}{bold}{sl}{ - <-> ssub * ETbb-LF/bold/it +\DeclareFontShape{TS1}{ETbb-LF}{b}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-lf-ts1 }{} - -% ---- regular ---- - -\DeclareFontShape{TS1}{ETbb-LF}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-lf-ts1 +\DeclareFontShape{TS1}{ETbb-LF}{bold}{it}{ + <-> alias * ETbb-LF/b/it }{} -\DeclareFontShape{TS1}{ETbb-LF}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-lf-ts1 +\DeclareFontShape{TS1}{ETbb-LF}{b}{sl}{ + <-> ssub * ETbb-LF/b/it }{} -\DeclareFontShape{TS1}{ETbb-LF}{regular}{sl}{ - <-> ssub * ETbb-LF/regular/it +\DeclareFontShape{TS1}{ETbb-LF}{bold}{sl}{ + <-> ssub * ETbb-LF/bold/it }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- m = regular ---- -\DeclareFontShape{TS1}{ETbb-LF}{m}{it}{ - <-> alias * ETbb-LF/regular/it +\DeclareFontShape{TS1}{ETbb-LF}{m}{n}{ + <-> \ETbb@@scale ETbb-Regular-lf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-LF}{m}{sl}{ - <-> alias * ETbb-LF/regular/sl +\DeclareFontShape{TS1}{ETbb-LF}{regular}{n}{ + <-> alias * ETbb-LF/m/n }{} -\DeclareFontShape{TS1}{ETbb-LF}{m}{n}{ - <-> alias * ETbb-LF/regular/n +\DeclareFontShape{TS1}{ETbb-LF}{m}{it}{ + <-> \ETbb@@scale ETbb-Italic-lf-ts1 }{} - -% b --> bold - -\DeclareFontShape{TS1}{ETbb-LF}{b}{sl}{ - <-> alias * ETbb-LF/bold/sl +\DeclareFontShape{TS1}{ETbb-LF}{regular}{it}{ + <-> alias * ETbb-LF/m/it }{} -\DeclareFontShape{TS1}{ETbb-LF}{b}{n}{ - <-> alias * ETbb-LF/bold/n +\DeclareFontShape{TS1}{ETbb-LF}{m}{sl}{ + <-> ssub * ETbb-LF/m/it }{} -\DeclareFontShape{TS1}{ETbb-LF}{b}{it}{ - <-> alias * ETbb-LF/bold/it +\DeclareFontShape{TS1}{ETbb-LF}{regular}{sl}{ + <-> ssub * ETbb-LF/regular/it }{} -\DeclareFontShape{TS1}{ETbb-LF}{bx}{it}{ - <-> ssub * ETbb-LF/b/it -}{} + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- \DeclareFontShape{TS1}{ETbb-LF}{bx}{n}{ <-> ssub * ETbb-LF/b/n @@ -94,4 +84,8 @@ <-> ssub * ETbb-LF/b/sl }{} +\DeclareFontShape{TS1}{ETbb-LF}{bx}{it}{ + <-> ssub * ETbb-LF/b/it +}{} + \endinput diff --git a/fonts/etbb/tex/TS1ETbb-OsF.fd b/fonts/etbb/tex/TS1ETbb-OsF.fd index 85e7778cbe..780f60ed89 100644 --- a/fonts/etbb/tex/TS1ETbb-OsF.fd +++ b/fonts/etbb/tex/TS1ETbb-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/07/01 +%% Generated by autoinst on 2021/12/18 %% \ProvidesFile{TS1ETbb-OsF.fd} - [2020/07/01 (autoinst) Font definitions for TS1/ETbb-OsF.] + [2021/12/18 (autoinst) Font definitions for TS1/ETbb-OsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,71 +20,61 @@ \DeclareFontFamily{TS1}{ETbb-OsF}{} -% ---- bold ---- +% ---- b = bold ---- -\DeclareFontShape{TS1}{ETbb-OsF}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-osf-ts1 +\DeclareFontShape{TS1}{ETbb-OsF}{b}{n}{ + <-> \ETbb@@scale ETbb-Bold-osf-ts1 }{} \DeclareFontShape{TS1}{ETbb-OsF}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-osf-ts1 + <-> alias * ETbb-OsF/b/n }{} -\DeclareFontShape{TS1}{ETbb-OsF}{bold}{sl}{ - <-> ssub * ETbb-OsF/bold/it +\DeclareFontShape{TS1}{ETbb-OsF}{b}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-osf-ts1 }{} - -% ---- regular ---- - -\DeclareFontShape{TS1}{ETbb-OsF}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-osf-ts1 +\DeclareFontShape{TS1}{ETbb-OsF}{bold}{it}{ + <-> alias * ETbb-OsF/b/it }{} -\DeclareFontShape{TS1}{ETbb-OsF}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-osf-ts1 +\DeclareFontShape{TS1}{ETbb-OsF}{b}{sl}{ + <-> ssub * ETbb-OsF/b/it }{} -\DeclareFontShape{TS1}{ETbb-OsF}{regular}{sl}{ - <-> ssub * ETbb-OsF/regular/it +\DeclareFontShape{TS1}{ETbb-OsF}{bold}{sl}{ + <-> ssub * ETbb-OsF/bold/it }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- m = regular ---- -\DeclareFontShape{TS1}{ETbb-OsF}{m}{it}{ - <-> alias * ETbb-OsF/regular/it +\DeclareFontShape{TS1}{ETbb-OsF}{m}{n}{ + <-> \ETbb@@scale ETbb-Regular-osf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-OsF}{m}{sl}{ - <-> alias * ETbb-OsF/regular/sl +\DeclareFontShape{TS1}{ETbb-OsF}{regular}{n}{ + <-> alias * ETbb-OsF/m/n }{} -\DeclareFontShape{TS1}{ETbb-OsF}{m}{n}{ - <-> alias * ETbb-OsF/regular/n +\DeclareFontShape{TS1}{ETbb-OsF}{m}{it}{ + <-> \ETbb@@scale ETbb-Italic-osf-ts1 }{} - -% b --> bold - -\DeclareFontShape{TS1}{ETbb-OsF}{b}{n}{ - <-> alias * ETbb-OsF/bold/n +\DeclareFontShape{TS1}{ETbb-OsF}{regular}{it}{ + <-> alias * ETbb-OsF/m/it }{} -\DeclareFontShape{TS1}{ETbb-OsF}{b}{sl}{ - <-> alias * ETbb-OsF/bold/sl +\DeclareFontShape{TS1}{ETbb-OsF}{m}{sl}{ + <-> ssub * ETbb-OsF/m/it }{} -\DeclareFontShape{TS1}{ETbb-OsF}{b}{it}{ - <-> alias * ETbb-OsF/bold/it +\DeclareFontShape{TS1}{ETbb-OsF}{regular}{sl}{ + <-> ssub * ETbb-OsF/regular/it }{} -\DeclareFontShape{TS1}{ETbb-OsF}{bx}{it}{ - <-> ssub * ETbb-OsF/b/it -}{} + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- \DeclareFontShape{TS1}{ETbb-OsF}{bx}{sl}{ <-> ssub * ETbb-OsF/b/sl @@ -94,4 +84,8 @@ <-> ssub * ETbb-OsF/b/n }{} +\DeclareFontShape{TS1}{ETbb-OsF}{bx}{it}{ + <-> ssub * ETbb-OsF/b/it +}{} + \endinput diff --git a/fonts/etbb/tex/TS1ETbb-TLF.fd b/fonts/etbb/tex/TS1ETbb-TLF.fd index b0dc0d1af4..893b7aa325 100644 --- a/fonts/etbb/tex/TS1ETbb-TLF.fd +++ b/fonts/etbb/tex/TS1ETbb-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/07/01 +%% Generated by autoinst on 2021/12/18 %% \ProvidesFile{TS1ETbb-TLF.fd} - [2020/07/01 (autoinst) Font definitions for TS1/ETbb-TLF.] + [2021/12/18 (autoinst) Font definitions for TS1/ETbb-TLF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,78 +20,72 @@ \DeclareFontFamily{TS1}{ETbb-TLF}{} -% ---- regular ---- +% ---- b = bold ---- -\DeclareFontShape{TS1}{ETbb-TLF}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-tlf-ts1 +\DeclareFontShape{TS1}{ETbb-TLF}{b}{n}{ + <-> \ETbb@@scale ETbb-Bold-tlf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-TLF}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-tlf-ts1 +\DeclareFontShape{TS1}{ETbb-TLF}{bold}{n}{ + <-> alias * ETbb-TLF/b/n }{} -\DeclareFontShape{TS1}{ETbb-TLF}{regular}{sl}{ - <-> ssub * ETbb-TLF/regular/it +\DeclareFontShape{TS1}{ETbb-TLF}{b}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-tlf-ts1 }{} - -% ---- bold ---- - \DeclareFontShape{TS1}{ETbb-TLF}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-tlf-ts1 + <-> alias * ETbb-TLF/b/it }{} -\DeclareFontShape{TS1}{ETbb-TLF}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-tlf-ts1 +\DeclareFontShape{TS1}{ETbb-TLF}{b}{sl}{ + <-> ssub * ETbb-TLF/b/it }{} \DeclareFontShape{TS1}{ETbb-TLF}{bold}{sl}{ - <-> ssub * ETbb-TLF/bold/it + <-> ssub * ETbb-TLF/bold/it }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- m = regular ---- \DeclareFontShape{TS1}{ETbb-TLF}{m}{it}{ - <-> alias * ETbb-TLF/regular/it + <-> \ETbb@@scale ETbb-Italic-tlf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-TLF}{m}{n}{ - <-> alias * ETbb-TLF/regular/n +\DeclareFontShape{TS1}{ETbb-TLF}{regular}{it}{ + <-> alias * ETbb-TLF/m/it }{} -\DeclareFontShape{TS1}{ETbb-TLF}{m}{sl}{ - <-> alias * ETbb-TLF/regular/sl +\DeclareFontShape{TS1}{ETbb-TLF}{m}{n}{ + <-> \ETbb@@scale ETbb-Regular-tlf-ts1 }{} - -% b --> bold - -\DeclareFontShape{TS1}{ETbb-TLF}{b}{it}{ - <-> alias * ETbb-TLF/bold/it +\DeclareFontShape{TS1}{ETbb-TLF}{regular}{n}{ + <-> alias * ETbb-TLF/m/n }{} -\DeclareFontShape{TS1}{ETbb-TLF}{b}{sl}{ - <-> alias * ETbb-TLF/bold/sl +\DeclareFontShape{TS1}{ETbb-TLF}{m}{sl}{ + <-> ssub * ETbb-TLF/m/it }{} -\DeclareFontShape{TS1}{ETbb-TLF}{b}{n}{ - <-> alias * ETbb-TLF/bold/n +\DeclareFontShape{TS1}{ETbb-TLF}{regular}{sl}{ + <-> ssub * ETbb-TLF/regular/it }{} + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + \DeclareFontShape{TS1}{ETbb-TLF}{bx}{it}{ <-> ssub * ETbb-TLF/b/it }{} -\DeclareFontShape{TS1}{ETbb-TLF}{bx}{n}{ - <-> ssub * ETbb-TLF/b/n -}{} - \DeclareFontShape{TS1}{ETbb-TLF}{bx}{sl}{ <-> ssub * ETbb-TLF/b/sl }{} +\DeclareFontShape{TS1}{ETbb-TLF}{bx}{n}{ + <-> ssub * ETbb-TLF/b/n +}{} + \endinput diff --git a/fonts/etbb/tex/TS1ETbb-TOsF.fd b/fonts/etbb/tex/TS1ETbb-TOsF.fd index 818b85f53e..c2ff07d446 100644 --- a/fonts/etbb/tex/TS1ETbb-TOsF.fd +++ b/fonts/etbb/tex/TS1ETbb-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2020/07/01 +%% Generated by autoinst on 2021/12/18 %% \ProvidesFile{TS1ETbb-TOsF.fd} - [2020/07/01 (autoinst) Font definitions for TS1/ETbb-TOsF.] + [2021/12/18 (autoinst) Font definitions for TS1/ETbb-TOsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,78 +20,72 @@ \DeclareFontFamily{TS1}{ETbb-TOsF}{} -% ---- regular ---- +% ---- b = bold ---- -\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{n}{ - <-> \ETbb@@scale ETbb-Regular-tosf-ts1 +\DeclareFontShape{TS1}{ETbb-TOsF}{b}{n}{ + <-> \ETbb@@scale ETbb-Bold-tosf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{it}{ - <-> \ETbb@@scale ETbb-Italic-tosf-ts1 +\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{n}{ + <-> alias * ETbb-TOsF/b/n }{} -\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{sl}{ - <-> ssub * ETbb-TOsF/regular/it +\DeclareFontShape{TS1}{ETbb-TOsF}{b}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-tosf-ts1 }{} - -% ---- bold ---- - \DeclareFontShape{TS1}{ETbb-TOsF}{bold}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-tosf-ts1 + <-> alias * ETbb-TOsF/b/it }{} -\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{n}{ - <-> \ETbb@@scale ETbb-Bold-tosf-ts1 +\DeclareFontShape{TS1}{ETbb-TOsF}{b}{sl}{ + <-> ssub * ETbb-TOsF/b/it }{} \DeclareFontShape{TS1}{ETbb-TOsF}{bold}{sl}{ - <-> ssub * ETbb-TOsF/bold/it + <-> ssub * ETbb-TOsF/bold/it }{} -% -% Extra 'alias' rules to map the standard NFSS codes to our fancy names -% -% m --> regular +% ---- m = regular ---- -\DeclareFontShape{TS1}{ETbb-TOsF}{m}{it}{ - <-> alias * ETbb-TOsF/regular/it +\DeclareFontShape{TS1}{ETbb-TOsF}{m}{n}{ + <-> \ETbb@@scale ETbb-Regular-tosf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-TOsF}{m}{sl}{ - <-> alias * ETbb-TOsF/regular/sl +\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{n}{ + <-> alias * ETbb-TOsF/m/n }{} -\DeclareFontShape{TS1}{ETbb-TOsF}{m}{n}{ - <-> alias * ETbb-TOsF/regular/n +\DeclareFontShape{TS1}{ETbb-TOsF}{m}{it}{ + <-> \ETbb@@scale ETbb-Italic-tosf-ts1 }{} - -% b --> bold - -\DeclareFontShape{TS1}{ETbb-TOsF}{b}{n}{ - <-> alias * ETbb-TOsF/bold/n +\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{it}{ + <-> alias * ETbb-TOsF/m/it }{} -\DeclareFontShape{TS1}{ETbb-TOsF}{b}{sl}{ - <-> alias * ETbb-TOsF/bold/sl +\DeclareFontShape{TS1}{ETbb-TOsF}{m}{sl}{ + <-> ssub * ETbb-TOsF/m/it }{} -\DeclareFontShape{TS1}{ETbb-TOsF}{b}{it}{ - <-> alias * ETbb-TOsF/bold/it +\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{sl}{ + <-> ssub * ETbb-TOsF/regular/it }{} -\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{it}{ - <-> ssub * ETbb-TOsF/b/it + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{n}{ + <-> ssub * ETbb-TOsF/b/n }{} \DeclareFontShape{TS1}{ETbb-TOsF}{bx}{sl}{ <-> ssub * ETbb-TOsF/b/sl }{} -\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{n}{ - <-> ssub * ETbb-TOsF/b/n +\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{it}{ + <-> ssub * ETbb-TOsF/b/it }{} \endinput -- cgit v1.2.3