diff options
Diffstat (limited to 'Master/texmf-dist/tex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/etbb/LY1ETbb-Dnom.fd | 68 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd | 72 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd | 70 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/etbb/OT1ETbb-Dnom.fd | 72 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd | 68 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd | 72 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/etbb/T1ETbb-Dnom.fd | 64 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd | 64 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd | 70 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd | 72 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd | 72 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd | 70 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd | 72 |
13 files changed, 492 insertions, 414 deletions
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Dnom.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Dnom.fd index 448ecacaf37..4924d3a55a0 100644 --- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Dnom.fd +++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Dnom.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2021/12/18 +%% Generated by autoinst on 2020/07/01 %% \ProvidesFile{LY1ETbb-Dnom.fd} - [2021/12/18 (autoinst) Font definitions for LY1/ETbb-Dnom.] + [2020/07/01 (autoinst) Font definitions for LY1/ETbb-Dnom.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,61 +20,71 @@ \DeclareFontFamily{LY1}{ETbb-Dnom}{} -% ---- b = bold ---- +% ---- bold ---- -\DeclareFontShape{LY1}{ETbb-Dnom}{b}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-dnom-ly1 +\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{n}{ + <-> \ETbb@@scale ETbb-Bold-dnom-ly1 }{} \DeclareFontShape{LY1}{ETbb-Dnom}{bold}{it}{ - <-> alias * ETbb-Dnom/b/it + <-> \ETbb@@scale ETbb-BoldItalic-dnom-ly1 }{} -\DeclareFontShape{LY1}{ETbb-Dnom}{b}{n}{ - <-> \ETbb@@scale ETbb-Bold-dnom-ly1 +\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{sl}{ + <-> ssub * ETbb-Dnom/bold/it }{} -\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{n}{ - <-> alias * ETbb-Dnom/b/n + +% ---- regular ---- + +\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-dnom-ly1 }{} -\DeclareFontShape{LY1}{ETbb-Dnom}{b}{sl}{ - <-> ssub * ETbb-Dnom/b/it +\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-dnom-ly1 }{} -\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{sl}{ - <-> ssub * ETbb-Dnom/bold/it +\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{sl}{ + <-> ssub * ETbb-Dnom/regular/it }{} +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% -% ---- m = regular ---- +% m --> regular \DeclareFontShape{LY1}{ETbb-Dnom}{m}{n}{ - <-> \ETbb@@scale ETbb-Regular-dnom-ly1 + <-> alias * ETbb-Dnom/regular/n }{} -\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{n}{ - <-> alias * ETbb-Dnom/m/n +\DeclareFontShape{LY1}{ETbb-Dnom}{m}{sl}{ + <-> alias * ETbb-Dnom/regular/sl }{} \DeclareFontShape{LY1}{ETbb-Dnom}{m}{it}{ - <-> \ETbb@@scale ETbb-Italic-dnom-ly1 + <-> alias * ETbb-Dnom/regular/it }{} -\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{it}{ - <-> alias * ETbb-Dnom/m/it -}{} -\DeclareFontShape{LY1}{ETbb-Dnom}{m}{sl}{ - <-> ssub * ETbb-Dnom/m/it +% b --> bold + +\DeclareFontShape{LY1}{ETbb-Dnom}{b}{it}{ + <-> alias * ETbb-Dnom/bold/it }{} -\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{sl}{ - <-> ssub * ETbb-Dnom/regular/it +\DeclareFontShape{LY1}{ETbb-Dnom}{b}{sl}{ + <-> alias * ETbb-Dnom/bold/sl }{} +\DeclareFontShape{LY1}{ETbb-Dnom}{b}{n}{ + <-> alias * ETbb-Dnom/bold/n +}{} -% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- +\DeclareFontShape{LY1}{ETbb-Dnom}{bx}{it}{ + <-> ssub * ETbb-Dnom/b/it +}{} \DeclareFontShape{LY1}{ETbb-Dnom}{bx}{n}{ <-> ssub * ETbb-Dnom/b/n @@ -84,8 +94,4 @@ <-> ssub * ETbb-Dnom/b/sl }{} -\DeclareFontShape{LY1}{ETbb-Dnom}{bx}{it}{ - <-> ssub * ETbb-Dnom/b/it -}{} - \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd index 2aa77b5a9c5..e2c933c86df 100644 --- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd +++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2021/12/18 +%% Generated by autoinst on 2020/07/01 %% \ProvidesFile{LY1ETbb-Inf.fd} - [2021/12/18 (autoinst) Font definitions for LY1/ETbb-Inf.] + [2020/07/01 (autoinst) Font definitions for LY1/ETbb-Inf.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,64 +20,66 @@ \DeclareFontFamily{LY1}{ETbb-Inf}{} -% ---- m = regular ---- +% ---- regular ---- -\DeclareFontShape{LY1}{ETbb-Inf}{m}{it}{ - <-> \ETbb@@scale ETbb-Italic-inf-ly1 +\DeclareFontShape{LY1}{ETbb-Inf}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-inf-ly1 }{} \DeclareFontShape{LY1}{ETbb-Inf}{regular}{it}{ - <-> alias * ETbb-Inf/m/it + <-> \ETbb@@scale ETbb-Italic-inf-ly1 }{} -\DeclareFontShape{LY1}{ETbb-Inf}{m}{n}{ - <-> \ETbb@@scale ETbb-Regular-inf-ly1 +\DeclareFontShape{LY1}{ETbb-Inf}{regular}{sl}{ + <-> ssub * ETbb-Inf/regular/it }{} -\DeclareFontShape{LY1}{ETbb-Inf}{regular}{n}{ - <-> alias * ETbb-Inf/m/n + +% ---- bold ---- + +\DeclareFontShape{LY1}{ETbb-Inf}{bold}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{ETbb-Inf}{m}{sl}{ - <-> ssub * ETbb-Inf/m/it +\DeclareFontShape{LY1}{ETbb-Inf}{bold}{n}{ + <-> \ETbb@@scale ETbb-Bold-inf-ly1 }{} -\DeclareFontShape{LY1}{ETbb-Inf}{regular}{sl}{ - <-> ssub * ETbb-Inf/regular/it +\DeclareFontShape{LY1}{ETbb-Inf}{bold}{sl}{ + <-> ssub * ETbb-Inf/bold/it }{} +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% -% ---- b = bold ---- +% m --> regular -\DeclareFontShape{LY1}{ETbb-Inf}{b}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-inf-ly1 +\DeclareFontShape{LY1}{ETbb-Inf}{m}{it}{ + <-> alias * ETbb-Inf/regular/it }{} -\DeclareFontShape{LY1}{ETbb-Inf}{bold}{it}{ - <-> alias * ETbb-Inf/b/it +\DeclareFontShape{LY1}{ETbb-Inf}{m}{n}{ + <-> alias * ETbb-Inf/regular/n }{} -\DeclareFontShape{LY1}{ETbb-Inf}{b}{n}{ - <-> \ETbb@@scale ETbb-Bold-inf-ly1 +\DeclareFontShape{LY1}{ETbb-Inf}{m}{sl}{ + <-> alias * ETbb-Inf/regular/sl }{} -\DeclareFontShape{LY1}{ETbb-Inf}{bold}{n}{ - <-> alias * ETbb-Inf/b/n -}{} -\DeclareFontShape{LY1}{ETbb-Inf}{b}{sl}{ - <-> ssub * ETbb-Inf/b/it -}{} +% b --> bold -\DeclareFontShape{LY1}{ETbb-Inf}{bold}{sl}{ - <-> ssub * ETbb-Inf/bold/it +\DeclareFontShape{LY1}{ETbb-Inf}{b}{it}{ + <-> alias * ETbb-Inf/bold/it }{} +\DeclareFontShape{LY1}{ETbb-Inf}{b}{n}{ + <-> alias * ETbb-Inf/bold/n +}{} -% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- - -\DeclareFontShape{LY1}{ETbb-Inf}{bx}{it}{ - <-> ssub * ETbb-Inf/b/it +\DeclareFontShape{LY1}{ETbb-Inf}{b}{sl}{ + <-> alias * ETbb-Inf/bold/sl }{} \DeclareFontShape{LY1}{ETbb-Inf}{bx}{n}{ @@ -88,4 +90,8 @@ <-> ssub * ETbb-Inf/b/sl }{} +\DeclareFontShape{LY1}{ETbb-Inf}{bx}{it}{ + <-> ssub * ETbb-Inf/b/it +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd index c00872dbd3f..ba3f657a21e 100644 --- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd +++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2021/12/18 +%% Generated by autoinst on 2020/07/01 %% \ProvidesFile{LY1ETbb-Sup.fd} - [2021/12/18 (autoinst) Font definitions for LY1/ETbb-Sup.] + [2020/07/01 (autoinst) Font definitions for LY1/ETbb-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,61 +20,71 @@ \DeclareFontFamily{LY1}{ETbb-Sup}{} -% ---- m = regular ---- +% ---- regular ---- -\DeclareFontShape{LY1}{ETbb-Sup}{m}{n}{ - <-> \ETbb@@scale ETbb-Regular-sup-ly1 +\DeclareFontShape{LY1}{ETbb-Sup}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-sup-ly1 }{} \DeclareFontShape{LY1}{ETbb-Sup}{regular}{n}{ - <-> alias * ETbb-Sup/m/n + <-> \ETbb@@scale ETbb-Regular-sup-ly1 }{} -\DeclareFontShape{LY1}{ETbb-Sup}{m}{it}{ - <-> \ETbb@@scale ETbb-Italic-sup-ly1 +\DeclareFontShape{LY1}{ETbb-Sup}{regular}{sl}{ + <-> ssub * ETbb-Sup/regular/it }{} -\DeclareFontShape{LY1}{ETbb-Sup}{regular}{it}{ - <-> alias * ETbb-Sup/m/it + +% ---- bold ---- + +\DeclareFontShape{LY1}{ETbb-Sup}{bold}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{ETbb-Sup}{m}{sl}{ - <-> ssub * ETbb-Sup/m/it +\DeclareFontShape{LY1}{ETbb-Sup}{bold}{n}{ + <-> \ETbb@@scale ETbb-Bold-sup-ly1 }{} -\DeclareFontShape{LY1}{ETbb-Sup}{regular}{sl}{ - <-> ssub * ETbb-Sup/regular/it +\DeclareFontShape{LY1}{ETbb-Sup}{bold}{sl}{ + <-> ssub * ETbb-Sup/bold/it }{} +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% -% ---- b = bold ---- +% m --> regular -\DeclareFontShape{LY1}{ETbb-Sup}{b}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-sup-ly1 +\DeclareFontShape{LY1}{ETbb-Sup}{m}{sl}{ + <-> alias * ETbb-Sup/regular/sl }{} -\DeclareFontShape{LY1}{ETbb-Sup}{bold}{it}{ - <-> alias * ETbb-Sup/b/it +\DeclareFontShape{LY1}{ETbb-Sup}{m}{n}{ + <-> alias * ETbb-Sup/regular/n }{} -\DeclareFontShape{LY1}{ETbb-Sup}{b}{n}{ - <-> \ETbb@@scale ETbb-Bold-sup-ly1 +\DeclareFontShape{LY1}{ETbb-Sup}{m}{it}{ + <-> alias * ETbb-Sup/regular/it }{} -\DeclareFontShape{LY1}{ETbb-Sup}{bold}{n}{ - <-> alias * ETbb-Sup/b/n -}{} + +% b --> bold \DeclareFontShape{LY1}{ETbb-Sup}{b}{sl}{ - <-> ssub * ETbb-Sup/b/it + <-> alias * ETbb-Sup/bold/sl }{} -\DeclareFontShape{LY1}{ETbb-Sup}{bold}{sl}{ - <-> ssub * ETbb-Sup/bold/it +\DeclareFontShape{LY1}{ETbb-Sup}{b}{n}{ + <-> alias * ETbb-Sup/bold/n }{} +\DeclareFontShape{LY1}{ETbb-Sup}{b}{it}{ + <-> alias * ETbb-Sup/bold/it +}{} -% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- +\DeclareFontShape{LY1}{ETbb-Sup}{bx}{it}{ + <-> ssub * ETbb-Sup/b/it +}{} \DeclareFontShape{LY1}{ETbb-Sup}{bx}{n}{ <-> ssub * ETbb-Sup/b/n @@ -84,8 +94,4 @@ <-> ssub * ETbb-Sup/b/sl }{} -\DeclareFontShape{LY1}{ETbb-Sup}{bx}{it}{ - <-> ssub * ETbb-Sup/b/it -}{} - \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Dnom.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Dnom.fd index 47e1d8bf611..5638d234eca 100644 --- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Dnom.fd +++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Dnom.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2021/12/18 +%% Generated by autoinst on 2020/07/01 %% \ProvidesFile{OT1ETbb-Dnom.fd} - [2021/12/18 (autoinst) Font definitions for OT1/ETbb-Dnom.] + [2020/07/01 (autoinst) Font definitions for OT1/ETbb-Dnom.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,64 +20,66 @@ \DeclareFontFamily{OT1}{ETbb-Dnom}{} -% ---- b = bold ---- +% ---- regular ---- -\DeclareFontShape{OT1}{ETbb-Dnom}{b}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-dnom-ot1 +\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-dnom-ot1 }{} -\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{it}{ - <-> alias * ETbb-Dnom/b/it +\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-dnom-ot1 }{} -\DeclareFontShape{OT1}{ETbb-Dnom}{b}{n}{ - <-> \ETbb@@scale ETbb-Bold-dnom-ot1 +\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{sl}{ + <-> ssub * ETbb-Dnom/regular/it }{} -\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{n}{ - <-> alias * ETbb-Dnom/b/n + +% ---- bold ---- + +\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-dnom-ot1 }{} -\DeclareFontShape{OT1}{ETbb-Dnom}{b}{sl}{ - <-> ssub * ETbb-Dnom/b/it +\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{n}{ + <-> \ETbb@@scale ETbb-Bold-dnom-ot1 }{} \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}{n}{ - <-> \ETbb@@scale ETbb-Regular-dnom-ot1 +\DeclareFontShape{OT1}{ETbb-Dnom}{m}{it}{ + <-> alias * ETbb-Dnom/regular/it }{} -\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{n}{ - <-> alias * ETbb-Dnom/m/n +\DeclareFontShape{OT1}{ETbb-Dnom}{m}{sl}{ + <-> alias * ETbb-Dnom/regular/sl }{} -\DeclareFontShape{OT1}{ETbb-Dnom}{m}{it}{ - <-> \ETbb@@scale ETbb-Italic-dnom-ot1 +\DeclareFontShape{OT1}{ETbb-Dnom}{m}{n}{ + <-> alias * ETbb-Dnom/regular/n }{} -\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{it}{ - <-> alias * ETbb-Dnom/m/it -}{} -\DeclareFontShape{OT1}{ETbb-Dnom}{m}{sl}{ - <-> ssub * ETbb-Dnom/m/it -}{} +% b --> bold -\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{sl}{ - <-> ssub * ETbb-Dnom/regular/it +\DeclareFontShape{OT1}{ETbb-Dnom}{b}{it}{ + <-> alias * ETbb-Dnom/bold/it }{} +\DeclareFontShape{OT1}{ETbb-Dnom}{b}{n}{ + <-> alias * ETbb-Dnom/bold/n +}{} -% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- - -\DeclareFontShape{OT1}{ETbb-Dnom}{bx}{it}{ - <-> ssub * ETbb-Dnom/b/it +\DeclareFontShape{OT1}{ETbb-Dnom}{b}{sl}{ + <-> alias * ETbb-Dnom/bold/sl }{} \DeclareFontShape{OT1}{ETbb-Dnom}{bx}{n}{ @@ -88,4 +90,8 @@ <-> ssub * ETbb-Dnom/b/sl }{} +\DeclareFontShape{OT1}{ETbb-Dnom}{bx}{it}{ + <-> ssub * ETbb-Dnom/b/it +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd index 9cb1a65d3d1..d521370a34a 100644 --- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd +++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2021/12/18 +%% Generated by autoinst on 2020/07/01 %% \ProvidesFile{OT1ETbb-Inf.fd} - [2021/12/18 (autoinst) Font definitions for OT1/ETbb-Inf.] + [2020/07/01 (autoinst) Font definitions for OT1/ETbb-Inf.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,62 +20,72 @@ \DeclareFontFamily{OT1}{ETbb-Inf}{} -% ---- m = regular ---- +% ---- bold ---- -\DeclareFontShape{OT1}{ETbb-Inf}{m}{n}{ - <-> \ETbb@@scale ETbb-Regular-inf-ot1 +\DeclareFontShape{OT1}{ETbb-Inf}{bold}{n}{ + <-> \ETbb@@scale ETbb-Bold-inf-ot1 }{} -\DeclareFontShape{OT1}{ETbb-Inf}{regular}{n}{ - <-> alias * ETbb-Inf/m/n +\DeclareFontShape{OT1}{ETbb-Inf}{bold}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{ETbb-Inf}{m}{it}{ - <-> \ETbb@@scale ETbb-Italic-inf-ot1 +\DeclareFontShape{OT1}{ETbb-Inf}{bold}{sl}{ + <-> ssub * ETbb-Inf/bold/it }{} + +% ---- regular ---- + \DeclareFontShape{OT1}{ETbb-Inf}{regular}{it}{ - <-> alias * ETbb-Inf/m/it + <-> \ETbb@@scale ETbb-Italic-inf-ot1 }{} -\DeclareFontShape{OT1}{ETbb-Inf}{m}{sl}{ - <-> ssub * ETbb-Inf/m/it +\DeclareFontShape{OT1}{ETbb-Inf}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-inf-ot1 }{} \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 +% -% ---- b = bold ---- +% m --> regular -\DeclareFontShape{OT1}{ETbb-Inf}{b}{n}{ - <-> \ETbb@@scale ETbb-Bold-inf-ot1 +\DeclareFontShape{OT1}{ETbb-Inf}{m}{sl}{ + <-> alias * ETbb-Inf/regular/sl }{} -\DeclareFontShape{OT1}{ETbb-Inf}{bold}{n}{ - <-> alias * ETbb-Inf/b/n +\DeclareFontShape{OT1}{ETbb-Inf}{m}{n}{ + <-> alias * ETbb-Inf/regular/n +}{} + +\DeclareFontShape{OT1}{ETbb-Inf}{m}{it}{ + <-> alias * ETbb-Inf/regular/it }{} + +% b --> bold + \DeclareFontShape{OT1}{ETbb-Inf}{b}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-inf-ot1 + <-> alias * ETbb-Inf/bold/it }{} -\DeclareFontShape{OT1}{ETbb-Inf}{bold}{it}{ - <-> alias * ETbb-Inf/b/it +\DeclareFontShape{OT1}{ETbb-Inf}{b}{n}{ + <-> alias * ETbb-Inf/bold/n }{} \DeclareFontShape{OT1}{ETbb-Inf}{b}{sl}{ - <-> ssub * ETbb-Inf/b/it + <-> alias * ETbb-Inf/bold/sl }{} -\DeclareFontShape{OT1}{ETbb-Inf}{bold}{sl}{ - <-> ssub * ETbb-Inf/bold/it +\DeclareFontShape{OT1}{ETbb-Inf}{bx}{it}{ + <-> ssub * ETbb-Inf/b/it }{} - -% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- - \DeclareFontShape{OT1}{ETbb-Inf}{bx}{sl}{ <-> ssub * ETbb-Inf/b/sl }{} @@ -84,8 +94,4 @@ <-> ssub * ETbb-Inf/b/n }{} -\DeclareFontShape{OT1}{ETbb-Inf}{bx}{it}{ - <-> ssub * ETbb-Inf/b/it -}{} - \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd index eaad6bbc2a5..f3e90c21429 100644 --- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd +++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2021/12/18 +%% Generated by autoinst on 2020/07/01 %% \ProvidesFile{OT1ETbb-Sup.fd} - [2021/12/18 (autoinst) Font definitions for OT1/ETbb-Sup.] + [2020/07/01 (autoinst) Font definitions for OT1/ETbb-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,64 +20,66 @@ \DeclareFontFamily{OT1}{ETbb-Sup}{} -% ---- m = regular ---- - -\DeclareFontShape{OT1}{ETbb-Sup}{m}{it}{ - <-> \ETbb@@scale ETbb-Italic-sup-ot1 -}{} +% ---- regular ---- \DeclareFontShape{OT1}{ETbb-Sup}{regular}{it}{ - <-> alias * ETbb-Sup/m/it -}{} - -\DeclareFontShape{OT1}{ETbb-Sup}{m}{n}{ - <-> \ETbb@@scale ETbb-Regular-sup-ot1 + <-> \ETbb@@scale ETbb-Italic-sup-ot1 }{} \DeclareFontShape{OT1}{ETbb-Sup}{regular}{n}{ - <-> alias * ETbb-Sup/m/n -}{} - -\DeclareFontShape{OT1}{ETbb-Sup}{m}{sl}{ - <-> ssub * ETbb-Sup/m/it + <-> \ETbb@@scale ETbb-Regular-sup-ot1 }{} \DeclareFontShape{OT1}{ETbb-Sup}{regular}{sl}{ - <-> ssub * ETbb-Sup/regular/it + <-> ssub * ETbb-Sup/regular/it }{} -% ---- b = bold ---- +% ---- bold ---- -\DeclareFontShape{OT1}{ETbb-Sup}{b}{it}{ +\DeclareFontShape{OT1}{ETbb-Sup}{bold}{it}{ <-> \ETbb@@scale ETbb-BoldItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{ETbb-Sup}{bold}{it}{ - <-> alias * ETbb-Sup/b/it +\DeclareFontShape{OT1}{ETbb-Sup}{bold}{n}{ + <-> \ETbb@@scale ETbb-Bold-sup-ot1 }{} -\DeclareFontShape{OT1}{ETbb-Sup}{b}{n}{ - <-> \ETbb@@scale ETbb-Bold-sup-ot1 +\DeclareFontShape{OT1}{ETbb-Sup}{bold}{sl}{ + <-> ssub * ETbb-Sup/bold/it }{} -\DeclareFontShape{OT1}{ETbb-Sup}{bold}{n}{ - <-> alias * ETbb-Sup/b/n +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{OT1}{ETbb-Sup}{m}{n}{ + <-> alias * ETbb-Sup/regular/n }{} -\DeclareFontShape{OT1}{ETbb-Sup}{b}{sl}{ - <-> ssub * ETbb-Sup/b/it +\DeclareFontShape{OT1}{ETbb-Sup}{m}{sl}{ + <-> alias * ETbb-Sup/regular/sl }{} -\DeclareFontShape{OT1}{ETbb-Sup}{bold}{sl}{ - <-> ssub * ETbb-Sup/bold/it +\DeclareFontShape{OT1}{ETbb-Sup}{m}{it}{ + <-> alias * ETbb-Sup/regular/it }{} -% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- +% b --> bold -\DeclareFontShape{OT1}{ETbb-Sup}{bx}{it}{ - <-> ssub * ETbb-Sup/b/it +\DeclareFontShape{OT1}{ETbb-Sup}{b}{it}{ + <-> alias * ETbb-Sup/bold/it +}{} + +\DeclareFontShape{OT1}{ETbb-Sup}{b}{n}{ + <-> alias * ETbb-Sup/bold/n +}{} + +\DeclareFontShape{OT1}{ETbb-Sup}{b}{sl}{ + <-> alias * ETbb-Sup/bold/sl }{} \DeclareFontShape{OT1}{ETbb-Sup}{bx}{n}{ @@ -88,4 +90,8 @@ <-> ssub * ETbb-Sup/b/sl }{} +\DeclareFontShape{OT1}{ETbb-Sup}{bx}{it}{ + <-> ssub * ETbb-Sup/b/it +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Dnom.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Dnom.fd index 4e6cb6ec8bd..d3c5e759422 100644 --- a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Dnom.fd +++ b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Dnom.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2021/12/18 +%% Generated by autoinst on 2020/07/01 %% \ProvidesFile{T1ETbb-Dnom.fd} - [2021/12/18 (autoinst) Font definitions for T1/ETbb-Dnom.] + [2020/07/01 (autoinst) Font definitions for T1/ETbb-Dnom.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,61 +20,67 @@ \DeclareFontFamily{T1}{ETbb-Dnom}{} -% ---- m = regular ---- +% ---- bold ---- -\DeclareFontShape{T1}{ETbb-Dnom}{m}{it}{ - <-> \ETbb@@scale ETbb-Italic-dnom-t1 +\DeclareFontShape{T1}{ETbb-Dnom}{bold}{n}{ + <-> \ETbb@@scale ETbb-Bold-dnom-t1 }{} -\DeclareFontShape{T1}{ETbb-Dnom}{regular}{it}{ - <-> alias * ETbb-Dnom/m/it +\DeclareFontShape{T1}{ETbb-Dnom}{bold}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-dnom-t1 }{} -\DeclareFontShape{T1}{ETbb-Dnom}{m}{n}{ - <-> \ETbb@@scale ETbb-Regular-dnom-t1 +\DeclareFontShape{T1}{ETbb-Dnom}{bold}{sl}{ + <-> ssub * ETbb-Dnom/bold/it }{} -\DeclareFontShape{T1}{ETbb-Dnom}{regular}{n}{ - <-> alias * ETbb-Dnom/m/n + +% ---- regular ---- + +\DeclareFontShape{T1}{ETbb-Dnom}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-dnom-t1 }{} -\DeclareFontShape{T1}{ETbb-Dnom}{m}{sl}{ - <-> ssub * ETbb-Dnom/m/it +\DeclareFontShape{T1}{ETbb-Dnom}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-dnom-t1 }{} \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 +% -% ---- b = bold ---- +% m --> regular -\DeclareFontShape{T1}{ETbb-Dnom}{b}{n}{ - <-> \ETbb@@scale ETbb-Bold-dnom-t1 +\DeclareFontShape{T1}{ETbb-Dnom}{m}{sl}{ + <-> alias * ETbb-Dnom/regular/sl }{} -\DeclareFontShape{T1}{ETbb-Dnom}{bold}{n}{ - <-> alias * ETbb-Dnom/b/n +\DeclareFontShape{T1}{ETbb-Dnom}{m}{n}{ + <-> alias * ETbb-Dnom/regular/n }{} -\DeclareFontShape{T1}{ETbb-Dnom}{b}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-dnom-t1 +\DeclareFontShape{T1}{ETbb-Dnom}{m}{it}{ + <-> alias * ETbb-Dnom/regular/it }{} -\DeclareFontShape{T1}{ETbb-Dnom}{bold}{it}{ - <-> alias * ETbb-Dnom/b/it -}{} + +% b --> bold \DeclareFontShape{T1}{ETbb-Dnom}{b}{sl}{ - <-> ssub * ETbb-Dnom/b/it + <-> alias * ETbb-Dnom/bold/sl }{} -\DeclareFontShape{T1}{ETbb-Dnom}{bold}{sl}{ - <-> ssub * ETbb-Dnom/bold/it +\DeclareFontShape{T1}{ETbb-Dnom}{b}{n}{ + <-> alias * ETbb-Dnom/bold/n }{} - -% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- +\DeclareFontShape{T1}{ETbb-Dnom}{b}{it}{ + <-> alias * ETbb-Dnom/bold/it +}{} \DeclareFontShape{T1}{ETbb-Dnom}{bx}{sl}{ <-> ssub * ETbb-Dnom/b/sl diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd index 4992550b056..a207ba97ea7 100644 --- a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd +++ b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2021/12/18 +%% Generated by autoinst on 2020/07/01 %% \ProvidesFile{T1ETbb-Inf.fd} - [2021/12/18 (autoinst) Font definitions for T1/ETbb-Inf.] + [2020/07/01 (autoinst) Font definitions for T1/ETbb-Inf.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,61 +20,67 @@ \DeclareFontFamily{T1}{ETbb-Inf}{} -% ---- b = bold ---- +% ---- bold ---- -\DeclareFontShape{T1}{ETbb-Inf}{b}{it}{ +\DeclareFontShape{T1}{ETbb-Inf}{bold}{it}{ <-> \ETbb@@scale ETbb-BoldItalic-inf-t1 }{} -\DeclareFontShape{T1}{ETbb-Inf}{bold}{it}{ - <-> alias * ETbb-Inf/b/it +\DeclareFontShape{T1}{ETbb-Inf}{bold}{n}{ + <-> \ETbb@@scale ETbb-Bold-inf-t1 }{} -\DeclareFontShape{T1}{ETbb-Inf}{b}{n}{ - <-> \ETbb@@scale ETbb-Bold-inf-t1 +\DeclareFontShape{T1}{ETbb-Inf}{bold}{sl}{ + <-> ssub * ETbb-Inf/bold/it }{} -\DeclareFontShape{T1}{ETbb-Inf}{bold}{n}{ - <-> alias * ETbb-Inf/b/n + +% ---- regular ---- + +\DeclareFontShape{T1}{ETbb-Inf}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-inf-t1 }{} -\DeclareFontShape{T1}{ETbb-Inf}{b}{sl}{ - <-> ssub * ETbb-Inf/b/it +\DeclareFontShape{T1}{ETbb-Inf}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-inf-t1 }{} -\DeclareFontShape{T1}{ETbb-Inf}{bold}{sl}{ - <-> ssub * ETbb-Inf/bold/it +\DeclareFontShape{T1}{ETbb-Inf}{regular}{sl}{ + <-> ssub * ETbb-Inf/regular/it }{} +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% -% ---- m = regular ---- +% m --> regular -\DeclareFontShape{T1}{ETbb-Inf}{m}{n}{ - <-> \ETbb@@scale ETbb-Regular-inf-t1 +\DeclareFontShape{T1}{ETbb-Inf}{m}{sl}{ + <-> alias * ETbb-Inf/regular/sl }{} -\DeclareFontShape{T1}{ETbb-Inf}{regular}{n}{ - <-> alias * ETbb-Inf/m/n +\DeclareFontShape{T1}{ETbb-Inf}{m}{n}{ + <-> alias * ETbb-Inf/regular/n }{} \DeclareFontShape{T1}{ETbb-Inf}{m}{it}{ - <-> \ETbb@@scale ETbb-Italic-inf-t1 + <-> alias * ETbb-Inf/regular/it }{} -\DeclareFontShape{T1}{ETbb-Inf}{regular}{it}{ - <-> alias * ETbb-Inf/m/it -}{} -\DeclareFontShape{T1}{ETbb-Inf}{m}{sl}{ - <-> ssub * ETbb-Inf/m/it -}{} +% b --> bold -\DeclareFontShape{T1}{ETbb-Inf}{regular}{sl}{ - <-> ssub * ETbb-Inf/regular/it +\DeclareFontShape{T1}{ETbb-Inf}{b}{n}{ + <-> alias * ETbb-Inf/bold/n }{} +\DeclareFontShape{T1}{ETbb-Inf}{b}{sl}{ + <-> alias * ETbb-Inf/bold/sl +}{} -% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- +\DeclareFontShape{T1}{ETbb-Inf}{b}{it}{ + <-> alias * ETbb-Inf/bold/it +}{} \DeclareFontShape{T1}{ETbb-Inf}{bx}{it}{ <-> ssub * ETbb-Inf/b/it diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd index 1404d80d0f5..378a6ad038a 100644 --- a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd +++ b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2021/12/18 +%% Generated by autoinst on 2020/07/01 %% \ProvidesFile{T1ETbb-Sup.fd} - [2021/12/18 (autoinst) Font definitions for T1/ETbb-Sup.] + [2020/07/01 (autoinst) Font definitions for T1/ETbb-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,72 +20,78 @@ \DeclareFontFamily{T1}{ETbb-Sup}{} -% ---- b = bold ---- +% ---- regular ---- -\DeclareFontShape{T1}{ETbb-Sup}{b}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-sup-t1 +\DeclareFontShape{T1}{ETbb-Sup}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-sup-t1 }{} -\DeclareFontShape{T1}{ETbb-Sup}{bold}{it}{ - <-> alias * ETbb-Sup/b/it +\DeclareFontShape{T1}{ETbb-Sup}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-sup-t1 }{} -\DeclareFontShape{T1}{ETbb-Sup}{b}{n}{ - <-> \ETbb@@scale ETbb-Bold-sup-t1 +\DeclareFontShape{T1}{ETbb-Sup}{regular}{sl}{ + <-> ssub * ETbb-Sup/regular/it }{} -\DeclareFontShape{T1}{ETbb-Sup}{bold}{n}{ - <-> alias * ETbb-Sup/b/n + +% ---- bold ---- + +\DeclareFontShape{T1}{ETbb-Sup}{bold}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-sup-t1 }{} -\DeclareFontShape{T1}{ETbb-Sup}{b}{sl}{ - <-> ssub * ETbb-Sup/b/it +\DeclareFontShape{T1}{ETbb-Sup}{bold}{n}{ + <-> \ETbb@@scale ETbb-Bold-sup-t1 }{} \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}{ - <-> \ETbb@@scale ETbb-Regular-sup-t1 + <-> alias * ETbb-Sup/regular/n }{} -\DeclareFontShape{T1}{ETbb-Sup}{regular}{n}{ - <-> alias * ETbb-Sup/m/n +\DeclareFontShape{T1}{ETbb-Sup}{m}{sl}{ + <-> alias * ETbb-Sup/regular/sl }{} \DeclareFontShape{T1}{ETbb-Sup}{m}{it}{ - <-> \ETbb@@scale ETbb-Italic-sup-t1 + <-> alias * ETbb-Sup/regular/it }{} -\DeclareFontShape{T1}{ETbb-Sup}{regular}{it}{ - <-> alias * ETbb-Sup/m/it -}{} -\DeclareFontShape{T1}{ETbb-Sup}{m}{sl}{ - <-> ssub * ETbb-Sup/m/it -}{} +% b --> bold -\DeclareFontShape{T1}{ETbb-Sup}{regular}{sl}{ - <-> ssub * ETbb-Sup/regular/it +\DeclareFontShape{T1}{ETbb-Sup}{b}{it}{ + <-> alias * ETbb-Sup/bold/it }{} +\DeclareFontShape{T1}{ETbb-Sup}{b}{sl}{ + <-> alias * ETbb-Sup/bold/sl +}{} -% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- +\DeclareFontShape{T1}{ETbb-Sup}{b}{n}{ + <-> alias * ETbb-Sup/bold/n +}{} -\DeclareFontShape{T1}{ETbb-Sup}{bx}{it}{ - <-> ssub * ETbb-Sup/b/it +\DeclareFontShape{T1}{ETbb-Sup}{bx}{sl}{ + <-> ssub * ETbb-Sup/b/sl }{} \DeclareFontShape{T1}{ETbb-Sup}{bx}{n}{ <-> ssub * ETbb-Sup/b/n }{} -\DeclareFontShape{T1}{ETbb-Sup}{bx}{sl}{ - <-> ssub * ETbb-Sup/b/sl +\DeclareFontShape{T1}{ETbb-Sup}{bx}{it}{ + <-> ssub * ETbb-Sup/b/it }{} \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd index 1851e429087..ad3ef7c562e 100644 --- a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd +++ b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2021/12/18 +%% Generated by autoinst on 2020/07/01 %% \ProvidesFile{TS1ETbb-LF.fd} - [2021/12/18 (autoinst) Font definitions for TS1/ETbb-LF.] + [2020/07/01 (autoinst) Font definitions for TS1/ETbb-LF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,61 +20,71 @@ \DeclareFontFamily{TS1}{ETbb-LF}{} -% ---- b = bold ---- +% ---- bold ---- -\DeclareFontShape{TS1}{ETbb-LF}{b}{n}{ - <-> \ETbb@@scale ETbb-Bold-lf-ts1 +\DeclareFontShape{TS1}{ETbb-LF}{bold}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-lf-ts1 }{} \DeclareFontShape{TS1}{ETbb-LF}{bold}{n}{ - <-> alias * ETbb-LF/b/n + <-> \ETbb@@scale ETbb-Bold-lf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-LF}{b}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-lf-ts1 +\DeclareFontShape{TS1}{ETbb-LF}{bold}{sl}{ + <-> ssub * ETbb-LF/bold/it }{} -\DeclareFontShape{TS1}{ETbb-LF}{bold}{it}{ - <-> alias * ETbb-LF/b/it + +% ---- regular ---- + +\DeclareFontShape{TS1}{ETbb-LF}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-lf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-LF}{b}{sl}{ - <-> ssub * ETbb-LF/b/it +\DeclareFontShape{TS1}{ETbb-LF}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-lf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-LF}{bold}{sl}{ - <-> ssub * ETbb-LF/bold/it +\DeclareFontShape{TS1}{ETbb-LF}{regular}{sl}{ + <-> ssub * ETbb-LF/regular/it }{} +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% -% ---- m = regular ---- +% m --> regular -\DeclareFontShape{TS1}{ETbb-LF}{m}{n}{ - <-> \ETbb@@scale ETbb-Regular-lf-ts1 +\DeclareFontShape{TS1}{ETbb-LF}{m}{it}{ + <-> alias * ETbb-LF/regular/it }{} -\DeclareFontShape{TS1}{ETbb-LF}{regular}{n}{ - <-> alias * ETbb-LF/m/n +\DeclareFontShape{TS1}{ETbb-LF}{m}{sl}{ + <-> alias * ETbb-LF/regular/sl }{} -\DeclareFontShape{TS1}{ETbb-LF}{m}{it}{ - <-> \ETbb@@scale ETbb-Italic-lf-ts1 +\DeclareFontShape{TS1}{ETbb-LF}{m}{n}{ + <-> alias * ETbb-LF/regular/n }{} -\DeclareFontShape{TS1}{ETbb-LF}{regular}{it}{ - <-> alias * ETbb-LF/m/it -}{} -\DeclareFontShape{TS1}{ETbb-LF}{m}{sl}{ - <-> ssub * ETbb-LF/m/it +% b --> bold + +\DeclareFontShape{TS1}{ETbb-LF}{b}{sl}{ + <-> alias * ETbb-LF/bold/sl }{} -\DeclareFontShape{TS1}{ETbb-LF}{regular}{sl}{ - <-> ssub * ETbb-LF/regular/it +\DeclareFontShape{TS1}{ETbb-LF}{b}{n}{ + <-> alias * ETbb-LF/bold/n }{} +\DeclareFontShape{TS1}{ETbb-LF}{b}{it}{ + <-> alias * ETbb-LF/bold/it +}{} -% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- +\DeclareFontShape{TS1}{ETbb-LF}{bx}{it}{ + <-> ssub * ETbb-LF/b/it +}{} \DeclareFontShape{TS1}{ETbb-LF}{bx}{n}{ <-> ssub * ETbb-LF/b/n @@ -84,8 +94,4 @@ <-> ssub * ETbb-LF/b/sl }{} -\DeclareFontShape{TS1}{ETbb-LF}{bx}{it}{ - <-> ssub * ETbb-LF/b/it -}{} - \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd index 780f60ed896..85e7778cbe9 100644 --- a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd +++ b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2021/12/18 +%% Generated by autoinst on 2020/07/01 %% \ProvidesFile{TS1ETbb-OsF.fd} - [2021/12/18 (autoinst) Font definitions for TS1/ETbb-OsF.] + [2020/07/01 (autoinst) Font definitions for TS1/ETbb-OsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,61 +20,71 @@ \DeclareFontFamily{TS1}{ETbb-OsF}{} -% ---- b = bold ---- +% ---- bold ---- -\DeclareFontShape{TS1}{ETbb-OsF}{b}{n}{ - <-> \ETbb@@scale ETbb-Bold-osf-ts1 +\DeclareFontShape{TS1}{ETbb-OsF}{bold}{it}{ + <-> \ETbb@@scale ETbb-BoldItalic-osf-ts1 }{} \DeclareFontShape{TS1}{ETbb-OsF}{bold}{n}{ - <-> alias * ETbb-OsF/b/n + <-> \ETbb@@scale ETbb-Bold-osf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-OsF}{b}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-osf-ts1 +\DeclareFontShape{TS1}{ETbb-OsF}{bold}{sl}{ + <-> ssub * ETbb-OsF/bold/it }{} -\DeclareFontShape{TS1}{ETbb-OsF}{bold}{it}{ - <-> alias * ETbb-OsF/b/it + +% ---- regular ---- + +\DeclareFontShape{TS1}{ETbb-OsF}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-osf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-OsF}{b}{sl}{ - <-> ssub * ETbb-OsF/b/it +\DeclareFontShape{TS1}{ETbb-OsF}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-osf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-OsF}{bold}{sl}{ - <-> ssub * ETbb-OsF/bold/it +\DeclareFontShape{TS1}{ETbb-OsF}{regular}{sl}{ + <-> ssub * ETbb-OsF/regular/it }{} +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% -% ---- m = regular ---- +% m --> regular -\DeclareFontShape{TS1}{ETbb-OsF}{m}{n}{ - <-> \ETbb@@scale ETbb-Regular-osf-ts1 +\DeclareFontShape{TS1}{ETbb-OsF}{m}{it}{ + <-> alias * ETbb-OsF/regular/it }{} -\DeclareFontShape{TS1}{ETbb-OsF}{regular}{n}{ - <-> alias * ETbb-OsF/m/n +\DeclareFontShape{TS1}{ETbb-OsF}{m}{sl}{ + <-> alias * ETbb-OsF/regular/sl }{} -\DeclareFontShape{TS1}{ETbb-OsF}{m}{it}{ - <-> \ETbb@@scale ETbb-Italic-osf-ts1 +\DeclareFontShape{TS1}{ETbb-OsF}{m}{n}{ + <-> alias * ETbb-OsF/regular/n }{} -\DeclareFontShape{TS1}{ETbb-OsF}{regular}{it}{ - <-> alias * ETbb-OsF/m/it -}{} -\DeclareFontShape{TS1}{ETbb-OsF}{m}{sl}{ - <-> ssub * ETbb-OsF/m/it +% b --> bold + +\DeclareFontShape{TS1}{ETbb-OsF}{b}{n}{ + <-> alias * ETbb-OsF/bold/n }{} -\DeclareFontShape{TS1}{ETbb-OsF}{regular}{sl}{ - <-> ssub * ETbb-OsF/regular/it +\DeclareFontShape{TS1}{ETbb-OsF}{b}{sl}{ + <-> alias * ETbb-OsF/bold/sl }{} +\DeclareFontShape{TS1}{ETbb-OsF}{b}{it}{ + <-> alias * ETbb-OsF/bold/it +}{} -% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- +\DeclareFontShape{TS1}{ETbb-OsF}{bx}{it}{ + <-> ssub * ETbb-OsF/b/it +}{} \DeclareFontShape{TS1}{ETbb-OsF}{bx}{sl}{ <-> ssub * ETbb-OsF/b/sl @@ -84,8 +94,4 @@ <-> ssub * ETbb-OsF/b/n }{} -\DeclareFontShape{TS1}{ETbb-OsF}{bx}{it}{ - <-> ssub * ETbb-OsF/b/it -}{} - \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd index 893b7aa3250..b0dc0d1af47 100644 --- a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd +++ b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2021/12/18 +%% Generated by autoinst on 2020/07/01 %% \ProvidesFile{TS1ETbb-TLF.fd} - [2021/12/18 (autoinst) Font definitions for TS1/ETbb-TLF.] + [2020/07/01 (autoinst) Font definitions for TS1/ETbb-TLF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,72 +20,78 @@ \DeclareFontFamily{TS1}{ETbb-TLF}{} -% ---- b = bold ---- +% ---- regular ---- -\DeclareFontShape{TS1}{ETbb-TLF}{b}{n}{ - <-> \ETbb@@scale ETbb-Bold-tlf-ts1 +\DeclareFontShape{TS1}{ETbb-TLF}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-tlf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-TLF}{bold}{n}{ - <-> alias * ETbb-TLF/b/n +\DeclareFontShape{TS1}{ETbb-TLF}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-tlf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-TLF}{b}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-tlf-ts1 +\DeclareFontShape{TS1}{ETbb-TLF}{regular}{sl}{ + <-> ssub * ETbb-TLF/regular/it }{} + +% ---- bold ---- + \DeclareFontShape{TS1}{ETbb-TLF}{bold}{it}{ - <-> alias * ETbb-TLF/b/it + <-> \ETbb@@scale ETbb-BoldItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-TLF}{b}{sl}{ - <-> ssub * ETbb-TLF/b/it +\DeclareFontShape{TS1}{ETbb-TLF}{bold}{n}{ + <-> \ETbb@@scale ETbb-Bold-tlf-ts1 }{} \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}{ - <-> \ETbb@@scale ETbb-Italic-tlf-ts1 -}{} - -\DeclareFontShape{TS1}{ETbb-TLF}{regular}{it}{ - <-> alias * ETbb-TLF/m/it + <-> alias * ETbb-TLF/regular/it }{} \DeclareFontShape{TS1}{ETbb-TLF}{m}{n}{ - <-> \ETbb@@scale ETbb-Regular-tlf-ts1 -}{} - -\DeclareFontShape{TS1}{ETbb-TLF}{regular}{n}{ - <-> alias * ETbb-TLF/m/n + <-> alias * ETbb-TLF/regular/n }{} \DeclareFontShape{TS1}{ETbb-TLF}{m}{sl}{ - <-> ssub * ETbb-TLF/m/it + <-> alias * ETbb-TLF/regular/sl }{} -\DeclareFontShape{TS1}{ETbb-TLF}{regular}{sl}{ - <-> ssub * ETbb-TLF/regular/it + +% b --> bold + +\DeclareFontShape{TS1}{ETbb-TLF}{b}{it}{ + <-> alias * ETbb-TLF/bold/it }{} +\DeclareFontShape{TS1}{ETbb-TLF}{b}{sl}{ + <-> alias * ETbb-TLF/bold/sl +}{} -% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- +\DeclareFontShape{TS1}{ETbb-TLF}{b}{n}{ + <-> alias * ETbb-TLF/bold/n +}{} \DeclareFontShape{TS1}{ETbb-TLF}{bx}{it}{ <-> ssub * ETbb-TLF/b/it }{} -\DeclareFontShape{TS1}{ETbb-TLF}{bx}{sl}{ - <-> ssub * ETbb-TLF/b/sl -}{} - \DeclareFontShape{TS1}{ETbb-TLF}{bx}{n}{ <-> ssub * ETbb-TLF/b/n }{} +\DeclareFontShape{TS1}{ETbb-TLF}{bx}{sl}{ + <-> ssub * ETbb-TLF/b/sl +}{} + \endinput diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd index c2ff07d4461..818b85f53ed 100644 --- a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd +++ b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2021/12/18 +%% Generated by autoinst on 2020/07/01 %% \ProvidesFile{TS1ETbb-TOsF.fd} - [2021/12/18 (autoinst) Font definitions for TS1/ETbb-TOsF.] + [2020/07/01 (autoinst) Font definitions for TS1/ETbb-TOsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,72 +20,78 @@ \DeclareFontFamily{TS1}{ETbb-TOsF}{} -% ---- b = bold ---- +% ---- regular ---- -\DeclareFontShape{TS1}{ETbb-TOsF}{b}{n}{ - <-> \ETbb@@scale ETbb-Bold-tosf-ts1 +\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{n}{ + <-> \ETbb@@scale ETbb-Regular-tosf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{n}{ - <-> alias * ETbb-TOsF/b/n +\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{it}{ + <-> \ETbb@@scale ETbb-Italic-tosf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-TOsF}{b}{it}{ - <-> \ETbb@@scale ETbb-BoldItalic-tosf-ts1 +\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{sl}{ + <-> ssub * ETbb-TOsF/regular/it }{} + +% ---- bold ---- + \DeclareFontShape{TS1}{ETbb-TOsF}{bold}{it}{ - <-> alias * ETbb-TOsF/b/it + <-> \ETbb@@scale ETbb-BoldItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{ETbb-TOsF}{b}{sl}{ - <-> ssub * ETbb-TOsF/b/it +\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{n}{ + <-> \ETbb@@scale ETbb-Bold-tosf-ts1 }{} \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}{n}{ - <-> \ETbb@@scale ETbb-Regular-tosf-ts1 +\DeclareFontShape{TS1}{ETbb-TOsF}{m}{it}{ + <-> alias * ETbb-TOsF/regular/it }{} -\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{n}{ - <-> alias * ETbb-TOsF/m/n +\DeclareFontShape{TS1}{ETbb-TOsF}{m}{sl}{ + <-> alias * ETbb-TOsF/regular/sl }{} -\DeclareFontShape{TS1}{ETbb-TOsF}{m}{it}{ - <-> \ETbb@@scale ETbb-Italic-tosf-ts1 +\DeclareFontShape{TS1}{ETbb-TOsF}{m}{n}{ + <-> alias * ETbb-TOsF/regular/n }{} -\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{it}{ - <-> alias * ETbb-TOsF/m/it -}{} -\DeclareFontShape{TS1}{ETbb-TOsF}{m}{sl}{ - <-> ssub * ETbb-TOsF/m/it -}{} +% b --> bold -\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{sl}{ - <-> ssub * ETbb-TOsF/regular/it +\DeclareFontShape{TS1}{ETbb-TOsF}{b}{n}{ + <-> alias * ETbb-TOsF/bold/n }{} +\DeclareFontShape{TS1}{ETbb-TOsF}{b}{sl}{ + <-> alias * ETbb-TOsF/bold/sl +}{} -% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- +\DeclareFontShape{TS1}{ETbb-TOsF}{b}{it}{ + <-> alias * ETbb-TOsF/bold/it +}{} -\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{n}{ - <-> ssub * ETbb-TOsF/b/n +\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{it}{ + <-> ssub * ETbb-TOsF/b/it }{} \DeclareFontShape{TS1}{ETbb-TOsF}{bx}{sl}{ <-> ssub * ETbb-TOsF/b/sl }{} -\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{it}{ - <-> ssub * ETbb-TOsF/b/it +\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{n}{ + <-> ssub * ETbb-TOsF/b/n }{} \endinput |