summaryrefslogtreecommitdiff
path: root/fonts/etbb/tex
diff options
context:
space:
mode:
Diffstat (limited to 'fonts/etbb/tex')
-rw-r--r--fonts/etbb/tex/ETbb.sty80
-rw-r--r--fonts/etbb/tex/LY1ETbb-Dnom.fd97
-rw-r--r--fonts/etbb/tex/LY1ETbb-Inf.fd40
-rw-r--r--fonts/etbb/tex/LY1ETbb-LF.fd126
-rw-r--r--fonts/etbb/tex/LY1ETbb-OsF.fd130
-rw-r--r--fonts/etbb/tex/LY1ETbb-Sup.fd36
-rw-r--r--fonts/etbb/tex/LY1ETbb-TLF.fd102
-rw-r--r--fonts/etbb/tex/LY1ETbb-TOsF.fd98
-rw-r--r--fonts/etbb/tex/OT1ETbb-Dnom.fd97
-rw-r--r--fonts/etbb/tex/OT1ETbb-Inf.fd24
-rw-r--r--fonts/etbb/tex/OT1ETbb-LF.fd126
-rw-r--r--fonts/etbb/tex/OT1ETbb-OsF.fd130
-rw-r--r--fonts/etbb/tex/OT1ETbb-Sup.fd56
-rw-r--r--fonts/etbb/tex/OT1ETbb-TLF.fd94
-rw-r--r--fonts/etbb/tex/OT1ETbb-TOsF.fd122
-rw-r--r--fonts/etbb/tex/T1ETbb-Dnom.fd97
-rw-r--r--fonts/etbb/tex/T1ETbb-Inf.fd28
-rw-r--r--fonts/etbb/tex/T1ETbb-Sup.fd44
-rw-r--r--fonts/etbb/tex/TS1ETbb-LF.fd28
-rw-r--r--fonts/etbb/tex/TS1ETbb-OsF.fd48
-rw-r--r--fonts/etbb/tex/TS1ETbb-TLF.fd20
-rw-r--r--fonts/etbb/tex/TS1ETbb-TOsF.fd56
22 files changed, 1106 insertions, 573 deletions
diff --git a/fonts/etbb/tex/ETbb.sty b/fonts/etbb/tex/ETbb.sty
index d08e27032b..2a07a8e05e 100644
--- a/fonts/etbb/tex/ETbb.sty
+++ b/fonts/etbb/tex/ETbb.sty
@@ -1,7 +1,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.01}
-\def\filedate{2020/05/03}
+\def\fileversion{1.02}
+\def\filedate{2020/05/15}
\ProvidesPackage{ETbb}
[\filedate\space v\fileversion. Style file for ETbb.]
@@ -25,8 +25,18 @@
\fontfigurestyle{inferior}\selectfont}
\DeclareTextFontCommand{\textin}{\infigures}
\let\textinferior\textin
- \providecommand*{\textfrac}[3][\ETbb@raisefrac]{%
- \raise ##1 \hbox{\textsu{##2}\kern \ETbb@foresolidus \textfractionsolidus\kern \ETbb@aftsolidus \textin{##3}}}
+ \fa@naming@exception{figures}{{denominators}{proportional}}{Dnom}
+ \fa@naming@exception{figures}{{denominators}{tabular}}{Dnom}
+ \def\defigures{\@nomath\defigures
+ \fontfigurestyle{denominators}\selectfont}
+ \DeclareTextFontCommand{\textde}{\defigures}
+ \let\denomfigures=\defigures
+ \let\textdenom\textde
+
+\providecommand*{\textfrac}[3][\ETbb@raisefrac]{%
+\tx@getL{##2}\tx@getF{##3}\leavevmode\raise ##1\hbox{\textsu{##2}\tx@Nk%
+\kern\ETbb@foresolidus%
+\textfractionsolidus\tx@Dk\kern\ETbb@aftsolidus\textde{##3}}}
}{}
@@ -51,9 +61,65 @@
\newif\if@ETbb@sharpS
\newif\if@ETbb@sups
\newif\if@ETbb@scosf
-\def\ETbb@foresolidus{-.03em}
-\def\ETbb@aftsolidus{.02em}
-\def\ETbb@raisefrac{.111em}
+% fraction macros
+\def\ETbb@foresolidus{-.05em}
+\def\ETbb@aftsolidus{-.08em}
+\def\ETbb@raisefrac{0em} %{.111em}
+%
+\def\tx@getF#1{% get first item in argument string
+\expandafter\ifblank\expandafter{#1}{\relax}{\expandafter\tx@@getF #1\@nil}}
+\def\tx@@getF#1#2\@nil{% get first item in argument string
+\tx@addDkern{#1}}
+%
+\def\tx@getL#1{%
+\expandafter\ifblank\expandafter{#1}{\relax}{\expandafter\tx@@getL #1\@nil}}
+
+\def\tx@@getL#1#2\@nil{%
+\ifblank{#2}{\tx@addNkern{#1}}{\tx@@getL #2\@nil}}
+%
+\newcommand*{\tx@addNkern}[1]{% # 1 should be a single digit
+\def\tx@Nk{}%
+\ifcase#1\relax%
+\or %1
+\def\tx@Nk{\kern-.01em}%
+\or % 2
+\def\tx@Nk{\kern.02em}% 2
+\or % 3
+\or % 4
+\def\tx@Nk{\kern-.01em}%
+\or % 5
+\or % 6
+\or % 7
+\def\tx@Nk{\kern-.08em}%
+\or % 8
+\or % 9
+\def\tx@Nk{\kern-.03em}%
+\fi%
+}
+\newcommand*{\tx@addDkern}[1]{% # 1 should be a single digit
+\def\tx@Dk{}%
+\ifcase#1\relax%
+\or%
+\def\tx@Dk{\kern.01em}% 1
+\or%
+\def\tx@Dk{\kern.02em}% 2
+\or % 3
+\or % 4
+\def\tx@Dk{\kern-.03em}%
+\or % 5
+\def\tx@Dk{\kern.03em}%
+\or % 6
+\or % 7
+\def\tx@Dk{\kern.05em}%
+\or % 8
+\or % 9
+\def\tx@Dk{\kern.04em}%
+\fi%
+}
+
+%\def\ETbb@foresolidus{-.03em}
+%\def\ETbb@aftsolidus{.02em}
+%\def\ETbb@raisefrac{.111em}
\DeclareOptionX{foresolidus}{\gdef\ETbb@foresolidus{#1}}
\DeclareOptionX{aftsolidus}{\gdef\ETbb@aftsolidus{#1}}
\DeclareOptionX{raisefrac}{\gdef\ETbb@raisefrac{#1}}
diff --git a/fonts/etbb/tex/LY1ETbb-Dnom.fd b/fonts/etbb/tex/LY1ETbb-Dnom.fd
new file mode 100644
index 0000000000..59a34e9672
--- /dev/null
+++ b/fonts/etbb/tex/LY1ETbb-Dnom.fd
@@ -0,0 +1,97 @@
+%% Generated by autoinst on 2020/05/14
+%%
+\ProvidesFile{LY1ETbb-Dnom.fd}
+ [2020/05/14 (autoinst) Font definitions for LY1/ETbb-Dnom.]
+
+\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 ETbb@scale\endcsname\relax
+ \let\ETbb@@scale\@empty
+\else
+ \edef\ETbb@@scale{s*[\csname ETbb@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{ETbb-Dnom}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{it}{
+ <-> \ETbb@@scale ETbb-BoldItalic-dnom-ly1
+}{}
+
+\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{n}{
+ <-> \ETbb@@scale ETbb-Bold-dnom-ly1
+}{}
+
+\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{sl}{
+ <-> ssub * ETbb-Dnom/bold/it
+}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{it}{
+ <-> \ETbb@@scale ETbb-Italic-dnom-ly1
+}{}
+
+\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{n}{
+ <-> \ETbb@@scale ETbb-Regular-dnom-ly1
+}{}
+
+\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
+
+\DeclareFontShape{LY1}{ETbb-Dnom}{m}{n}{
+ <-> alias * ETbb-Dnom/regular/n
+}{}
+
+\DeclareFontShape{LY1}{ETbb-Dnom}{m}{it}{
+ <-> alias * ETbb-Dnom/regular/it
+}{}
+
+\DeclareFontShape{LY1}{ETbb-Dnom}{m}{sl}{
+ <-> alias * ETbb-Dnom/regular/sl
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{LY1}{ETbb-Dnom}{b}{it}{
+ <-> alias * ETbb-Dnom/bold/it
+}{}
+
+\DeclareFontShape{LY1}{ETbb-Dnom}{b}{sl}{
+ <-> alias * ETbb-Dnom/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{ETbb-Dnom}{b}{n}{
+ <-> alias * ETbb-Dnom/bold/n
+}{}
+
+\DeclareFontShape{LY1}{ETbb-Dnom}{bx}{it}{
+ <-> ssub * ETbb-Dnom/b/it
+}{}
+
+\DeclareFontShape{LY1}{ETbb-Dnom}{bx}{sl}{
+ <-> ssub * ETbb-Dnom/b/sl
+}{}
+
+\DeclareFontShape{LY1}{ETbb-Dnom}{bx}{n}{
+ <-> ssub * ETbb-Dnom/b/n
+}{}
+
+\endinput
diff --git a/fonts/etbb/tex/LY1ETbb-Inf.fd b/fonts/etbb/tex/LY1ETbb-Inf.fd
index c28d1a3694..d6671e2fc5 100644
--- a/fonts/etbb/tex/LY1ETbb-Inf.fd
+++ b/fonts/etbb/tex/LY1ETbb-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/03
+%% Generated by autoinst on 2020/05/14
%%
\ProvidesFile{LY1ETbb-Inf.fd}
- [2020/05/03 (autoinst) Font definitions for LY1/ETbb-Inf.]
+ [2020/05/14 (autoinst) Font definitions for LY1/ETbb-Inf.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
\DeclareFontFamily{LY1}{ETbb-Inf}{}
-% ---- bold ----
+% ---- regular ----
-\DeclareFontShape{LY1}{ETbb-Inf}{bold}{it}{
- <-> \ETbb@@scale ETbb-BoldItalic-inf-ly1
+\DeclareFontShape{LY1}{ETbb-Inf}{regular}{it}{
+ <-> \ETbb@@scale ETbb-Italic-inf-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-Inf}{bold}{n}{
- <-> \ETbb@@scale ETbb-Bold-inf-ly1
+\DeclareFontShape{LY1}{ETbb-Inf}{regular}{n}{
+ <-> \ETbb@@scale ETbb-Regular-inf-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-Inf}{bold}{sl}{
- <-> ssub * ETbb-Inf/bold/it
+\DeclareFontShape{LY1}{ETbb-Inf}{regular}{sl}{
+ <-> ssub * ETbb-Inf/regular/it
}{}
-% ---- regular ----
+% ---- bold ----
-\DeclareFontShape{LY1}{ETbb-Inf}{regular}{it}{
- <-> \ETbb@@scale ETbb-Italic-inf-ly1
+\DeclareFontShape{LY1}{ETbb-Inf}{bold}{n}{
+ <-> \ETbb@@scale ETbb-Bold-inf-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-Inf}{regular}{n}{
- <-> \ETbb@@scale ETbb-Regular-inf-ly1
+\DeclareFontShape{LY1}{ETbb-Inf}{bold}{it}{
+ <-> \ETbb@@scale ETbb-BoldItalic-inf-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-Inf}{regular}{sl}{
- <-> ssub * ETbb-Inf/regular/it
+\DeclareFontShape{LY1}{ETbb-Inf}{bold}{sl}{
+ <-> ssub * ETbb-Inf/bold/it
}{}
%
@@ -70,16 +70,16 @@
% b --> bold
-\DeclareFontShape{LY1}{ETbb-Inf}{b}{sl}{
- <-> alias * ETbb-Inf/bold/sl
+\DeclareFontShape{LY1}{ETbb-Inf}{b}{n}{
+ <-> alias * ETbb-Inf/bold/n
}{}
\DeclareFontShape{LY1}{ETbb-Inf}{b}{it}{
<-> alias * ETbb-Inf/bold/it
}{}
-\DeclareFontShape{LY1}{ETbb-Inf}{b}{n}{
- <-> alias * ETbb-Inf/bold/n
+\DeclareFontShape{LY1}{ETbb-Inf}{b}{sl}{
+ <-> alias * ETbb-Inf/bold/sl
}{}
\DeclareFontShape{LY1}{ETbb-Inf}{bx}{n}{
diff --git a/fonts/etbb/tex/LY1ETbb-LF.fd b/fonts/etbb/tex/LY1ETbb-LF.fd
index 4741690b3f..cc953da870 100644
--- a/fonts/etbb/tex/LY1ETbb-LF.fd
+++ b/fonts/etbb/tex/LY1ETbb-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/03
+%% Generated by autoinst on 2020/05/14
%%
\ProvidesFile{LY1ETbb-LF.fd}
- [2020/05/03 (autoinst) Font definitions for LY1/ETbb-LF.]
+ [2020/05/14 (autoinst) Font definitions for LY1/ETbb-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,57 +20,67 @@
\DeclareFontFamily{LY1}{ETbb-LF}{}
-% ---- regular ----
+% ---- bold ----
-\DeclareFontShape{LY1}{ETbb-LF}{regular}{it}{
- <-> \ETbb@@scale ETbb-Italic-lf-ly1
+\DeclareFontShape{LY1}{ETbb-LF}{bold}{scit}{
+ <-> \ETbb@@scale ETbb-BoldItalic-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-LF}{regular}{n}{
- <-> \ETbb@@scale ETbb-Regular-lf-ly1
+\DeclareFontShape{LY1}{ETbb-LF}{bold}{n}{
+ <-> \ETbb@@scale ETbb-Bold-lf-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-LF}{regular}{sc}{
- <-> \ETbb@@scale ETbb-Regular-lf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-LF}{bold}{}{
+ <-0> \ETbb@@scale ETbb-Bold-lf-ly1
+ <0-> \ETbb@@scale ETbb-BoldItalic-lf-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-LF}{regular}{scit}{
- <-> \ETbb@@scale ETbb-Italic-lf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-LF}{bold}{sc}{
+ <-> \ETbb@@scale ETbb-Bold-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-LF}{regular}{sl}{
- <-> ssub * ETbb-LF/regular/it
+\DeclareFontShape{LY1}{ETbb-LF}{bold}{it}{
+ <-> \ETbb@@scale ETbb-BoldItalic-lf-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-LF}{regular}{scsl}{
- <-> ssub * ETbb-LF/regular/scit
+\DeclareFontShape{LY1}{ETbb-LF}{bold}{sl}{
+ <-> ssub * ETbb-LF/bold/it
}{}
+\DeclareFontShape{LY1}{ETbb-LF}{bold}{scsl}{
+ <-> ssub * ETbb-LF/bold/scit
+}{}
-% ---- bold ----
-\DeclareFontShape{LY1}{ETbb-LF}{bold}{scit}{
- <-> \ETbb@@scale ETbb-BoldItalic-lf-sc-ly1
+% ---- regular ----
+
+\DeclareFontShape{LY1}{ETbb-LF}{regular}{}{
+ <-0> \ETbb@@scale ETbb-Italic-lf-ly1
+ <0-> \ETbb@@scale ETbb-Regular-lf-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-LF}{bold}{sc}{
- <-> \ETbb@@scale ETbb-Bold-lf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-LF}{regular}{n}{
+ <-> \ETbb@@scale ETbb-Regular-lf-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-LF}{bold}{it}{
- <-> \ETbb@@scale ETbb-BoldItalic-lf-ly1
+\DeclareFontShape{LY1}{ETbb-LF}{regular}{scit}{
+ <-> \ETbb@@scale ETbb-Italic-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-LF}{bold}{n}{
- <-> \ETbb@@scale ETbb-Bold-lf-ly1
+\DeclareFontShape{LY1}{ETbb-LF}{regular}{it}{
+ <-> \ETbb@@scale ETbb-Italic-lf-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-LF}{bold}{sl}{
- <-> ssub * ETbb-LF/bold/it
+\DeclareFontShape{LY1}{ETbb-LF}{regular}{sc}{
+ <-> \ETbb@@scale ETbb-Regular-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-LF}{bold}{scsl}{
- <-> ssub * ETbb-LF/bold/scit
+\DeclareFontShape{LY1}{ETbb-LF}{regular}{sl}{
+ <-> ssub * ETbb-LF/regular/it
+}{}
+
+\DeclareFontShape{LY1}{ETbb-LF}{regular}{scsl}{
+ <-> ssub * ETbb-LF/regular/scit
}{}
%
@@ -79,43 +89,47 @@
% m --> regular
-\DeclareFontShape{LY1}{ETbb-LF}{m}{scit}{
- <-> alias * ETbb-LF/regular/scit
-}{}
-
-\DeclareFontShape{LY1}{ETbb-LF}{m}{sl}{
- <-> alias * ETbb-LF/regular/sl
+\DeclareFontShape{LY1}{ETbb-LF}{m}{}{
+ <-> alias * ETbb-LF/regular/
}{}
-\DeclareFontShape{LY1}{ETbb-LF}{m}{it}{
- <-> alias * ETbb-LF/regular/it
+\DeclareFontShape{LY1}{ETbb-LF}{m}{scsl}{
+ <-> alias * ETbb-LF/regular/scsl
}{}
\DeclareFontShape{LY1}{ETbb-LF}{m}{n}{
<-> alias * ETbb-LF/regular/n
}{}
+\DeclareFontShape{LY1}{ETbb-LF}{m}{scit}{
+ <-> alias * ETbb-LF/regular/scit
+}{}
+
+\DeclareFontShape{LY1}{ETbb-LF}{m}{it}{
+ <-> alias * ETbb-LF/regular/it
+}{}
+
\DeclareFontShape{LY1}{ETbb-LF}{m}{sc}{
<-> alias * ETbb-LF/regular/sc
}{}
-\DeclareFontShape{LY1}{ETbb-LF}{m}{scsl}{
- <-> alias * ETbb-LF/regular/scsl
+\DeclareFontShape{LY1}{ETbb-LF}{m}{sl}{
+ <-> alias * ETbb-LF/regular/sl
}{}
% b --> bold
-\DeclareFontShape{LY1}{ETbb-LF}{b}{scit}{
- <-> alias * ETbb-LF/bold/scit
+\DeclareFontShape{LY1}{ETbb-LF}{b}{}{
+ <-> alias * ETbb-LF/bold/
}{}
-\DeclareFontShape{LY1}{ETbb-LF}{b}{sl}{
- <-> alias * ETbb-LF/bold/sl
+\DeclareFontShape{LY1}{ETbb-LF}{b}{scsl}{
+ <-> alias * ETbb-LF/bold/scsl
}{}
-\DeclareFontShape{LY1}{ETbb-LF}{b}{it}{
- <-> alias * ETbb-LF/bold/it
+\DeclareFontShape{LY1}{ETbb-LF}{b}{scit}{
+ <-> alias * ETbb-LF/bold/scit
}{}
\DeclareFontShape{LY1}{ETbb-LF}{b}{n}{
@@ -126,8 +140,16 @@
<-> alias * ETbb-LF/bold/sc
}{}
-\DeclareFontShape{LY1}{ETbb-LF}{b}{scsl}{
- <-> alias * ETbb-LF/bold/scsl
+\DeclareFontShape{LY1}{ETbb-LF}{b}{sl}{
+ <-> alias * ETbb-LF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{ETbb-LF}{b}{it}{
+ <-> alias * ETbb-LF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{ETbb-LF}{bx}{sc}{
+ <-> ssub * ETbb-LF/b/sc
}{}
\DeclareFontShape{LY1}{ETbb-LF}{bx}{sl}{
@@ -138,12 +160,8 @@
<-> ssub * ETbb-LF/b/it
}{}
-\DeclareFontShape{LY1}{ETbb-LF}{bx}{n}{
- <-> ssub * ETbb-LF/b/n
-}{}
-
-\DeclareFontShape{LY1}{ETbb-LF}{bx}{sc}{
- <-> ssub * ETbb-LF/b/sc
+\DeclareFontShape{LY1}{ETbb-LF}{bx}{}{
+ <-> ssub * ETbb-LF/b/
}{}
\DeclareFontShape{LY1}{ETbb-LF}{bx}{scsl}{
@@ -154,4 +172,8 @@
<-> ssub * ETbb-LF/b/scit
}{}
+\DeclareFontShape{LY1}{ETbb-LF}{bx}{n}{
+ <-> ssub * ETbb-LF/b/n
+}{}
+
\endinput
diff --git a/fonts/etbb/tex/LY1ETbb-OsF.fd b/fonts/etbb/tex/LY1ETbb-OsF.fd
index 117140bff0..8692bfddfd 100644
--- a/fonts/etbb/tex/LY1ETbb-OsF.fd
+++ b/fonts/etbb/tex/LY1ETbb-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/03
+%% Generated by autoinst on 2020/05/14
%%
\ProvidesFile{LY1ETbb-OsF.fd}
- [2020/05/03 (autoinst) Font definitions for LY1/ETbb-OsF.]
+ [2020/05/14 (autoinst) Font definitions for LY1/ETbb-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,57 +20,67 @@
\DeclareFontFamily{LY1}{ETbb-OsF}{}
-% ---- bold ----
+% ---- regular ----
-\DeclareFontShape{LY1}{ETbb-OsF}{bold}{scit}{
- <-> \ETbb@@scale ETbb-BoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-OsF}{regular}{n}{
+ <-> \ETbb@@scale ETbb-Regular-osf-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-OsF}{bold}{sc}{
- <-> \ETbb@@scale ETbb-Bold-osf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-OsF}{regular}{scit}{
+ <-> \ETbb@@scale ETbb-Italic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-OsF}{bold}{it}{
- <-> \ETbb@@scale ETbb-BoldItalic-osf-ly1
+\DeclareFontShape{LY1}{ETbb-OsF}{regular}{}{
+ <-0> \ETbb@@scale ETbb-Italic-osf-ly1
+ <0-> \ETbb@@scale ETbb-Regular-osf-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-OsF}{bold}{n}{
- <-> \ETbb@@scale ETbb-Bold-osf-ly1
+\DeclareFontShape{LY1}{ETbb-OsF}{regular}{it}{
+ <-> \ETbb@@scale ETbb-Italic-osf-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-OsF}{bold}{sl}{
- <-> ssub * ETbb-OsF/bold/it
+\DeclareFontShape{LY1}{ETbb-OsF}{regular}{sc}{
+ <-> \ETbb@@scale ETbb-Regular-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-OsF}{bold}{scsl}{
- <-> ssub * ETbb-OsF/bold/scit
+\DeclareFontShape{LY1}{ETbb-OsF}{regular}{sl}{
+ <-> ssub * ETbb-OsF/regular/it
}{}
+\DeclareFontShape{LY1}{ETbb-OsF}{regular}{scsl}{
+ <-> ssub * ETbb-OsF/regular/scit
+}{}
-% ---- regular ----
-\DeclareFontShape{LY1}{ETbb-OsF}{regular}{scit}{
- <-> \ETbb@@scale ETbb-Italic-osf-sc-ly1
+% ---- bold ----
+
+\DeclareFontShape{LY1}{ETbb-OsF}{bold}{it}{
+ <-> \ETbb@@scale ETbb-BoldItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-OsF}{regular}{sc}{
- <-> \ETbb@@scale ETbb-Regular-osf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-OsF}{bold}{sc}{
+ <-> \ETbb@@scale ETbb-Bold-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-OsF}{regular}{it}{
- <-> \ETbb@@scale ETbb-Italic-osf-ly1
+\DeclareFontShape{LY1}{ETbb-OsF}{bold}{}{
+ <-0> \ETbb@@scale ETbb-Bold-osf-ly1
+ <0-> \ETbb@@scale ETbb-BoldItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-OsF}{regular}{n}{
- <-> \ETbb@@scale ETbb-Regular-osf-ly1
+\DeclareFontShape{LY1}{ETbb-OsF}{bold}{n}{
+ <-> \ETbb@@scale ETbb-Bold-osf-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-OsF}{regular}{sl}{
- <-> ssub * ETbb-OsF/regular/it
+\DeclareFontShape{LY1}{ETbb-OsF}{bold}{scit}{
+ <-> \ETbb@@scale ETbb-BoldItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-OsF}{regular}{scsl}{
- <-> ssub * ETbb-OsF/regular/scit
+\DeclareFontShape{LY1}{ETbb-OsF}{bold}{sl}{
+ <-> ssub * ETbb-OsF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{ETbb-OsF}{bold}{scsl}{
+ <-> ssub * ETbb-OsF/bold/scit
}{}
%
@@ -79,77 +89,89 @@
% m --> regular
-\DeclareFontShape{LY1}{ETbb-OsF}{m}{it}{
- <-> alias * ETbb-OsF/regular/it
+\DeclareFontShape{LY1}{ETbb-OsF}{m}{scit}{
+ <-> alias * ETbb-OsF/regular/scit
}{}
\DeclareFontShape{LY1}{ETbb-OsF}{m}{n}{
<-> alias * ETbb-OsF/regular/n
}{}
-\DeclareFontShape{LY1}{ETbb-OsF}{m}{sl}{
- <-> alias * ETbb-OsF/regular/sl
-}{}
-
\DeclareFontShape{LY1}{ETbb-OsF}{m}{scsl}{
<-> alias * ETbb-OsF/regular/scsl
}{}
+\DeclareFontShape{LY1}{ETbb-OsF}{m}{}{
+ <-> alias * ETbb-OsF/regular/
+}{}
+
+\DeclareFontShape{LY1}{ETbb-OsF}{m}{sl}{
+ <-> alias * ETbb-OsF/regular/sl
+}{}
+
\DeclareFontShape{LY1}{ETbb-OsF}{m}{sc}{
<-> alias * ETbb-OsF/regular/sc
}{}
-\DeclareFontShape{LY1}{ETbb-OsF}{m}{scit}{
- <-> alias * ETbb-OsF/regular/scit
+\DeclareFontShape{LY1}{ETbb-OsF}{m}{it}{
+ <-> alias * ETbb-OsF/regular/it
}{}
% b --> bold
-\DeclareFontShape{LY1}{ETbb-OsF}{b}{scit}{
- <-> alias * ETbb-OsF/bold/scit
-}{}
-
\DeclareFontShape{LY1}{ETbb-OsF}{b}{it}{
<-> alias * ETbb-OsF/bold/it
}{}
-\DeclareFontShape{LY1}{ETbb-OsF}{b}{n}{
- <-> alias * ETbb-OsF/bold/n
-}{}
-
\DeclareFontShape{LY1}{ETbb-OsF}{b}{sl}{
<-> alias * ETbb-OsF/bold/sl
}{}
-\DeclareFontShape{LY1}{ETbb-OsF}{b}{scsl}{
- <-> alias * ETbb-OsF/bold/scsl
-}{}
-
\DeclareFontShape{LY1}{ETbb-OsF}{b}{sc}{
<-> alias * ETbb-OsF/bold/sc
}{}
-\DeclareFontShape{LY1}{ETbb-OsF}{bx}{scit}{
- <-> ssub * ETbb-OsF/b/scit
+\DeclareFontShape{LY1}{ETbb-OsF}{b}{}{
+ <-> alias * ETbb-OsF/bold/
}{}
-\DeclareFontShape{LY1}{ETbb-OsF}{bx}{it}{
- <-> ssub * ETbb-OsF/b/it
+\DeclareFontShape{LY1}{ETbb-OsF}{b}{scsl}{
+ <-> alias * ETbb-OsF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{ETbb-OsF}{b}{n}{
+ <-> alias * ETbb-OsF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{ETbb-OsF}{b}{scit}{
+ <-> alias * ETbb-OsF/bold/scit
}{}
\DeclareFontShape{LY1}{ETbb-OsF}{bx}{n}{
<-> ssub * ETbb-OsF/b/n
}{}
-\DeclareFontShape{LY1}{ETbb-OsF}{bx}{sl}{
- <-> ssub * ETbb-OsF/b/sl
+\DeclareFontShape{LY1}{ETbb-OsF}{bx}{scit}{
+ <-> ssub * ETbb-OsF/b/scit
}{}
\DeclareFontShape{LY1}{ETbb-OsF}{bx}{scsl}{
<-> ssub * ETbb-OsF/b/scsl
}{}
+\DeclareFontShape{LY1}{ETbb-OsF}{bx}{}{
+ <-> ssub * ETbb-OsF/b/
+}{}
+
+\DeclareFontShape{LY1}{ETbb-OsF}{bx}{it}{
+ <-> ssub * ETbb-OsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{ETbb-OsF}{bx}{sl}{
+ <-> ssub * ETbb-OsF/b/sl
+}{}
+
\DeclareFontShape{LY1}{ETbb-OsF}{bx}{sc}{
<-> ssub * ETbb-OsF/b/sc
}{}
diff --git a/fonts/etbb/tex/LY1ETbb-Sup.fd b/fonts/etbb/tex/LY1ETbb-Sup.fd
index 12fed25771..c8adfdbb34 100644
--- a/fonts/etbb/tex/LY1ETbb-Sup.fd
+++ b/fonts/etbb/tex/LY1ETbb-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/03
+%% Generated by autoinst on 2020/05/14
%%
\ProvidesFile{LY1ETbb-Sup.fd}
- [2020/05/03 (autoinst) Font definitions for LY1/ETbb-Sup.]
+ [2020/05/14 (autoinst) Font definitions for LY1/ETbb-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,14 @@
% ---- bold ----
-\DeclareFontShape{LY1}{ETbb-Sup}{bold}{n}{
- <-> \ETbb@@scale ETbb-Bold-sup-ly1
-}{}
-
\DeclareFontShape{LY1}{ETbb-Sup}{bold}{it}{
<-> \ETbb@@scale ETbb-BoldItalic-sup-ly1
}{}
+\DeclareFontShape{LY1}{ETbb-Sup}{bold}{n}{
+ <-> \ETbb@@scale ETbb-Bold-sup-ly1
+}{}
+
\DeclareFontShape{LY1}{ETbb-Sup}{bold}{sl}{
<-> ssub * ETbb-Sup/bold/it
}{}
@@ -55,10 +55,6 @@
% m --> regular
-\DeclareFontShape{LY1}{ETbb-Sup}{m}{sl}{
- <-> alias * ETbb-Sup/regular/sl
-}{}
-
\DeclareFontShape{LY1}{ETbb-Sup}{m}{n}{
<-> alias * ETbb-Sup/regular/n
}{}
@@ -67,31 +63,35 @@
<-> alias * ETbb-Sup/regular/it
}{}
+\DeclareFontShape{LY1}{ETbb-Sup}{m}{sl}{
+ <-> alias * ETbb-Sup/regular/sl
+}{}
+
% b --> bold
-\DeclareFontShape{LY1}{ETbb-Sup}{b}{n}{
- <-> alias * ETbb-Sup/bold/n
+\DeclareFontShape{LY1}{ETbb-Sup}{b}{sl}{
+ <-> alias * ETbb-Sup/bold/sl
}{}
\DeclareFontShape{LY1}{ETbb-Sup}{b}{it}{
<-> alias * ETbb-Sup/bold/it
}{}
-\DeclareFontShape{LY1}{ETbb-Sup}{b}{sl}{
- <-> alias * ETbb-Sup/bold/sl
+\DeclareFontShape{LY1}{ETbb-Sup}{b}{n}{
+ <-> alias * ETbb-Sup/bold/n
}{}
-\DeclareFontShape{LY1}{ETbb-Sup}{bx}{n}{
- <-> ssub * ETbb-Sup/b/n
+\DeclareFontShape{LY1}{ETbb-Sup}{bx}{sl}{
+ <-> ssub * ETbb-Sup/b/sl
}{}
\DeclareFontShape{LY1}{ETbb-Sup}{bx}{it}{
<-> ssub * ETbb-Sup/b/it
}{}
-\DeclareFontShape{LY1}{ETbb-Sup}{bx}{sl}{
- <-> ssub * ETbb-Sup/b/sl
+\DeclareFontShape{LY1}{ETbb-Sup}{bx}{n}{
+ <-> ssub * ETbb-Sup/b/n
}{}
\endinput
diff --git a/fonts/etbb/tex/LY1ETbb-TLF.fd b/fonts/etbb/tex/LY1ETbb-TLF.fd
index cd8ef9481f..a0a8068de9 100644
--- a/fonts/etbb/tex/LY1ETbb-TLF.fd
+++ b/fonts/etbb/tex/LY1ETbb-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/03
+%% Generated by autoinst on 2020/05/14
%%
\ProvidesFile{LY1ETbb-TLF.fd}
- [2020/05/03 (autoinst) Font definitions for LY1/ETbb-TLF.]
+ [2020/05/14 (autoinst) Font definitions for LY1/ETbb-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,22 +22,27 @@
% ---- regular ----
-\DeclareFontShape{LY1}{ETbb-TLF}{regular}{scit}{
- <-> \ETbb@@scale ETbb-Italic-tlf-sc-ly1
-}{}
-
\DeclareFontShape{LY1}{ETbb-TLF}{regular}{sc}{
<-> \ETbb@@scale ETbb-Regular-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-TLF}{regular}{n}{
- <-> \ETbb@@scale ETbb-Regular-tlf-ly1
-}{}
-
\DeclareFontShape{LY1}{ETbb-TLF}{regular}{it}{
<-> \ETbb@@scale ETbb-Italic-tlf-ly1
}{}
+\DeclareFontShape{LY1}{ETbb-TLF}{regular}{}{
+ <-0> \ETbb@@scale ETbb-Italic-tlf-ly1
+ <0-> \ETbb@@scale ETbb-Regular-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TLF}{regular}{scit}{
+ <-> \ETbb@@scale ETbb-Italic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TLF}{regular}{n}{
+ <-> \ETbb@@scale ETbb-Regular-tlf-ly1
+}{}
+
\DeclareFontShape{LY1}{ETbb-TLF}{regular}{sl}{
<-> ssub * ETbb-TLF/regular/it
}{}
@@ -49,20 +54,25 @@
% ---- bold ----
-\DeclareFontShape{LY1}{ETbb-TLF}{bold}{it}{
- <-> \ETbb@@scale ETbb-BoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{scit}{
+ <-> \ETbb@@scale ETbb-BoldItalic-tlf-sc-ly1
}{}
\DeclareFontShape{LY1}{ETbb-TLF}{bold}{n}{
<-> \ETbb@@scale ETbb-Bold-tlf-ly1
}{}
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{}{
+ <-0> \ETbb@@scale ETbb-Bold-tlf-ly1
+ <0-> \ETbb@@scale ETbb-BoldItalic-tlf-ly1
+}{}
+
\DeclareFontShape{LY1}{ETbb-TLF}{bold}{sc}{
<-> \ETbb@@scale ETbb-Bold-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-TLF}{bold}{scit}{
- <-> \ETbb@@scale ETbb-BoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{it}{
+ <-> \ETbb@@scale ETbb-BoldItalic-tlf-ly1
}{}
\DeclareFontShape{LY1}{ETbb-TLF}{bold}{sl}{
@@ -79,79 +89,91 @@
% m --> regular
-\DeclareFontShape{LY1}{ETbb-TLF}{m}{sl}{
- <-> alias * ETbb-TLF/regular/sl
+\DeclareFontShape{LY1}{ETbb-TLF}{m}{}{
+ <-> alias * ETbb-TLF/regular/
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TLF}{m}{scsl}{
+ <-> alias * ETbb-TLF/regular/scsl
}{}
\DeclareFontShape{LY1}{ETbb-TLF}{m}{n}{
<-> alias * ETbb-TLF/regular/n
}{}
-\DeclareFontShape{LY1}{ETbb-TLF}{m}{it}{
- <-> alias * ETbb-TLF/regular/it
+\DeclareFontShape{LY1}{ETbb-TLF}{m}{scit}{
+ <-> alias * ETbb-TLF/regular/scit
}{}
-\DeclareFontShape{LY1}{ETbb-TLF}{m}{sc}{
- <-> alias * ETbb-TLF/regular/sc
+\DeclareFontShape{LY1}{ETbb-TLF}{m}{it}{
+ <-> alias * ETbb-TLF/regular/it
}{}
-\DeclareFontShape{LY1}{ETbb-TLF}{m}{scsl}{
- <-> alias * ETbb-TLF/regular/scsl
+\DeclareFontShape{LY1}{ETbb-TLF}{m}{sl}{
+ <-> alias * ETbb-TLF/regular/sl
}{}
-\DeclareFontShape{LY1}{ETbb-TLF}{m}{scit}{
- <-> alias * ETbb-TLF/regular/scit
+\DeclareFontShape{LY1}{ETbb-TLF}{m}{sc}{
+ <-> alias * ETbb-TLF/regular/sc
}{}
% b --> bold
+\DeclareFontShape{LY1}{ETbb-TLF}{b}{n}{
+ <-> alias * ETbb-TLF/bold/n
+}{}
+
\DeclareFontShape{LY1}{ETbb-TLF}{b}{scit}{
<-> alias * ETbb-TLF/bold/scit
}{}
-\DeclareFontShape{LY1}{ETbb-TLF}{b}{sl}{
- <-> alias * ETbb-TLF/bold/sl
+\DeclareFontShape{LY1}{ETbb-TLF}{b}{scsl}{
+ <-> alias * ETbb-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TLF}{b}{}{
+ <-> alias * ETbb-TLF/bold/
}{}
\DeclareFontShape{LY1}{ETbb-TLF}{b}{it}{
<-> alias * ETbb-TLF/bold/it
}{}
-\DeclareFontShape{LY1}{ETbb-TLF}{b}{n}{
- <-> alias * ETbb-TLF/bold/n
+\DeclareFontShape{LY1}{ETbb-TLF}{b}{sl}{
+ <-> alias * ETbb-TLF/bold/sl
}{}
\DeclareFontShape{LY1}{ETbb-TLF}{b}{sc}{
<-> alias * ETbb-TLF/bold/sc
}{}
-\DeclareFontShape{LY1}{ETbb-TLF}{b}{scsl}{
- <-> alias * ETbb-TLF/bold/scsl
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{sc}{
+ <-> ssub * ETbb-TLF/b/sc
}{}
-\DeclareFontShape{LY1}{ETbb-TLF}{bx}{scit}{
- <-> ssub * ETbb-TLF/b/scit
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{sl}{
+ <-> ssub * ETbb-TLF/b/sl
}{}
-\DeclareFontShape{LY1}{ETbb-TLF}{bx}{sc}{
- <-> ssub * ETbb-TLF/b/sc
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{it}{
+ <-> ssub * ETbb-TLF/b/it
}{}
\DeclareFontShape{LY1}{ETbb-TLF}{bx}{scsl}{
<-> ssub * ETbb-TLF/b/scsl
}{}
-\DeclareFontShape{LY1}{ETbb-TLF}{bx}{sl}{
- <-> ssub * ETbb-TLF/b/sl
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{}{
+ <-> ssub * ETbb-TLF/b/
}{}
-\DeclareFontShape{LY1}{ETbb-TLF}{bx}{n}{
- <-> ssub * ETbb-TLF/b/n
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{scit}{
+ <-> ssub * ETbb-TLF/b/scit
}{}
-\DeclareFontShape{LY1}{ETbb-TLF}{bx}{it}{
- <-> ssub * ETbb-TLF/b/it
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{n}{
+ <-> ssub * ETbb-TLF/b/n
}{}
\endinput
diff --git a/fonts/etbb/tex/LY1ETbb-TOsF.fd b/fonts/etbb/tex/LY1ETbb-TOsF.fd
index 7dc159599c..d1d8b5b3ec 100644
--- a/fonts/etbb/tex/LY1ETbb-TOsF.fd
+++ b/fonts/etbb/tex/LY1ETbb-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/03
+%% Generated by autoinst on 2020/05/14
%%
\ProvidesFile{LY1ETbb-TOsF.fd}
- [2020/05/03 (autoinst) Font definitions for LY1/ETbb-TOsF.]
+ [2020/05/14 (autoinst) Font definitions for LY1/ETbb-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,10 +22,6 @@
% ---- regular ----
-\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{n}{
- <-> \ETbb@@scale ETbb-Regular-tosf-ly1
-}{}
-
\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{it}{
<-> \ETbb@@scale ETbb-Italic-tosf-ly1
}{}
@@ -34,10 +30,19 @@
<-> \ETbb@@scale ETbb-Regular-tosf-sc-ly1
}{}
+\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{n}{
+ <-> \ETbb@@scale ETbb-Regular-tosf-ly1
+}{}
+
\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{scit}{
<-> \ETbb@@scale ETbb-Italic-tosf-sc-ly1
}{}
+\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{}{
+ <-0> \ETbb@@scale ETbb-Italic-tosf-ly1
+ <0-> \ETbb@@scale ETbb-Regular-tosf-ly1
+}{}
+
\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{sl}{
<-> ssub * ETbb-TOsF/regular/it
}{}
@@ -49,20 +54,25 @@
% ---- bold ----
-\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{sc}{
- <-> \ETbb@@scale ETbb-Bold-tosf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{scit}{
+ <-> \ETbb@@scale ETbb-BoldItalic-tosf-sc-ly1
}{}
\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{n}{
<-> \ETbb@@scale ETbb-Bold-tosf-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{it}{
- <-> \ETbb@@scale ETbb-BoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{}{
+ <-0> \ETbb@@scale ETbb-Bold-tosf-ly1
+ <0-> \ETbb@@scale ETbb-BoldItalic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{scit}{
- <-> \ETbb@@scale ETbb-BoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{sc}{
+ <-> \ETbb@@scale ETbb-Bold-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{it}{
+ <-> \ETbb@@scale ETbb-BoldItalic-tosf-ly1
}{}
\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{sl}{
@@ -79,79 +89,91 @@
% m --> regular
-\DeclareFontShape{LY1}{ETbb-TOsF}{m}{scit}{
- <-> alias * ETbb-TOsF/regular/scit
+\DeclareFontShape{LY1}{ETbb-TOsF}{m}{it}{
+ <-> alias * ETbb-TOsF/regular/it
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TOsF}{m}{sl}{
+ <-> alias * ETbb-TOsF/regular/sl
}{}
\DeclareFontShape{LY1}{ETbb-TOsF}{m}{sc}{
<-> alias * ETbb-TOsF/regular/sc
}{}
-\DeclareFontShape{LY1}{ETbb-TOsF}{m}{scsl}{
- <-> alias * ETbb-TOsF/regular/scsl
+\DeclareFontShape{LY1}{ETbb-TOsF}{m}{n}{
+ <-> alias * ETbb-TOsF/regular/n
}{}
-\DeclareFontShape{LY1}{ETbb-TOsF}{m}{sl}{
- <-> alias * ETbb-TOsF/regular/sl
+\DeclareFontShape{LY1}{ETbb-TOsF}{m}{scit}{
+ <-> alias * ETbb-TOsF/regular/scit
}{}
-\DeclareFontShape{LY1}{ETbb-TOsF}{m}{n}{
- <-> alias * ETbb-TOsF/regular/n
+\DeclareFontShape{LY1}{ETbb-TOsF}{m}{scsl}{
+ <-> alias * ETbb-TOsF/regular/scsl
}{}
-\DeclareFontShape{LY1}{ETbb-TOsF}{m}{it}{
- <-> alias * ETbb-TOsF/regular/it
+\DeclareFontShape{LY1}{ETbb-TOsF}{m}{}{
+ <-> alias * ETbb-TOsF/regular/
}{}
% b --> bold
-\DeclareFontShape{LY1}{ETbb-TOsF}{b}{scit}{
- <-> alias * ETbb-TOsF/bold/scit
-}{}
-
\DeclareFontShape{LY1}{ETbb-TOsF}{b}{sl}{
<-> alias * ETbb-TOsF/bold/sl
}{}
-\DeclareFontShape{LY1}{ETbb-TOsF}{b}{n}{
- <-> alias * ETbb-TOsF/bold/n
+\DeclareFontShape{LY1}{ETbb-TOsF}{b}{sc}{
+ <-> alias * ETbb-TOsF/bold/sc
}{}
\DeclareFontShape{LY1}{ETbb-TOsF}{b}{it}{
<-> alias * ETbb-TOsF/bold/it
}{}
-\DeclareFontShape{LY1}{ETbb-TOsF}{b}{sc}{
- <-> alias * ETbb-TOsF/bold/sc
+\DeclareFontShape{LY1}{ETbb-TOsF}{b}{}{
+ <-> alias * ETbb-TOsF/bold/
}{}
\DeclareFontShape{LY1}{ETbb-TOsF}{b}{scsl}{
<-> alias * ETbb-TOsF/bold/scsl
}{}
-\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{scit}{
- <-> ssub * ETbb-TOsF/b/scit
+\DeclareFontShape{LY1}{ETbb-TOsF}{b}{scit}{
+ <-> alias * ETbb-TOsF/bold/scit
}{}
-\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{n}{
- <-> ssub * ETbb-TOsF/b/n
+\DeclareFontShape{LY1}{ETbb-TOsF}{b}{n}{
+ <-> alias * ETbb-TOsF/bold/n
}{}
-\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{it}{
- <-> ssub * ETbb-TOsF/b/it
+\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{sc}{
+ <-> ssub * ETbb-TOsF/b/sc
}{}
\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{sl}{
<-> ssub * ETbb-TOsF/b/sl
}{}
+\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{it}{
+ <-> ssub * ETbb-TOsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{scit}{
+ <-> ssub * ETbb-TOsF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{n}{
+ <-> ssub * ETbb-TOsF/b/n
+}{}
+
\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{scsl}{
<-> ssub * ETbb-TOsF/b/scsl
}{}
-\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{sc}{
- <-> ssub * ETbb-TOsF/b/sc
+\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{}{
+ <-> ssub * ETbb-TOsF/b/
}{}
\endinput
diff --git a/fonts/etbb/tex/OT1ETbb-Dnom.fd b/fonts/etbb/tex/OT1ETbb-Dnom.fd
new file mode 100644
index 0000000000..add9c09108
--- /dev/null
+++ b/fonts/etbb/tex/OT1ETbb-Dnom.fd
@@ -0,0 +1,97 @@
+%% Generated by autoinst on 2020/05/14
+%%
+\ProvidesFile{OT1ETbb-Dnom.fd}
+ [2020/05/14 (autoinst) Font definitions for OT1/ETbb-Dnom.]
+
+\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 ETbb@scale\endcsname\relax
+ \let\ETbb@@scale\@empty
+\else
+ \edef\ETbb@@scale{s*[\csname ETbb@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{ETbb-Dnom}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{it}{
+ <-> \ETbb@@scale ETbb-BoldItalic-dnom-ot1
+}{}
+
+\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{n}{
+ <-> \ETbb@@scale ETbb-Bold-dnom-ot1
+}{}
+
+\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{sl}{
+ <-> ssub * ETbb-Dnom/bold/it
+}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{n}{
+ <-> \ETbb@@scale ETbb-Regular-dnom-ot1
+}{}
+
+\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{it}{
+ <-> \ETbb@@scale ETbb-Italic-dnom-ot1
+}{}
+
+\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{sl}{
+ <-> ssub * ETbb-Dnom/regular/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{OT1}{ETbb-Dnom}{m}{n}{
+ <-> alias * ETbb-Dnom/regular/n
+}{}
+
+\DeclareFontShape{OT1}{ETbb-Dnom}{m}{sl}{
+ <-> alias * ETbb-Dnom/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{ETbb-Dnom}{m}{it}{
+ <-> alias * ETbb-Dnom/regular/it
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{OT1}{ETbb-Dnom}{b}{sl}{
+ <-> alias * ETbb-Dnom/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{ETbb-Dnom}{b}{it}{
+ <-> alias * ETbb-Dnom/bold/it
+}{}
+
+\DeclareFontShape{OT1}{ETbb-Dnom}{b}{n}{
+ <-> alias * ETbb-Dnom/bold/n
+}{}
+
+\DeclareFontShape{OT1}{ETbb-Dnom}{bx}{n}{
+ <-> ssub * ETbb-Dnom/b/n
+}{}
+
+\DeclareFontShape{OT1}{ETbb-Dnom}{bx}{sl}{
+ <-> 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 2c9b6be305..27aab4ece9 100644
--- a/fonts/etbb/tex/OT1ETbb-Inf.fd
+++ b/fonts/etbb/tex/OT1ETbb-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/03
+%% Generated by autoinst on 2020/05/14
%%
\ProvidesFile{OT1ETbb-Inf.fd}
- [2020/05/03 (autoinst) Font definitions for OT1/ETbb-Inf.]
+ [2020/05/14 (autoinst) Font definitions for OT1/ETbb-Inf.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -55,14 +55,14 @@
% m --> regular
-\DeclareFontShape{OT1}{ETbb-Inf}{m}{sl}{
- <-> alias * ETbb-Inf/regular/sl
-}{}
-
\DeclareFontShape{OT1}{ETbb-Inf}{m}{n}{
<-> alias * ETbb-Inf/regular/n
}{}
+\DeclareFontShape{OT1}{ETbb-Inf}{m}{sl}{
+ <-> alias * ETbb-Inf/regular/sl
+}{}
+
\DeclareFontShape{OT1}{ETbb-Inf}{m}{it}{
<-> alias * ETbb-Inf/regular/it
}{}
@@ -74,22 +74,22 @@
<-> alias * ETbb-Inf/bold/sl
}{}
-\DeclareFontShape{OT1}{ETbb-Inf}{b}{n}{
- <-> alias * ETbb-Inf/bold/n
-}{}
-
\DeclareFontShape{OT1}{ETbb-Inf}{b}{it}{
<-> alias * ETbb-Inf/bold/it
}{}
-\DeclareFontShape{OT1}{ETbb-Inf}{bx}{sl}{
- <-> ssub * ETbb-Inf/b/sl
+\DeclareFontShape{OT1}{ETbb-Inf}{b}{n}{
+ <-> alias * ETbb-Inf/bold/n
}{}
\DeclareFontShape{OT1}{ETbb-Inf}{bx}{n}{
<-> ssub * ETbb-Inf/b/n
}{}
+\DeclareFontShape{OT1}{ETbb-Inf}{bx}{sl}{
+ <-> ssub * ETbb-Inf/b/sl
+}{}
+
\DeclareFontShape{OT1}{ETbb-Inf}{bx}{it}{
<-> ssub * ETbb-Inf/b/it
}{}
diff --git a/fonts/etbb/tex/OT1ETbb-LF.fd b/fonts/etbb/tex/OT1ETbb-LF.fd
index c60a2ee5ef..72514bd1be 100644
--- a/fonts/etbb/tex/OT1ETbb-LF.fd
+++ b/fonts/etbb/tex/OT1ETbb-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/03
+%% Generated by autoinst on 2020/05/14
%%
\ProvidesFile{OT1ETbb-LF.fd}
- [2020/05/03 (autoinst) Font definitions for OT1/ETbb-LF.]
+ [2020/05/14 (autoinst) Font definitions for OT1/ETbb-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,57 +20,67 @@
\DeclareFontFamily{OT1}{ETbb-LF}{}
-% ---- bold ----
+% ---- regular ----
-\DeclareFontShape{OT1}{ETbb-LF}{bold}{scit}{
- <-> \ETbb@@scale ETbb-BoldItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{it}{
+ <-> \ETbb@@scale ETbb-Italic-lf-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-LF}{bold}{n}{
- <-> \ETbb@@scale ETbb-Bold-lf-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{sc}{
+ <-> \ETbb@@scale ETbb-Regular-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-LF}{bold}{it}{
- <-> \ETbb@@scale ETbb-BoldItalic-lf-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{}{
+ <-0> \ETbb@@scale ETbb-Italic-lf-ot1
+ <0-> \ETbb@@scale ETbb-Regular-lf-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-LF}{bold}{sc}{
- <-> \ETbb@@scale ETbb-Bold-lf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{n}{
+ <-> \ETbb@@scale ETbb-Regular-lf-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-LF}{bold}{sl}{
- <-> ssub * ETbb-LF/bold/it
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{scit}{
+ <-> \ETbb@@scale ETbb-Italic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-LF}{bold}{scsl}{
- <-> ssub * ETbb-LF/bold/scit
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{sl}{
+ <-> ssub * ETbb-LF/regular/it
}{}
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{scsl}{
+ <-> ssub * ETbb-LF/regular/scit
+}{}
-% ---- regular ----
-\DeclareFontShape{OT1}{ETbb-LF}{regular}{scit}{
- <-> \ETbb@@scale ETbb-Italic-lf-sc-ot1
+% ---- bold ----
+
+\DeclareFontShape{OT1}{ETbb-LF}{bold}{n}{
+ <-> \ETbb@@scale ETbb-Bold-lf-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-LF}{regular}{sc}{
- <-> \ETbb@@scale ETbb-Regular-lf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{bold}{scit}{
+ <-> \ETbb@@scale ETbb-BoldItalic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-LF}{regular}{it}{
- <-> \ETbb@@scale ETbb-Italic-lf-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{bold}{}{
+ <-0> \ETbb@@scale ETbb-Bold-lf-ot1
+ <0-> \ETbb@@scale ETbb-BoldItalic-lf-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-LF}{regular}{n}{
- <-> \ETbb@@scale ETbb-Regular-lf-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{bold}{it}{
+ <-> \ETbb@@scale ETbb-BoldItalic-lf-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-LF}{regular}{sl}{
- <-> ssub * ETbb-LF/regular/it
+\DeclareFontShape{OT1}{ETbb-LF}{bold}{sc}{
+ <-> \ETbb@@scale ETbb-Bold-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-LF}{regular}{scsl}{
- <-> ssub * ETbb-LF/regular/scit
+\DeclareFontShape{OT1}{ETbb-LF}{bold}{sl}{
+ <-> ssub * ETbb-LF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{ETbb-LF}{bold}{scsl}{
+ <-> ssub * ETbb-LF/bold/scit
}{}
%
@@ -79,79 +89,91 @@
% m --> regular
-\DeclareFontShape{OT1}{ETbb-LF}{m}{scit}{
- <-> alias * ETbb-LF/regular/scit
-}{}
-
\DeclareFontShape{OT1}{ETbb-LF}{m}{it}{
<-> alias * ETbb-LF/regular/it
}{}
-\DeclareFontShape{OT1}{ETbb-LF}{m}{n}{
- <-> alias * ETbb-LF/regular/n
+\DeclareFontShape{OT1}{ETbb-LF}{m}{sc}{
+ <-> alias * ETbb-LF/regular/sc
}{}
\DeclareFontShape{OT1}{ETbb-LF}{m}{sl}{
<-> alias * ETbb-LF/regular/sl
}{}
+\DeclareFontShape{OT1}{ETbb-LF}{m}{n}{
+ <-> alias * ETbb-LF/regular/n
+}{}
+
+\DeclareFontShape{OT1}{ETbb-LF}{m}{scit}{
+ <-> alias * ETbb-LF/regular/scit
+}{}
+
\DeclareFontShape{OT1}{ETbb-LF}{m}{scsl}{
<-> alias * ETbb-LF/regular/scsl
}{}
-\DeclareFontShape{OT1}{ETbb-LF}{m}{sc}{
- <-> alias * ETbb-LF/regular/sc
+\DeclareFontShape{OT1}{ETbb-LF}{m}{}{
+ <-> alias * ETbb-LF/regular/
}{}
% b --> bold
-\DeclareFontShape{OT1}{ETbb-LF}{b}{scit}{
- <-> alias * ETbb-LF/bold/scit
-}{}
-
\DeclareFontShape{OT1}{ETbb-LF}{b}{sl}{
<-> alias * ETbb-LF/bold/sl
}{}
-\DeclareFontShape{OT1}{ETbb-LF}{b}{n}{
- <-> alias * ETbb-LF/bold/n
+\DeclareFontShape{OT1}{ETbb-LF}{b}{sc}{
+ <-> alias * ETbb-LF/bold/sc
}{}
\DeclareFontShape{OT1}{ETbb-LF}{b}{it}{
<-> alias * ETbb-LF/bold/it
}{}
-\DeclareFontShape{OT1}{ETbb-LF}{b}{sc}{
- <-> alias * ETbb-LF/bold/sc
+\DeclareFontShape{OT1}{ETbb-LF}{b}{}{
+ <-> alias * ETbb-LF/bold/
}{}
\DeclareFontShape{OT1}{ETbb-LF}{b}{scsl}{
<-> alias * ETbb-LF/bold/scsl
}{}
-\DeclareFontShape{OT1}{ETbb-LF}{bx}{n}{
- <-> ssub * ETbb-LF/b/n
+\DeclareFontShape{OT1}{ETbb-LF}{b}{scit}{
+ <-> alias * ETbb-LF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{ETbb-LF}{b}{n}{
+ <-> alias * ETbb-LF/bold/n
}{}
\DeclareFontShape{OT1}{ETbb-LF}{bx}{it}{
<-> ssub * ETbb-LF/b/it
}{}
-\DeclareFontShape{OT1}{ETbb-LF}{bx}{sl}{
- <-> ssub * ETbb-LF/b/sl
+\DeclareFontShape{OT1}{ETbb-LF}{bx}{sc}{
+ <-> ssub * ETbb-LF/b/sc
}{}
-\DeclareFontShape{OT1}{ETbb-LF}{bx}{scsl}{
- <-> ssub * ETbb-LF/b/scsl
+\DeclareFontShape{OT1}{ETbb-LF}{bx}{sl}{
+ <-> ssub * ETbb-LF/b/sl
}{}
-\DeclareFontShape{OT1}{ETbb-LF}{bx}{sc}{
- <-> ssub * ETbb-LF/b/sc
+\DeclareFontShape{OT1}{ETbb-LF}{bx}{n}{
+ <-> ssub * ETbb-LF/b/n
}{}
\DeclareFontShape{OT1}{ETbb-LF}{bx}{scit}{
<-> ssub * ETbb-LF/b/scit
}{}
+\DeclareFontShape{OT1}{ETbb-LF}{bx}{}{
+ <-> ssub * ETbb-LF/b/
+}{}
+
+\DeclareFontShape{OT1}{ETbb-LF}{bx}{scsl}{
+ <-> ssub * ETbb-LF/b/scsl
+}{}
+
\endinput
diff --git a/fonts/etbb/tex/OT1ETbb-OsF.fd b/fonts/etbb/tex/OT1ETbb-OsF.fd
index 030ee53846..35c9ffcd90 100644
--- a/fonts/etbb/tex/OT1ETbb-OsF.fd
+++ b/fonts/etbb/tex/OT1ETbb-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/03
+%% Generated by autoinst on 2020/05/14
%%
\ProvidesFile{OT1ETbb-OsF.fd}
- [2020/05/03 (autoinst) Font definitions for OT1/ETbb-OsF.]
+ [2020/05/14 (autoinst) Font definitions for OT1/ETbb-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,57 +20,67 @@
\DeclareFontFamily{OT1}{ETbb-OsF}{}
-% ---- regular ----
+% ---- bold ----
-\DeclareFontShape{OT1}{ETbb-OsF}{regular}{n}{
- <-> \ETbb@@scale ETbb-Regular-osf-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{sc}{
+ <-> \ETbb@@scale ETbb-Bold-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-OsF}{regular}{it}{
- <-> \ETbb@@scale ETbb-Italic-osf-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{it}{
+ <-> \ETbb@@scale ETbb-BoldItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-OsF}{regular}{sc}{
- <-> \ETbb@@scale ETbb-Regular-osf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{}{
+ <-0> \ETbb@@scale ETbb-Bold-osf-ot1
+ <0-> \ETbb@@scale ETbb-BoldItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-OsF}{regular}{scit}{
- <-> \ETbb@@scale ETbb-Italic-osf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{scit}{
+ <-> \ETbb@@scale ETbb-BoldItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-OsF}{regular}{sl}{
- <-> ssub * ETbb-OsF/regular/it
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{n}{
+ <-> \ETbb@@scale ETbb-Bold-osf-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-OsF}{regular}{scsl}{
- <-> ssub * ETbb-OsF/regular/scit
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{sl}{
+ <-> ssub * ETbb-OsF/bold/it
}{}
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{scsl}{
+ <-> ssub * ETbb-OsF/bold/scit
+}{}
-% ---- bold ----
-\DeclareFontShape{OT1}{ETbb-OsF}{bold}{scit}{
- <-> \ETbb@@scale ETbb-BoldItalic-osf-sc-ot1
+% ---- regular ----
+
+\DeclareFontShape{OT1}{ETbb-OsF}{regular}{it}{
+ <-> \ETbb@@scale ETbb-Italic-osf-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-OsF}{bold}{n}{
- <-> \ETbb@@scale ETbb-Bold-osf-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{regular}{sc}{
+ <-> \ETbb@@scale ETbb-Regular-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-OsF}{bold}{it}{
- <-> \ETbb@@scale ETbb-BoldItalic-osf-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{regular}{n}{
+ <-> \ETbb@@scale ETbb-Regular-osf-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-OsF}{bold}{sc}{
- <-> \ETbb@@scale ETbb-Bold-osf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{regular}{scit}{
+ <-> \ETbb@@scale ETbb-Italic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-OsF}{bold}{sl}{
- <-> ssub * ETbb-OsF/bold/it
+\DeclareFontShape{OT1}{ETbb-OsF}{regular}{}{
+ <-0> \ETbb@@scale ETbb-Italic-osf-ot1
+ <0-> \ETbb@@scale ETbb-Regular-osf-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-OsF}{bold}{scsl}{
- <-> ssub * ETbb-OsF/bold/scit
+\DeclareFontShape{OT1}{ETbb-OsF}{regular}{sl}{
+ <-> ssub * ETbb-OsF/regular/it
+}{}
+
+\DeclareFontShape{OT1}{ETbb-OsF}{regular}{scsl}{
+ <-> ssub * ETbb-OsF/regular/scit
}{}
%
@@ -79,79 +89,91 @@
% m --> regular
-\DeclareFontShape{OT1}{ETbb-OsF}{m}{sl}{
- <-> alias * ETbb-OsF/regular/sl
+\DeclareFontShape{OT1}{ETbb-OsF}{m}{sc}{
+ <-> alias * ETbb-OsF/regular/sc
}{}
-\DeclareFontShape{OT1}{ETbb-OsF}{m}{n}{
- <-> alias * ETbb-OsF/regular/n
+\DeclareFontShape{OT1}{ETbb-OsF}{m}{sl}{
+ <-> alias * ETbb-OsF/regular/sl
}{}
\DeclareFontShape{OT1}{ETbb-OsF}{m}{it}{
<-> alias * ETbb-OsF/regular/it
}{}
-\DeclareFontShape{OT1}{ETbb-OsF}{m}{sc}{
- <-> alias * ETbb-OsF/regular/sc
+\DeclareFontShape{OT1}{ETbb-OsF}{m}{scit}{
+ <-> alias * ETbb-OsF/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{ETbb-OsF}{m}{n}{
+ <-> alias * ETbb-OsF/regular/n
}{}
\DeclareFontShape{OT1}{ETbb-OsF}{m}{scsl}{
<-> alias * ETbb-OsF/regular/scsl
}{}
-\DeclareFontShape{OT1}{ETbb-OsF}{m}{scit}{
- <-> alias * ETbb-OsF/regular/scit
+\DeclareFontShape{OT1}{ETbb-OsF}{m}{}{
+ <-> alias * ETbb-OsF/regular/
}{}
% b --> bold
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{scsl}{
- <-> alias * ETbb-OsF/bold/scsl
-}{}
-
\DeclareFontShape{OT1}{ETbb-OsF}{b}{sc}{
<-> alias * ETbb-OsF/bold/sc
}{}
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{n}{
- <-> alias * ETbb-OsF/bold/n
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{sl}{
+ <-> alias * ETbb-OsF/bold/sl
}{}
\DeclareFontShape{OT1}{ETbb-OsF}{b}{it}{
<-> alias * ETbb-OsF/bold/it
}{}
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{sl}{
- <-> alias * ETbb-OsF/bold/sl
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{}{
+ <-> alias * ETbb-OsF/bold/
}{}
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{scit}{
- <-> alias * ETbb-OsF/bold/scit
-}{}
-
-\DeclareFontShape{OT1}{ETbb-OsF}{bx}{scit}{
- <-> ssub * ETbb-OsF/b/scit
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{scsl}{
+ <-> alias * ETbb-OsF/bold/scsl
}{}
-\DeclareFontShape{OT1}{ETbb-OsF}{bx}{sc}{
- <-> ssub * ETbb-OsF/b/sc
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{scit}{
+ <-> alias * ETbb-OsF/bold/scit
}{}
-\DeclareFontShape{OT1}{ETbb-OsF}{bx}{scsl}{
- <-> ssub * ETbb-OsF/b/scsl
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{n}{
+ <-> alias * ETbb-OsF/bold/n
}{}
\DeclareFontShape{OT1}{ETbb-OsF}{bx}{sl}{
<-> ssub * ETbb-OsF/b/sl
}{}
+\DeclareFontShape{OT1}{ETbb-OsF}{bx}{sc}{
+ <-> ssub * ETbb-OsF/b/sc
+}{}
+
\DeclareFontShape{OT1}{ETbb-OsF}{bx}{it}{
<-> ssub * ETbb-OsF/b/it
}{}
+\DeclareFontShape{OT1}{ETbb-OsF}{bx}{scit}{
+ <-> ssub * ETbb-OsF/b/scit
+}{}
+
\DeclareFontShape{OT1}{ETbb-OsF}{bx}{n}{
<-> ssub * ETbb-OsF/b/n
}{}
+\DeclareFontShape{OT1}{ETbb-OsF}{bx}{scsl}{
+ <-> ssub * ETbb-OsF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{ETbb-OsF}{bx}{}{
+ <-> ssub * ETbb-OsF/b/
+}{}
+
\endinput
diff --git a/fonts/etbb/tex/OT1ETbb-Sup.fd b/fonts/etbb/tex/OT1ETbb-Sup.fd
index ad09169b2f..a82c1d5567 100644
--- a/fonts/etbb/tex/OT1ETbb-Sup.fd
+++ b/fonts/etbb/tex/OT1ETbb-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/03
+%% Generated by autoinst on 2020/05/14
%%
\ProvidesFile{OT1ETbb-Sup.fd}
- [2020/05/03 (autoinst) Font definitions for OT1/ETbb-Sup.]
+ [2020/05/14 (autoinst) Font definitions for OT1/ETbb-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
\DeclareFontFamily{OT1}{ETbb-Sup}{}
-% ---- bold ----
+% ---- regular ----
-\DeclareFontShape{OT1}{ETbb-Sup}{bold}{it}{
- <-> \ETbb@@scale ETbb-BoldItalic-sup-ot1
+\DeclareFontShape{OT1}{ETbb-Sup}{regular}{it}{
+ <-> \ETbb@@scale ETbb-Italic-sup-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-Sup}{bold}{n}{
- <-> \ETbb@@scale ETbb-Bold-sup-ot1
+\DeclareFontShape{OT1}{ETbb-Sup}{regular}{n}{
+ <-> \ETbb@@scale ETbb-Regular-sup-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-Sup}{bold}{sl}{
- <-> ssub * ETbb-Sup/bold/it
+\DeclareFontShape{OT1}{ETbb-Sup}{regular}{sl}{
+ <-> ssub * ETbb-Sup/regular/it
}{}
-% ---- regular ----
+% ---- bold ----
-\DeclareFontShape{OT1}{ETbb-Sup}{regular}{n}{
- <-> \ETbb@@scale ETbb-Regular-sup-ot1
+\DeclareFontShape{OT1}{ETbb-Sup}{bold}{it}{
+ <-> \ETbb@@scale ETbb-BoldItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-Sup}{regular}{it}{
- <-> \ETbb@@scale ETbb-Italic-sup-ot1
+\DeclareFontShape{OT1}{ETbb-Sup}{bold}{n}{
+ <-> \ETbb@@scale ETbb-Bold-sup-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-Sup}{regular}{sl}{
- <-> ssub * ETbb-Sup/regular/it
+\DeclareFontShape{OT1}{ETbb-Sup}{bold}{sl}{
+ <-> ssub * ETbb-Sup/bold/it
}{}
%
@@ -55,14 +55,14 @@
% m --> regular
-\DeclareFontShape{OT1}{ETbb-Sup}{m}{sl}{
- <-> alias * ETbb-Sup/regular/sl
-}{}
-
\DeclareFontShape{OT1}{ETbb-Sup}{m}{n}{
<-> alias * ETbb-Sup/regular/n
}{}
+\DeclareFontShape{OT1}{ETbb-Sup}{m}{sl}{
+ <-> alias * ETbb-Sup/regular/sl
+}{}
+
\DeclareFontShape{OT1}{ETbb-Sup}{m}{it}{
<-> alias * ETbb-Sup/regular/it
}{}
@@ -74,24 +74,24 @@
<-> 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}{
- <-> ssub * ETbb-Sup/b/n
+\DeclareFontShape{OT1}{ETbb-Sup}{b}{n}{
+ <-> alias * ETbb-Sup/bold/n
}{}
-\DeclareFontShape{OT1}{ETbb-Sup}{bx}{it}{
- <-> ssub * ETbb-Sup/b/it
+\DeclareFontShape{OT1}{ETbb-Sup}{bx}{n}{
+ <-> ssub * ETbb-Sup/b/n
}{}
\DeclareFontShape{OT1}{ETbb-Sup}{bx}{sl}{
<-> ssub * ETbb-Sup/b/sl
}{}
+\DeclareFontShape{OT1}{ETbb-Sup}{bx}{it}{
+ <-> ssub * ETbb-Sup/b/it
+}{}
+
\endinput
diff --git a/fonts/etbb/tex/OT1ETbb-TLF.fd b/fonts/etbb/tex/OT1ETbb-TLF.fd
index 254851cc7d..a0b451c08a 100644
--- a/fonts/etbb/tex/OT1ETbb-TLF.fd
+++ b/fonts/etbb/tex/OT1ETbb-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/03
+%% Generated by autoinst on 2020/05/14
%%
\ProvidesFile{OT1ETbb-TLF.fd}
- [2020/05/03 (autoinst) Font definitions for OT1/ETbb-TLF.]
+ [2020/05/14 (autoinst) Font definitions for OT1/ETbb-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,20 +22,25 @@
% ---- bold ----
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{sc}{
- <-> \ETbb@@scale ETbb-Bold-tlf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{}{
+ <-0> \ETbb@@scale ETbb-Bold-tlf-ot1
+ <0-> \ETbb@@scale ETbb-BoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{scit}{
+ <-> \ETbb@@scale ETbb-BoldItalic-tlf-sc-ot1
}{}
\DeclareFontShape{OT1}{ETbb-TLF}{bold}{n}{
<-> \ETbb@@scale ETbb-Bold-tlf-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{it}{
- <-> \ETbb@@scale ETbb-BoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{sc}{
+ <-> \ETbb@@scale ETbb-Bold-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{scit}{
- <-> \ETbb@@scale ETbb-BoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{it}{
+ <-> \ETbb@@scale ETbb-BoldItalic-tlf-ot1
}{}
\DeclareFontShape{OT1}{ETbb-TLF}{bold}{sl}{
@@ -53,14 +58,19 @@
<-> \ETbb@@scale ETbb-Italic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-TLF}{regular}{n}{
- <-> \ETbb@@scale ETbb-Regular-tlf-ot1
-}{}
-
\DeclareFontShape{OT1}{ETbb-TLF}{regular}{sc}{
<-> \ETbb@@scale ETbb-Regular-tlf-sc-ot1
}{}
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{}{
+ <-0> \ETbb@@scale ETbb-Italic-tlf-ot1
+ <0-> \ETbb@@scale ETbb-Regular-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{n}{
+ <-> \ETbb@@scale ETbb-Regular-tlf-ot1
+}{}
+
\DeclareFontShape{OT1}{ETbb-TLF}{regular}{scit}{
<-> \ETbb@@scale ETbb-Italic-tlf-sc-ot1
}{}
@@ -79,79 +89,91 @@
% m --> regular
-\DeclareFontShape{OT1}{ETbb-TLF}{m}{scit}{
- <-> alias * ETbb-TLF/regular/scit
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{}{
+ <-> alias * ETbb-TLF/regular/
}{}
-\DeclareFontShape{OT1}{ETbb-TLF}{m}{it}{
- <-> alias * ETbb-TLF/regular/it
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{scsl}{
+ <-> alias * ETbb-TLF/regular/scsl
}{}
\DeclareFontShape{OT1}{ETbb-TLF}{m}{n}{
<-> alias * ETbb-TLF/regular/n
}{}
-\DeclareFontShape{OT1}{ETbb-TLF}{m}{sl}{
- <-> alias * ETbb-TLF/regular/sl
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{scit}{
+ <-> alias * ETbb-TLF/regular/scit
}{}
-\DeclareFontShape{OT1}{ETbb-TLF}{m}{scsl}{
- <-> alias * ETbb-TLF/regular/scsl
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{it}{
+ <-> alias * ETbb-TLF/regular/it
}{}
\DeclareFontShape{OT1}{ETbb-TLF}{m}{sc}{
<-> alias * ETbb-TLF/regular/sc
}{}
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{sl}{
+ <-> alias * ETbb-TLF/regular/sl
+}{}
+
% b --> bold
-\DeclareFontShape{OT1}{ETbb-TLF}{b}{scit}{
- <-> alias * ETbb-TLF/bold/scit
+\DeclareFontShape{OT1}{ETbb-TLF}{b}{n}{
+ <-> alias * ETbb-TLF/bold/n
}{}
-\DeclareFontShape{OT1}{ETbb-TLF}{b}{sc}{
- <-> alias * ETbb-TLF/bold/sc
+\DeclareFontShape{OT1}{ETbb-TLF}{b}{scit}{
+ <-> alias * ETbb-TLF/bold/scit
}{}
\DeclareFontShape{OT1}{ETbb-TLF}{b}{scsl}{
<-> alias * ETbb-TLF/bold/scsl
}{}
-\DeclareFontShape{OT1}{ETbb-TLF}{b}{sl}{
- <-> alias * ETbb-TLF/bold/sl
-}{}
-
-\DeclareFontShape{OT1}{ETbb-TLF}{b}{n}{
- <-> alias * ETbb-TLF/bold/n
+\DeclareFontShape{OT1}{ETbb-TLF}{b}{}{
+ <-> alias * ETbb-TLF/bold/
}{}
\DeclareFontShape{OT1}{ETbb-TLF}{b}{it}{
<-> alias * ETbb-TLF/bold/it
}{}
-\DeclareFontShape{OT1}{ETbb-TLF}{bx}{scsl}{
- <-> ssub * ETbb-TLF/b/scsl
+\DeclareFontShape{OT1}{ETbb-TLF}{b}{sl}{
+ <-> alias * ETbb-TLF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TLF}{b}{sc}{
+ <-> alias * ETbb-TLF/bold/sc
}{}
\DeclareFontShape{OT1}{ETbb-TLF}{bx}{sc}{
<-> ssub * ETbb-TLF/b/sc
}{}
+\DeclareFontShape{OT1}{ETbb-TLF}{bx}{sl}{
+ <-> ssub * ETbb-TLF/b/sl
+}{}
+
\DeclareFontShape{OT1}{ETbb-TLF}{bx}{it}{
<-> ssub * ETbb-TLF/b/it
}{}
+\DeclareFontShape{OT1}{ETbb-TLF}{bx}{scit}{
+ <-> ssub * ETbb-TLF/b/scit
+}{}
+
\DeclareFontShape{OT1}{ETbb-TLF}{bx}{n}{
<-> ssub * ETbb-TLF/b/n
}{}
-\DeclareFontShape{OT1}{ETbb-TLF}{bx}{sl}{
- <-> ssub * ETbb-TLF/b/sl
+\DeclareFontShape{OT1}{ETbb-TLF}{bx}{}{
+ <-> ssub * ETbb-TLF/b/
}{}
-\DeclareFontShape{OT1}{ETbb-TLF}{bx}{scit}{
- <-> ssub * ETbb-TLF/b/scit
+\DeclareFontShape{OT1}{ETbb-TLF}{bx}{scsl}{
+ <-> ssub * ETbb-TLF/b/scsl
}{}
\endinput
diff --git a/fonts/etbb/tex/OT1ETbb-TOsF.fd b/fonts/etbb/tex/OT1ETbb-TOsF.fd
index 4d5219f245..08b18ae3fc 100644
--- a/fonts/etbb/tex/OT1ETbb-TOsF.fd
+++ b/fonts/etbb/tex/OT1ETbb-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/03
+%% Generated by autoinst on 2020/05/14
%%
\ProvidesFile{OT1ETbb-TOsF.fd}
- [2020/05/03 (autoinst) Font definitions for OT1/ETbb-TOsF.]
+ [2020/05/14 (autoinst) Font definitions for OT1/ETbb-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,57 +20,67 @@
\DeclareFontFamily{OT1}{ETbb-TOsF}{}
-% ---- regular ----
+% ---- bold ----
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{scit}{
- <-> \ETbb@@scale ETbb-Italic-tosf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{it}{
+ <-> \ETbb@@scale ETbb-BoldItalic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{sc}{
- <-> \ETbb@@scale ETbb-Regular-tosf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{sc}{
+ <-> \ETbb@@scale ETbb-Bold-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{n}{
- <-> \ETbb@@scale ETbb-Regular-tosf-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{}{
+ <-0> \ETbb@@scale ETbb-Bold-tosf-ot1
+ <0-> \ETbb@@scale ETbb-BoldItalic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{it}{
- <-> \ETbb@@scale ETbb-Italic-tosf-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{n}{
+ <-> \ETbb@@scale ETbb-Bold-tosf-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{sl}{
- <-> ssub * ETbb-TOsF/regular/it
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scit}{
+ <-> \ETbb@@scale ETbb-BoldItalic-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{scsl}{
- <-> ssub * ETbb-TOsF/regular/scit
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{sl}{
+ <-> ssub * ETbb-TOsF/bold/it
}{}
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scsl}{
+ <-> ssub * ETbb-TOsF/bold/scit
+}{}
-% ---- bold ----
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scit}{
- <-> \ETbb@@scale ETbb-BoldItalic-tosf-sc-ot1
+% ---- regular ----
+
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{sc}{
+ <-> \ETbb@@scale ETbb-Regular-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{n}{
- <-> \ETbb@@scale ETbb-Bold-tosf-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{it}{
+ <-> \ETbb@@scale ETbb-Italic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{it}{
- <-> \ETbb@@scale ETbb-BoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{scit}{
+ <-> \ETbb@@scale ETbb-Italic-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{sc}{
- <-> \ETbb@@scale ETbb-Bold-tosf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{n}{
+ <-> \ETbb@@scale ETbb-Regular-tosf-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{sl}{
- <-> ssub * ETbb-TOsF/bold/it
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{}{
+ <-0> \ETbb@@scale ETbb-Italic-tosf-ot1
+ <0-> \ETbb@@scale ETbb-Regular-tosf-ot1
}{}
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scsl}{
- <-> ssub * ETbb-TOsF/bold/scit
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{sl}{
+ <-> ssub * ETbb-TOsF/regular/it
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{scsl}{
+ <-> ssub * ETbb-TOsF/regular/scit
}{}
%
@@ -79,18 +89,22 @@
% m --> regular
-\DeclareFontShape{OT1}{ETbb-TOsF}{m}{scsl}{
- <-> alias * ETbb-TOsF/regular/scsl
+\DeclareFontShape{OT1}{ETbb-TOsF}{m}{}{
+ <-> alias * ETbb-TOsF/regular/
}{}
-\DeclareFontShape{OT1}{ETbb-TOsF}{m}{sc}{
- <-> alias * ETbb-TOsF/regular/sc
+\DeclareFontShape{OT1}{ETbb-TOsF}{m}{scsl}{
+ <-> alias * ETbb-TOsF/regular/scsl
}{}
\DeclareFontShape{OT1}{ETbb-TOsF}{m}{n}{
<-> alias * ETbb-TOsF/regular/n
}{}
+\DeclareFontShape{OT1}{ETbb-TOsF}{m}{scit}{
+ <-> alias * ETbb-TOsF/regular/scit
+}{}
+
\DeclareFontShape{OT1}{ETbb-TOsF}{m}{it}{
<-> alias * ETbb-TOsF/regular/it
}{}
@@ -99,59 +113,67 @@
<-> alias * ETbb-TOsF/regular/sl
}{}
-\DeclareFontShape{OT1}{ETbb-TOsF}{m}{scit}{
- <-> alias * ETbb-TOsF/regular/scit
+\DeclareFontShape{OT1}{ETbb-TOsF}{m}{sc}{
+ <-> alias * ETbb-TOsF/regular/sc
}{}
% b --> bold
-\DeclareFontShape{OT1}{ETbb-TOsF}{b}{scit}{
- <-> alias * ETbb-TOsF/bold/scit
-}{}
-
-\DeclareFontShape{OT1}{ETbb-TOsF}{b}{sc}{
- <-> alias * ETbb-TOsF/bold/sc
+\DeclareFontShape{OT1}{ETbb-TOsF}{b}{}{
+ <-> alias * ETbb-TOsF/bold/
}{}
\DeclareFontShape{OT1}{ETbb-TOsF}{b}{scsl}{
<-> alias * ETbb-TOsF/bold/scsl
}{}
-\DeclareFontShape{OT1}{ETbb-TOsF}{b}{sl}{
- <-> alias * ETbb-TOsF/bold/sl
+\DeclareFontShape{OT1}{ETbb-TOsF}{b}{scit}{
+ <-> alias * ETbb-TOsF/bold/scit
}{}
\DeclareFontShape{OT1}{ETbb-TOsF}{b}{n}{
<-> alias * ETbb-TOsF/bold/n
}{}
+\DeclareFontShape{OT1}{ETbb-TOsF}{b}{sl}{
+ <-> alias * ETbb-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TOsF}{b}{sc}{
+ <-> alias * ETbb-TOsF/bold/sc
+}{}
+
\DeclareFontShape{OT1}{ETbb-TOsF}{b}{it}{
<-> alias * ETbb-TOsF/bold/it
}{}
-\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{scit}{
- <-> ssub * ETbb-TOsF/b/scit
+\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{sc}{
+ <-> ssub * ETbb-TOsF/b/sc
}{}
-\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{n}{
- <-> ssub * ETbb-TOsF/b/n
+\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{sl}{
+ <-> ssub * ETbb-TOsF/b/sl
}{}
\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{it}{
<-> ssub * ETbb-TOsF/b/it
}{}
-\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{sl}{
- <-> ssub * ETbb-TOsF/b/sl
+\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{scit}{
+ <-> ssub * ETbb-TOsF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{n}{
+ <-> ssub * ETbb-TOsF/b/n
}{}
\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{scsl}{
<-> ssub * ETbb-TOsF/b/scsl
}{}
-\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{sc}{
- <-> ssub * ETbb-TOsF/b/sc
+\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{}{
+ <-> ssub * ETbb-TOsF/b/
}{}
\endinput
diff --git a/fonts/etbb/tex/T1ETbb-Dnom.fd b/fonts/etbb/tex/T1ETbb-Dnom.fd
new file mode 100644
index 0000000000..89f2bcf687
--- /dev/null
+++ b/fonts/etbb/tex/T1ETbb-Dnom.fd
@@ -0,0 +1,97 @@
+%% Generated by autoinst on 2020/05/14
+%%
+\ProvidesFile{T1ETbb-Dnom.fd}
+ [2020/05/14 (autoinst) Font definitions for T1/ETbb-Dnom.]
+
+\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 ETbb@scale\endcsname\relax
+ \let\ETbb@@scale\@empty
+\else
+ \edef\ETbb@@scale{s*[\csname ETbb@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{ETbb-Dnom}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{T1}{ETbb-Dnom}{regular}{n}{
+ <-> \ETbb@@scale ETbb-Regular-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{ETbb-Dnom}{regular}{it}{
+ <-> \ETbb@@scale ETbb-Italic-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{ETbb-Dnom}{regular}{sl}{
+ <-> ssub * ETbb-Dnom/regular/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{ETbb-Dnom}{bold}{n}{
+ <-> \ETbb@@scale ETbb-Bold-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{ETbb-Dnom}{bold}{it}{
+ <-> \ETbb@@scale ETbb-BoldItalic-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{ETbb-Dnom}{bold}{sl}{
+ <-> ssub * ETbb-Dnom/bold/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{T1}{ETbb-Dnom}{m}{n}{
+ <-> alias * ETbb-Dnom/regular/n
+}{}
+
+\DeclareFontShape{T1}{ETbb-Dnom}{m}{sl}{
+ <-> alias * ETbb-Dnom/regular/sl
+}{}
+
+\DeclareFontShape{T1}{ETbb-Dnom}{m}{it}{
+ <-> alias * ETbb-Dnom/regular/it
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{T1}{ETbb-Dnom}{b}{n}{
+ <-> alias * ETbb-Dnom/bold/n
+}{}
+
+\DeclareFontShape{T1}{ETbb-Dnom}{b}{sl}{
+ <-> alias * ETbb-Dnom/bold/sl
+}{}
+
+\DeclareFontShape{T1}{ETbb-Dnom}{b}{it}{
+ <-> alias * ETbb-Dnom/bold/it
+}{}
+
+\DeclareFontShape{T1}{ETbb-Dnom}{bx}{n}{
+ <-> ssub * ETbb-Dnom/b/n
+}{}
+
+\DeclareFontShape{T1}{ETbb-Dnom}{bx}{sl}{
+ <-> ssub * ETbb-Dnom/b/sl
+}{}
+
+\DeclareFontShape{T1}{ETbb-Dnom}{bx}{it}{
+ <-> ssub * ETbb-Dnom/b/it
+}{}
+
+\endinput
diff --git a/fonts/etbb/tex/T1ETbb-Inf.fd b/fonts/etbb/tex/T1ETbb-Inf.fd
index d3d353cbe6..d82dc35b1f 100644
--- a/fonts/etbb/tex/T1ETbb-Inf.fd
+++ b/fonts/etbb/tex/T1ETbb-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/03
+%% Generated by autoinst on 2020/05/14
%%
\ProvidesFile{T1ETbb-Inf.fd}
- [2020/05/03 (autoinst) Font definitions for T1/ETbb-Inf.]
+ [2020/05/14 (autoinst) Font definitions for T1/ETbb-Inf.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,14 @@
% ---- bold ----
-\DeclareFontShape{T1}{ETbb-Inf}{bold}{n}{
- <-> \ETbb@@scale ETbb-Bold-inf-t1
-}{}
-
\DeclareFontShape{T1}{ETbb-Inf}{bold}{it}{
<-> \ETbb@@scale ETbb-BoldItalic-inf-t1
}{}
+\DeclareFontShape{T1}{ETbb-Inf}{bold}{n}{
+ <-> \ETbb@@scale ETbb-Bold-inf-t1
+}{}
+
\DeclareFontShape{T1}{ETbb-Inf}{bold}{sl}{
<-> ssub * ETbb-Inf/bold/it
}{}
@@ -55,29 +55,29 @@
% m --> regular
-\DeclareFontShape{T1}{ETbb-Inf}{m}{n}{
- <-> alias * ETbb-Inf/regular/n
+\DeclareFontShape{T1}{ETbb-Inf}{m}{sl}{
+ <-> alias * ETbb-Inf/regular/sl
}{}
\DeclareFontShape{T1}{ETbb-Inf}{m}{it}{
<-> alias * ETbb-Inf/regular/it
}{}
-\DeclareFontShape{T1}{ETbb-Inf}{m}{sl}{
- <-> alias * ETbb-Inf/regular/sl
+\DeclareFontShape{T1}{ETbb-Inf}{m}{n}{
+ <-> alias * ETbb-Inf/regular/n
}{}
% b --> bold
-\DeclareFontShape{T1}{ETbb-Inf}{b}{sl}{
- <-> alias * ETbb-Inf/bold/sl
-}{}
-
\DeclareFontShape{T1}{ETbb-Inf}{b}{n}{
<-> alias * ETbb-Inf/bold/n
}{}
+\DeclareFontShape{T1}{ETbb-Inf}{b}{sl}{
+ <-> alias * ETbb-Inf/bold/sl
+}{}
+
\DeclareFontShape{T1}{ETbb-Inf}{b}{it}{
<-> alias * ETbb-Inf/bold/it
}{}
diff --git a/fonts/etbb/tex/T1ETbb-Sup.fd b/fonts/etbb/tex/T1ETbb-Sup.fd
index 439d803e1e..9c43559762 100644
--- a/fonts/etbb/tex/T1ETbb-Sup.fd
+++ b/fonts/etbb/tex/T1ETbb-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/03
+%% Generated by autoinst on 2020/05/14
%%
\ProvidesFile{T1ETbb-Sup.fd}
- [2020/05/03 (autoinst) Font definitions for T1/ETbb-Sup.]
+ [2020/05/14 (autoinst) Font definitions for T1/ETbb-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
\DeclareFontFamily{T1}{ETbb-Sup}{}
-% ---- regular ----
+% ---- bold ----
-\DeclareFontShape{T1}{ETbb-Sup}{regular}{n}{
- <-> \ETbb@@scale ETbb-Regular-sup-t1
+\DeclareFontShape{T1}{ETbb-Sup}{bold}{it}{
+ <-> \ETbb@@scale ETbb-BoldItalic-sup-t1
}{}
-\DeclareFontShape{T1}{ETbb-Sup}{regular}{it}{
- <-> \ETbb@@scale ETbb-Italic-sup-t1
+\DeclareFontShape{T1}{ETbb-Sup}{bold}{n}{
+ <-> \ETbb@@scale ETbb-Bold-sup-t1
}{}
-\DeclareFontShape{T1}{ETbb-Sup}{regular}{sl}{
- <-> ssub * ETbb-Sup/regular/it
+\DeclareFontShape{T1}{ETbb-Sup}{bold}{sl}{
+ <-> ssub * ETbb-Sup/bold/it
}{}
-% ---- bold ----
+% ---- regular ----
-\DeclareFontShape{T1}{ETbb-Sup}{bold}{it}{
- <-> \ETbb@@scale ETbb-BoldItalic-sup-t1
+\DeclareFontShape{T1}{ETbb-Sup}{regular}{it}{
+ <-> \ETbb@@scale ETbb-Italic-sup-t1
}{}
-\DeclareFontShape{T1}{ETbb-Sup}{bold}{n}{
- <-> \ETbb@@scale ETbb-Bold-sup-t1
+\DeclareFontShape{T1}{ETbb-Sup}{regular}{n}{
+ <-> \ETbb@@scale ETbb-Regular-sup-t1
}{}
-\DeclareFontShape{T1}{ETbb-Sup}{bold}{sl}{
- <-> ssub * ETbb-Sup/bold/it
+\DeclareFontShape{T1}{ETbb-Sup}{regular}{sl}{
+ <-> ssub * ETbb-Sup/regular/it
}{}
%
@@ -74,22 +74,22 @@
<-> alias * ETbb-Sup/bold/it
}{}
-\DeclareFontShape{T1}{ETbb-Sup}{b}{n}{
- <-> alias * ETbb-Sup/bold/n
-}{}
-
\DeclareFontShape{T1}{ETbb-Sup}{b}{sl}{
<-> alias * ETbb-Sup/bold/sl
}{}
-\DeclareFontShape{T1}{ETbb-Sup}{bx}{sl}{
- <-> ssub * ETbb-Sup/b/sl
+\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
}{}
diff --git a/fonts/etbb/tex/TS1ETbb-LF.fd b/fonts/etbb/tex/TS1ETbb-LF.fd
index 0b4590bc05..e74653824d 100644
--- a/fonts/etbb/tex/TS1ETbb-LF.fd
+++ b/fonts/etbb/tex/TS1ETbb-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/03
+%% Generated by autoinst on 2020/05/14
%%
\ProvidesFile{TS1ETbb-LF.fd}
- [2020/05/03 (autoinst) Font definitions for TS1/ETbb-LF.]
+ [2020/05/14 (autoinst) Font definitions for TS1/ETbb-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -55,10 +55,6 @@
% m --> regular
-\DeclareFontShape{TS1}{ETbb-LF}{m}{it}{
- <-> alias * ETbb-LF/regular/it
-}{}
-
\DeclareFontShape{TS1}{ETbb-LF}{m}{n}{
<-> alias * ETbb-LF/regular/n
}{}
@@ -67,13 +63,13 @@
<-> alias * ETbb-LF/regular/sl
}{}
+\DeclareFontShape{TS1}{ETbb-LF}{m}{it}{
+ <-> alias * ETbb-LF/regular/it
+}{}
+
% b --> bold
-\DeclareFontShape{TS1}{ETbb-LF}{b}{n}{
- <-> alias * ETbb-LF/bold/n
-}{}
-
\DeclareFontShape{TS1}{ETbb-LF}{b}{it}{
<-> alias * ETbb-LF/bold/it
}{}
@@ -82,16 +78,20 @@
<-> alias * ETbb-LF/bold/sl
}{}
-\DeclareFontShape{TS1}{ETbb-LF}{bx}{n}{
- <-> ssub * ETbb-LF/b/n
+\DeclareFontShape{TS1}{ETbb-LF}{b}{n}{
+ <-> alias * ETbb-LF/bold/n
}{}
-\DeclareFontShape{TS1}{ETbb-LF}{bx}{it}{
- <-> ssub * ETbb-LF/b/it
+\DeclareFontShape{TS1}{ETbb-LF}{bx}{n}{
+ <-> ssub * ETbb-LF/b/n
}{}
\DeclareFontShape{TS1}{ETbb-LF}{bx}{sl}{
<-> 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 6824a0cf96..231704d166 100644
--- a/fonts/etbb/tex/TS1ETbb-OsF.fd
+++ b/fonts/etbb/tex/TS1ETbb-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/03
+%% Generated by autoinst on 2020/05/14
%%
\ProvidesFile{TS1ETbb-OsF.fd}
- [2020/05/03 (autoinst) Font definitions for TS1/ETbb-OsF.]
+ [2020/05/14 (autoinst) Font definitions for TS1/ETbb-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
\DeclareFontFamily{TS1}{ETbb-OsF}{}
-% ---- bold ----
+% ---- regular ----
-\DeclareFontShape{TS1}{ETbb-OsF}{bold}{it}{
- <-> \ETbb@@scale ETbb-BoldItalic-osf-ts1
+\DeclareFontShape{TS1}{ETbb-OsF}{regular}{n}{
+ <-> \ETbb@@scale ETbb-Regular-osf-ts1
}{}
-\DeclareFontShape{TS1}{ETbb-OsF}{bold}{n}{
- <-> \ETbb@@scale ETbb-Bold-osf-ts1
+\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
}{}
-% ---- regular ----
+% ---- bold ----
-\DeclareFontShape{TS1}{ETbb-OsF}{regular}{it}{
- <-> \ETbb@@scale ETbb-Italic-osf-ts1
+\DeclareFontShape{TS1}{ETbb-OsF}{bold}{n}{
+ <-> \ETbb@@scale ETbb-Bold-osf-ts1
}{}
-\DeclareFontShape{TS1}{ETbb-OsF}{regular}{n}{
- <-> \ETbb@@scale ETbb-Regular-osf-ts1
+\DeclareFontShape{TS1}{ETbb-OsF}{bold}{it}{
+ <-> \ETbb@@scale ETbb-BoldItalic-osf-ts1
}{}
-\DeclareFontShape{TS1}{ETbb-OsF}{regular}{sl}{
- <-> ssub * ETbb-OsF/regular/it
+\DeclareFontShape{TS1}{ETbb-OsF}{bold}{sl}{
+ <-> ssub * ETbb-OsF/bold/it
}{}
%
@@ -59,25 +59,25 @@
<-> alias * ETbb-OsF/regular/it
}{}
-\DeclareFontShape{TS1}{ETbb-OsF}{m}{n}{
- <-> alias * ETbb-OsF/regular/n
-}{}
-
\DeclareFontShape{TS1}{ETbb-OsF}{m}{sl}{
<-> alias * ETbb-OsF/regular/sl
}{}
+\DeclareFontShape{TS1}{ETbb-OsF}{m}{n}{
+ <-> alias * ETbb-OsF/regular/n
+}{}
+
% b --> bold
-\DeclareFontShape{TS1}{ETbb-OsF}{b}{sl}{
- <-> alias * ETbb-OsF/bold/sl
-}{}
-
\DeclareFontShape{TS1}{ETbb-OsF}{b}{it}{
<-> alias * ETbb-OsF/bold/it
}{}
+\DeclareFontShape{TS1}{ETbb-OsF}{b}{sl}{
+ <-> alias * ETbb-OsF/bold/sl
+}{}
+
\DeclareFontShape{TS1}{ETbb-OsF}{b}{n}{
<-> alias * ETbb-OsF/bold/n
}{}
diff --git a/fonts/etbb/tex/TS1ETbb-TLF.fd b/fonts/etbb/tex/TS1ETbb-TLF.fd
index 91a0197778..5ceaf5c4b1 100644
--- a/fonts/etbb/tex/TS1ETbb-TLF.fd
+++ b/fonts/etbb/tex/TS1ETbb-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/03
+%% Generated by autoinst on 2020/05/14
%%
\ProvidesFile{TS1ETbb-TLF.fd}
- [2020/05/03 (autoinst) Font definitions for TS1/ETbb-TLF.]
+ [2020/05/14 (autoinst) Font definitions for TS1/ETbb-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -55,14 +55,14 @@
% m --> regular
-\DeclareFontShape{TS1}{ETbb-TLF}{m}{it}{
- <-> alias * ETbb-TLF/regular/it
-}{}
-
\DeclareFontShape{TS1}{ETbb-TLF}{m}{n}{
<-> alias * ETbb-TLF/regular/n
}{}
+\DeclareFontShape{TS1}{ETbb-TLF}{m}{it}{
+ <-> alias * ETbb-TLF/regular/it
+}{}
+
\DeclareFontShape{TS1}{ETbb-TLF}{m}{sl}{
<-> alias * ETbb-TLF/regular/sl
}{}
@@ -82,14 +82,14 @@
<-> alias * ETbb-TLF/bold/sl
}{}
-\DeclareFontShape{TS1}{ETbb-TLF}{bx}{sl}{
- <-> ssub * ETbb-TLF/b/sl
-}{}
-
\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
}{}
diff --git a/fonts/etbb/tex/TS1ETbb-TOsF.fd b/fonts/etbb/tex/TS1ETbb-TOsF.fd
index a145726953..da2222b985 100644
--- a/fonts/etbb/tex/TS1ETbb-TOsF.fd
+++ b/fonts/etbb/tex/TS1ETbb-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/03
+%% Generated by autoinst on 2020/05/14
%%
\ProvidesFile{TS1ETbb-TOsF.fd}
- [2020/05/03 (autoinst) Font definitions for TS1/ETbb-TOsF.]
+ [2020/05/14 (autoinst) Font definitions for TS1/ETbb-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
\DeclareFontFamily{TS1}{ETbb-TOsF}{}
-% ---- regular ----
+% ---- bold ----
-\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{n}{
- <-> \ETbb@@scale ETbb-Regular-tosf-ts1
+\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{n}{
+ <-> \ETbb@@scale ETbb-Bold-tosf-ts1
}{}
-\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{it}{
- <-> \ETbb@@scale ETbb-Italic-tosf-ts1
+\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{it}{
+ <-> \ETbb@@scale ETbb-BoldItalic-tosf-ts1
}{}
-\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{sl}{
- <-> ssub * ETbb-TOsF/regular/it
+\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{sl}{
+ <-> ssub * ETbb-TOsF/bold/it
}{}
-% ---- bold ----
+% ---- regular ----
-\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{n}{
- <-> \ETbb@@scale ETbb-Bold-tosf-ts1
+\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{it}{
+ <-> \ETbb@@scale ETbb-Italic-tosf-ts1
}{}
-\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{it}{
- <-> \ETbb@@scale ETbb-BoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{n}{
+ <-> \ETbb@@scale ETbb-Regular-tosf-ts1
}{}
-\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{sl}{
- <-> ssub * ETbb-TOsF/bold/it
+\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{sl}{
+ <-> ssub * ETbb-TOsF/regular/it
}{}
%
@@ -55,10 +55,6 @@
% m --> regular
-\DeclareFontShape{TS1}{ETbb-TOsF}{m}{sl}{
- <-> alias * ETbb-TOsF/regular/sl
-}{}
-
\DeclareFontShape{TS1}{ETbb-TOsF}{m}{n}{
<-> alias * ETbb-TOsF/regular/n
}{}
@@ -67,21 +63,29 @@
<-> alias * ETbb-TOsF/regular/it
}{}
+\DeclareFontShape{TS1}{ETbb-TOsF}{m}{sl}{
+ <-> alias * ETbb-TOsF/regular/sl
+}{}
-% b --> bold
-\DeclareFontShape{TS1}{ETbb-TOsF}{b}{sl}{
- <-> alias * ETbb-TOsF/bold/sl
-}{}
+% b --> bold
\DeclareFontShape{TS1}{ETbb-TOsF}{b}{n}{
<-> alias * ETbb-TOsF/bold/n
}{}
+\DeclareFontShape{TS1}{ETbb-TOsF}{b}{sl}{
+ <-> alias * ETbb-TOsF/bold/sl
+}{}
+
\DeclareFontShape{TS1}{ETbb-TOsF}{b}{it}{
<-> alias * ETbb-TOsF/bold/it
}{}
+\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{sl}{
+ <-> ssub * ETbb-TOsF/b/sl
+}{}
+
\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{it}{
<-> ssub * ETbb-TOsF/b/it
}{}
@@ -90,8 +94,4 @@
<-> ssub * ETbb-TOsF/b/n
}{}
-\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{sl}{
- <-> ssub * ETbb-TOsF/b/sl
-}{}
-
\endinput