etbb (28jun20)

git-svn-id: svn://tug.org/texlive/trunk@55686 c570f23f-e606-0410-a88d-b1316a301751

22 files changed, 702 insertions, 670 deletions

diff --git a/Master/texmf-dist/tex/latex/etbb/ETbb.sty b/Master/texmf-dist/tex/latex/etbb/ETbb.sty
index d08e27032bd..476ee84a82b 100644
--- a/Master/texmf-dist/tex/latex/etbb/ETbb.sty
+++ b/Master/texmf-dist/tex/latex/etbb/ETbb.sty
@@ -1,7 +1,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.01}
-\def\filedate{2020/05/03}
+\def\fileversion{1.04}
+\def\filedate{2020/06/27}
 \ProvidesPackage{ETbb}
     [\filedate\space v\fileversion.  Style file for ETbb.]
 
@@ -9,6 +9,7 @@
 \RequirePackage[full]{textcomp}
 \RequirePackage{ifetex}
 \ifetex\RequirePackage{etoolbox}\fi %etoolbox loads etex.sty
+\RequirePackage{xstring,ifthen} % for \textfrac
 \IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
 \IfFileExists{fontaxes.sty}{
     \RequirePackage{fontaxes}
@@ -25,10 +26,41 @@
         \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}}}
-
+%    \providecommand*{\textfrac}[3][\ETbb@raisefrac]{%
+%    \raise ##1 \hbox{\textsu{##2}\kern \ETbb@foresolidus \textfractionsolidus\kern \ETbb@aftsolidus \textin{##3}}}
 }{}
+\def\textde#1{\leavevmode\raise .112em \hbox{\textin{#1}}} % aligned with baseline
+\newcommand{\textfrac}[3][]{% like \textfrac[1]{7}{8}
+  \mbox{%
+    \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
+      {\textlf{#1}\kern.05em}{}%         
+    \textsu{#2}% numerator
+    \StrRight{#2}{1}[\@digit@]%
+    % look for  1, 2, 3, 4, 7
+    \ifcase\@digit@% 0
+    \or% 1
+    \or\kern.03em% 2
+    \or\kern-.02em% 3
+    \or\kern-.01em% 4
+    \or\kern.01em% 5
+    \or\kern.02em% 6
+    \or\kern-.09em% 7
+    \fi%
+    \kern\ETbb@foresolidus\textfractionsolidus\kern\ETbb@aftsolidus%
+    \StrLeft{#3}{1}[\@digit@]%
+    % look for 1, 4, 5, 7
+    \ifcase\@digit@% 0
+    \or\kern -.02em% 1
+    \or\kern .01em% 2
+    \or\kern -.02em% 3
+    \or\kern -.08em% 4
+    \or\kern -.01em% 5
+    \or\kern -.03em% 6
+    \or\kern .04em% 7
+    \fi%
+    \textde{#3}%       denominator [#3]
+  }%
+}
 
 \IfFileExists{xkeyval.sty}{
     \newcommand*{\ETbb@scale}{1}
@@ -51,9 +83,9 @@
 \newif\if@ETbb@sharpS
 \newif\if@ETbb@sups
 \newif\if@ETbb@scosf
-\def\ETbb@foresolidus{-.03em}
-\def\ETbb@aftsolidus{.02em}
-\def\ETbb@raisefrac{.111em}
+\def\ETbb@foresolidus{-.04em}
+\def\ETbb@aftsolidus{-.03em}
+\def\ETbb@raisefrac{.112em}
 \DeclareOptionX{foresolidus}{\gdef\ETbb@foresolidus{#1}}
 \DeclareOptionX{aftsolidus}{\gdef\ETbb@aftsolidus{#1}}
 \DeclareOptionX{raisefrac}{\gdef\ETbb@raisefrac{#1}}
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Dnom.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Dnom.fd
index 462aa054235..347d6ba3ad2 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 2020/06/17
+%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{LY1ETbb-Dnom.fd}
-    [2020/06/17 (autoinst)  Font definitions for LY1/ETbb-Dnom.]
+    [2020/06/27 (autoinst)  Font definitions for LY1/ETbb-Dnom.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{LY1}{ETbb-Dnom}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-dnom-ly1
+\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-dnom-ly1
+\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{sl}{
-      <-> ssub * ETbb-Dnom/regular/it
+\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{sl}{
+      <-> ssub * ETbb-Dnom/bold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-dnom-ly1
+\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-dnom-ly1
+\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
 }{}
 
 %
@@ -59,39 +59,39 @@
       <-> alias * ETbb-Dnom/regular/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{m}{n}{
-      <-> alias * ETbb-Dnom/regular/n
-}{}
-
 \DeclareFontShape{LY1}{ETbb-Dnom}{m}{sl}{
       <-> alias * ETbb-Dnom/regular/sl
 }{}
 
+\DeclareFontShape{LY1}{ETbb-Dnom}{m}{n}{
+      <-> alias * ETbb-Dnom/regular/n
+}{}
 
-%   b --> bold
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{b}{sl}{
-      <-> alias * ETbb-Dnom/bold/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}{sl}{
-      <-> ssub * ETbb-Dnom/b/sl
+\DeclareFontShape{LY1}{ETbb-Dnom}{bx}{n}{
+      <-> ssub * ETbb-Dnom/b/n
 }{}
 
 \DeclareFontShape{LY1}{ETbb-Dnom}{bx}{it}{
       <-> ssub * ETbb-Dnom/b/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{bx}{n}{
-      <-> ssub * ETbb-Dnom/b/n
+\DeclareFontShape{LY1}{ETbb-Dnom}{bx}{sl}{
+      <-> ssub * ETbb-Dnom/b/sl
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd
index fe4adcdb3bd..7cd45deb396 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 2020/06/17
+%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{LY1ETbb-Inf.fd}
-    [2020/06/17 (autoinst)  Font definitions for LY1/ETbb-Inf.]
+    [2020/06/27 (autoinst)  Font definitions for LY1/ETbb-Inf.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,14 @@
 
 %   ----  bold  ----
 
-\DeclareFontShape{LY1}{ETbb-Inf}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-inf-ly1
-}{}
-
 \DeclareFontShape{LY1}{ETbb-Inf}{bold}{it}{
       <-> \ETbb@@scale ETbb-BoldItalic-inf-ly1
 }{}
 
+\DeclareFontShape{LY1}{ETbb-Inf}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-inf-ly1
+}{}
+
 \DeclareFontShape{LY1}{ETbb-Inf}{bold}{sl}{
       <-> ssub * ETbb-Inf/bold/it
 }{}
@@ -55,25 +55,21 @@
 
 %   m --> regular
 
-\DeclareFontShape{LY1}{ETbb-Inf}{m}{n}{
-      <-> alias * ETbb-Inf/regular/n
+\DeclareFontShape{LY1}{ETbb-Inf}{m}{sl}{
+      <-> alias * ETbb-Inf/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{ETbb-Inf}{m}{it}{
       <-> alias * ETbb-Inf/regular/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{m}{sl}{
-      <-> alias * ETbb-Inf/regular/sl
+\DeclareFontShape{LY1}{ETbb-Inf}{m}{n}{
+      <-> alias * ETbb-Inf/regular/n
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{LY1}{ETbb-Inf}{b}{n}{
-      <-> alias * ETbb-Inf/bold/n
-}{}
-
 \DeclareFontShape{LY1}{ETbb-Inf}{b}{it}{
       <-> alias * ETbb-Inf/bold/it
 }{}
@@ -82,16 +78,20 @@
       <-> alias * ETbb-Inf/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{bx}{n}{
-      <-> ssub * ETbb-Inf/b/n
+\DeclareFontShape{LY1}{ETbb-Inf}{b}{n}{
+      <-> alias * ETbb-Inf/bold/n
+}{}
+
+\DeclareFontShape{LY1}{ETbb-Inf}{bx}{sl}{
+      <-> ssub * ETbb-Inf/b/sl
 }{}
 
 \DeclareFontShape{LY1}{ETbb-Inf}{bx}{it}{
       <-> ssub * ETbb-Inf/b/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{bx}{sl}{
-      <-> ssub * ETbb-Inf/b/sl
+\DeclareFontShape{LY1}{ETbb-Inf}{bx}{n}{
+      <-> ssub * ETbb-Inf/b/n
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-LF.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-LF.fd
index a770ff4953f..f5470e28b19 100644
--- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-LF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/17
+%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{LY1ETbb-LF.fd}
-    [2020/06/17 (autoinst)  Font definitions for LY1/ETbb-LF.]
+    [2020/06/27 (autoinst)  Font definitions for LY1/ETbb-LF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -26,16 +26,16 @@
       <-> \ETbb@@scale ETbb-BoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb-BoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-LF}{bold}{sc}{
+      <-> \ETbb@@scale ETbb-Bold-lf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-LF}{bold}{n}{
       <-> \ETbb@@scale ETbb-Bold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{bold}{sc}{
-      <-> \ETbb@@scale ETbb-Bold-lf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-LF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb-BoldItalic-lf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-LF}{bold}{scsl}{
@@ -49,16 +49,16 @@
 
 %   ----  regular  ----
 
-\DeclareFontShape{LY1}{ETbb-LF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-lf-ly1
+\DeclareFontShape{LY1}{ETbb-LF}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-lf-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-LF}{regular}{sc}{
       <-> \ETbb@@scale ETbb-Regular-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-lf-ly1
+\DeclareFontShape{LY1}{ETbb-LF}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-lf-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-LF}{regular}{scit}{
@@ -79,26 +79,26 @@
 
 %   m --> regular
 
-\DeclareFontShape{LY1}{ETbb-LF}{m}{sl}{
-      <-> alias * ETbb-LF/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{ETbb-LF}{m}{scsl}{
-      <-> alias * ETbb-LF/regular/scsl
+\DeclareFontShape{LY1}{ETbb-LF}{m}{sc}{
+      <-> alias * ETbb-LF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{ETbb-LF}{m}{n}{
       <-> alias * ETbb-LF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{m}{sc}{
-      <-> alias * ETbb-LF/regular/sc
+\DeclareFontShape{LY1}{ETbb-LF}{m}{sl}{
+      <-> alias * ETbb-LF/regular/sl
 }{}
 
 \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}{scit}{
       <-> alias * ETbb-LF/regular/scit
 }{}
@@ -106,52 +106,52 @@
 
 %   b --> bold
 
+\DeclareFontShape{LY1}{ETbb-LF}{b}{it}{
+      <-> alias * ETbb-LF/bold/it
+}{}
+
 \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}{sc}{
+      <-> alias * ETbb-LF/bold/sc
 }{}
 
 \DeclareFontShape{LY1}{ETbb-LF}{b}{n}{
       <-> alias * ETbb-LF/bold/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{b}{sc}{
-      <-> alias * ETbb-LF/bold/sc
+\DeclareFontShape{LY1}{ETbb-LF}{b}{scit}{
+      <-> alias * ETbb-LF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{b}{it}{
-      <-> alias * ETbb-LF/bold/it
+\DeclareFontShape{LY1}{ETbb-LF}{b}{scsl}{
+      <-> alias * ETbb-LF/bold/scsl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{b}{scit}{
-      <-> alias * ETbb-LF/bold/scit
+\DeclareFontShape{LY1}{ETbb-LF}{bx}{it}{
+      <-> ssub * ETbb-LF/b/it
 }{}
 
 \DeclareFontShape{LY1}{ETbb-LF}{bx}{sl}{
       <-> ssub * ETbb-LF/b/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{bx}{scsl}{
-      <-> ssub * ETbb-LF/b/scsl
+\DeclareFontShape{LY1}{ETbb-LF}{bx}{sc}{
+      <-> ssub * ETbb-LF/b/sc
 }{}
 
 \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}{scit}{
       <-> ssub * ETbb-LF/b/scit
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{bx}{it}{
-      <-> ssub * ETbb-LF/b/it
+\DeclareFontShape{LY1}{ETbb-LF}{bx}{scsl}{
+      <-> ssub * ETbb-LF/b/scsl
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-OsF.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-OsF.fd
index 57d2c03a699..339c62acd54 100644
--- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-OsF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/17
+%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{LY1ETbb-OsF.fd}
-    [2020/06/17 (autoinst)  Font definitions for LY1/ETbb-OsF.]
+    [2020/06/27 (autoinst)  Font definitions for LY1/ETbb-OsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,57 +20,57 @@
 \DeclareFontFamily{LY1}{ETbb-OsF}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{ETbb-OsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-osf-ly1
+\DeclareFontShape{LY1}{ETbb-OsF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb-BoldItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb-Italic-osf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-OsF}{bold}{sc}{
+      <-> \ETbb@@scale ETbb-Bold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb-Regular-osf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-OsF}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-osf-ly1
+\DeclareFontShape{LY1}{ETbb-OsF}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{regular}{scsl}{
-      <-> ssub * ETbb-OsF/regular/scit
+\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}{bold}{sl}{
+      <-> ssub * ETbb-OsF/bold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{LY1}{ETbb-OsF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-osf-ly1
+\DeclareFontShape{LY1}{ETbb-OsF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb-Italic-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}{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}{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}{scsl}{
-      <-> ssub * ETbb-OsF/bold/scit
+\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}{regular}{sl}{
+      <-> ssub * ETbb-OsF/regular/it
 }{}
 
 %
@@ -79,79 +79,79 @@
 
 %   m --> regular
 
-\DeclareFontShape{LY1}{ETbb-OsF}{m}{sc}{
-      <-> alias * ETbb-OsF/regular/sc
-}{}
-
 \DeclareFontShape{LY1}{ETbb-OsF}{m}{n}{
       <-> alias * ETbb-OsF/regular/n
 }{}
 
-\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}{sc}{
+      <-> alias * ETbb-OsF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{ETbb-OsF}{m}{sl}{
       <-> alias * ETbb-OsF/regular/sl
 }{}
 
+\DeclareFontShape{LY1}{ETbb-OsF}{m}{it}{
+      <-> alias * ETbb-OsF/regular/it
+}{}
+
 \DeclareFontShape{LY1}{ETbb-OsF}{m}{scsl}{
       <-> alias * ETbb-OsF/regular/scsl
 }{}
 
+\DeclareFontShape{LY1}{ETbb-OsF}{m}{scit}{
+      <-> alias * ETbb-OsF/regular/scit
+}{}
+
 
 %   b --> bold
 
-\DeclareFontShape{LY1}{ETbb-OsF}{b}{scsl}{
-      <-> alias * ETbb-OsF/bold/scsl
+\DeclareFontShape{LY1}{ETbb-OsF}{b}{it}{
+      <-> alias * ETbb-OsF/bold/it
 }{}
 
 \DeclareFontShape{LY1}{ETbb-OsF}{b}{sl}{
       <-> alias * ETbb-OsF/bold/sl
 }{}
 
-\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}{sc}{
+      <-> alias * ETbb-OsF/bold/sc
 }{}
 
 \DeclareFontShape{LY1}{ETbb-OsF}{b}{n}{
       <-> alias * ETbb-OsF/bold/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{b}{sc}{
-      <-> alias * ETbb-OsF/bold/sc
+\DeclareFontShape{LY1}{ETbb-OsF}{b}{scit}{
+      <-> alias * ETbb-OsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{bx}{scsl}{
-      <-> ssub * ETbb-OsF/b/scsl
+\DeclareFontShape{LY1}{ETbb-OsF}{b}{scsl}{
+      <-> alias * ETbb-OsF/bold/scsl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{bx}{sl}{
-      <-> ssub * ETbb-OsF/b/sl
+\DeclareFontShape{LY1}{ETbb-OsF}{bx}{n}{
+      <-> ssub * ETbb-OsF/b/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{bx}{scit}{
-      <-> ssub * ETbb-OsF/b/scit
+\DeclareFontShape{LY1}{ETbb-OsF}{bx}{sc}{
+      <-> ssub * ETbb-OsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{ETbb-OsF}{bx}{sl}{
+      <-> ssub * ETbb-OsF/b/sl
 }{}
 
 \DeclareFontShape{LY1}{ETbb-OsF}{bx}{it}{
       <-> ssub * ETbb-OsF/b/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{bx}{n}{
-      <-> ssub * ETbb-OsF/b/n
+\DeclareFontShape{LY1}{ETbb-OsF}{bx}{scsl}{
+      <-> ssub * ETbb-OsF/b/scsl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{bx}{sc}{
-      <-> ssub * ETbb-OsF/b/sc
+\DeclareFontShape{LY1}{ETbb-OsF}{bx}{scit}{
+      <-> ssub * ETbb-OsF/b/scit
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd
index 350f84e969a..e34bcb15cc6 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 2020/06/17
+%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{LY1ETbb-Sup.fd}
-    [2020/06/17 (autoinst)  Font definitions for LY1/ETbb-Sup.]
+    [2020/06/27 (autoinst)  Font definitions for LY1/ETbb-Sup.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{LY1}{ETbb-Sup}{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{LY1}{ETbb-Sup}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-sup-ly1
+\DeclareFontShape{LY1}{ETbb-Sup}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Sup}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-sup-ly1
+\DeclareFontShape{LY1}{ETbb-Sup}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Sup}{bold}{sl}{
-      <-> ssub * ETbb-Sup/bold/it
+\DeclareFontShape{LY1}{ETbb-Sup}{regular}{sl}{
+      <-> ssub * ETbb-Sup/regular/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{ETbb-Sup}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-sup-ly1
+\DeclareFontShape{LY1}{ETbb-Sup}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Sup}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-sup-ly1
+\DeclareFontShape{LY1}{ETbb-Sup}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Sup}{regular}{sl}{
-      <-> ssub * ETbb-Sup/regular/it
+\DeclareFontShape{LY1}{ETbb-Sup}{bold}{sl}{
+      <-> ssub * ETbb-Sup/bold/it
 }{}
 
 %
@@ -70,10 +70,6 @@
 
 %   b --> bold
 
-\DeclareFontShape{LY1}{ETbb-Sup}{b}{n}{
-      <-> alias * ETbb-Sup/bold/n
-}{}
-
 \DeclareFontShape{LY1}{ETbb-Sup}{b}{it}{
       <-> alias * ETbb-Sup/bold/it
 }{}
@@ -82,16 +78,20 @@
       <-> alias * ETbb-Sup/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Sup}{bx}{n}{
-      <-> ssub * ETbb-Sup/b/n
+\DeclareFontShape{LY1}{ETbb-Sup}{b}{n}{
+      <-> alias * ETbb-Sup/bold/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Sup}{bx}{it}{
-      <-> ssub * ETbb-Sup/b/it
+\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
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TLF.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TLF.fd
index 17597335044..fdd06138789 100644
--- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TLF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/17
+%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{LY1ETbb-TLF.fd}
-    [2020/06/17 (autoinst)  Font definitions for LY1/ETbb-TLF.]
+    [2020/06/27 (autoinst)  Font definitions for LY1/ETbb-TLF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -26,16 +26,16 @@
       <-> \ETbb@@scale ETbb-Italic-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}{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}{scit}{
+      <-> \ETbb@@scale ETbb-Italic-tlf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TLF}{regular}{scsl}{
@@ -49,20 +49,20 @@
 
 %   ----  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}{sc}{
       <-> \ETbb@@scale ETbb-Bold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-tlf-ly1
+\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}{scsl}{
@@ -83,20 +83,20 @@
       <-> alias * ETbb-TLF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{m}{scsl}{
-      <-> alias * ETbb-TLF/regular/scsl
-}{}
-
-\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}{n}{
       <-> alias * ETbb-TLF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{m}{it}{
-      <-> alias * ETbb-TLF/regular/it
+\DeclareFontShape{LY1}{ETbb-TLF}{m}{sc}{
+      <-> alias * ETbb-TLF/regular/sc
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TLF}{m}{scsl}{
+      <-> alias * ETbb-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TLF}{m}{scit}{
@@ -110,6 +110,18 @@
       <-> alias * ETbb-TLF/bold/scsl
 }{}
 
+\DeclareFontShape{LY1}{ETbb-TLF}{b}{scit}{
+      <-> alias * ETbb-TLF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TLF}{b}{n}{
+      <-> alias * ETbb-TLF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TLF}{b}{sc}{
+      <-> alias * ETbb-TLF/bold/sc
+}{}
+
 \DeclareFontShape{LY1}{ETbb-TLF}{b}{sl}{
       <-> alias * ETbb-TLF/bold/sl
 }{}
@@ -118,16 +130,12 @@
       <-> alias * ETbb-TLF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{b}{scit}{
-      <-> alias * ETbb-TLF/bold/scit
-}{}
-
-\DeclareFontShape{LY1}{ETbb-TLF}{b}{sc}{
-      <-> alias * ETbb-TLF/bold/sc
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{it}{
+      <-> ssub * ETbb-TLF/b/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{b}{n}{
-      <-> alias * ETbb-TLF/bold/n
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{sl}{
+      <-> ssub * ETbb-TLF/b/sl
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TLF}{bx}{n}{
@@ -142,14 +150,6 @@
       <-> ssub * ETbb-TLF/b/scit
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bx}{it}{
-      <-> ssub * ETbb-TLF/b/it
-}{}
-
-\DeclareFontShape{LY1}{ETbb-TLF}{bx}{sl}{
-      <-> ssub * ETbb-TLF/b/sl
-}{}
-
 \DeclareFontShape{LY1}{ETbb-TLF}{bx}{scsl}{
       <-> ssub * ETbb-TLF/b/scsl
 }{}
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TOsF.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TOsF.fd
index 3148df82039..5f5bc6b363a 100644
--- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/17
+%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{LY1ETbb-TOsF.fd}
-    [2020/06/17 (autoinst)  Font definitions for LY1/ETbb-TOsF.]
+    [2020/06/27 (autoinst)  Font definitions for LY1/ETbb-TOsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -30,14 +30,14 @@
       <-> \ETbb@@scale ETbb-Bold-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tosf-sc-ly1
-}{}
-
 \DeclareFontShape{LY1}{ETbb-TOsF}{bold}{it}{
       <-> \ETbb@@scale ETbb-BoldItalic-tosf-ly1
 }{}
 
+\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tosf-sc-ly1
+}{}
+
 \DeclareFontShape{LY1}{ETbb-TOsF}{bold}{scsl}{
       <-> ssub * ETbb-TOsF/bold/scit
 }{}
@@ -57,14 +57,14 @@
       <-> \ETbb@@scale ETbb-Regular-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb-Italic-tosf-sc-ly1
-}{}
-
 \DeclareFontShape{LY1}{ETbb-TOsF}{regular}{it}{
       <-> \ETbb@@scale ETbb-Italic-tosf-ly1
 }{}
 
+\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb-Italic-tosf-sc-ly1
+}{}
+
 \DeclareFontShape{LY1}{ETbb-TOsF}{regular}{scsl}{
       <-> ssub * ETbb-TOsF/regular/scit
 }{}
@@ -79,14 +79,6 @@
 
 %   m --> regular
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{m}{sl}{
-      <-> alias * ETbb-TOsF/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{ETbb-TOsF}{m}{scsl}{
-      <-> alias * ETbb-TOsF/regular/scsl
-}{}
-
 \DeclareFontShape{LY1}{ETbb-TOsF}{m}{n}{
       <-> alias * ETbb-TOsF/regular/n
 }{}
@@ -95,17 +87,33 @@
       <-> alias * ETbb-TOsF/regular/sc
 }{}
 
+\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}{scit}{
       <-> alias * ETbb-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{m}{it}{
-      <-> alias * ETbb-TOsF/regular/it
+\DeclareFontShape{LY1}{ETbb-TOsF}{m}{scsl}{
+      <-> alias * ETbb-TOsF/regular/scsl
 }{}
 
 
 %   b --> bold
 
+\DeclareFontShape{LY1}{ETbb-TOsF}{b}{scit}{
+      <-> alias * ETbb-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TOsF}{b}{scsl}{
+      <-> alias * ETbb-TOsF/bold/scsl
+}{}
+
 \DeclareFontShape{LY1}{ETbb-TOsF}{b}{sc}{
       <-> alias * ETbb-TOsF/bold/sc
 }{}
@@ -114,10 +122,6 @@
       <-> alias * ETbb-TOsF/bold/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{b}{scit}{
-      <-> alias * ETbb-TOsF/bold/scit
-}{}
-
 \DeclareFontShape{LY1}{ETbb-TOsF}{b}{it}{
       <-> alias * ETbb-TOsF/bold/it
 }{}
@@ -126,32 +130,28 @@
       <-> alias * ETbb-TOsF/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{b}{scsl}{
-      <-> alias * ETbb-TOsF/bold/scsl
+\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{n}{
+      <-> ssub * ETbb-TOsF/b/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{sl}{
-      <-> ssub * ETbb-TOsF/b/sl
+\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{sc}{
+      <-> ssub * ETbb-TOsF/b/sc
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{scsl}{
-      <-> ssub * ETbb-TOsF/b/scsl
+\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{sl}{
+      <-> ssub * ETbb-TOsF/b/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{sc}{
-      <-> ssub * ETbb-TOsF/b/sc
+\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{it}{
+      <-> ssub * ETbb-TOsF/b/it
 }{}
 
-\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}{scit}{
       <-> ssub * ETbb-TOsF/b/scit
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{it}{
-      <-> ssub * ETbb-TOsF/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 5b9b001017a..bf1444e85de 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 2020/06/17
+%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{OT1ETbb-Dnom.fd}
-    [2020/06/17 (autoinst)  Font definitions for OT1/ETbb-Dnom.]
+    [2020/06/27 (autoinst)  Font definitions for OT1/ETbb-Dnom.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{OT1}{ETbb-Dnom}{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-dnom-ot1
+\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-dnom-ot1
+\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{sl}{
-      <-> ssub * ETbb-Dnom/bold/it
+\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{sl}{
+      <-> ssub * ETbb-Dnom/regular/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-dnom-ot1
+\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-dnom-ot1
+\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{sl}{
-      <-> ssub * ETbb-Dnom/regular/it
+\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{sl}{
+      <-> ssub * ETbb-Dnom/bold/it
 }{}
 
 %
@@ -55,6 +55,10 @@
 
 %   m --> regular
 
+\DeclareFontShape{OT1}{ETbb-Dnom}{m}{sl}{
+      <-> alias * ETbb-Dnom/regular/sl
+}{}
+
 \DeclareFontShape{OT1}{ETbb-Dnom}{m}{it}{
       <-> alias * ETbb-Dnom/regular/it
 }{}
@@ -63,10 +67,6 @@
       <-> alias * ETbb-Dnom/regular/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{m}{sl}{
-      <-> alias * ETbb-Dnom/regular/sl
-}{}
-
 
 %   b --> bold
 
@@ -82,6 +82,10 @@
       <-> alias * ETbb-Dnom/bold/sl
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Dnom}{bx}{n}{
+      <-> ssub * ETbb-Dnom/b/n
+}{}
+
 \DeclareFontShape{OT1}{ETbb-Dnom}{bx}{sl}{
       <-> ssub * ETbb-Dnom/b/sl
 }{}
@@ -90,8 +94,4 @@
       <-> ssub * ETbb-Dnom/b/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{bx}{n}{
-      <-> ssub * ETbb-Dnom/b/n
-}{}
-
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd
index 6a95c35a725..c023c37a8a7 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 2020/06/17
+%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{OT1ETbb-Inf.fd}
-    [2020/06/17 (autoinst)  Font definitions for OT1/ETbb-Inf.]
+    [2020/06/27 (autoinst)  Font definitions for OT1/ETbb-Inf.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{OT1}{ETbb-Inf}{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{ETbb-Inf}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-inf-ot1
+\DeclareFontShape{OT1}{ETbb-Inf}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-inf-ot1
+\DeclareFontShape{OT1}{ETbb-Inf}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{bold}{sl}{
-      <-> ssub * ETbb-Inf/bold/it
+\DeclareFontShape{OT1}{ETbb-Inf}{regular}{sl}{
+      <-> ssub * ETbb-Inf/regular/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{ETbb-Inf}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-inf-ot1
+\DeclareFontShape{OT1}{ETbb-Inf}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-inf-ot1
+\DeclareFontShape{OT1}{ETbb-Inf}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{regular}{sl}{
-      <-> ssub * ETbb-Inf/regular/it
+\DeclareFontShape{OT1}{ETbb-Inf}{bold}{sl}{
+      <-> ssub * ETbb-Inf/bold/it
 }{}
 
 %
@@ -55,14 +55,14 @@
 
 %   m --> regular
 
-\DeclareFontShape{OT1}{ETbb-Inf}{m}{sl}{
-      <-> alias * ETbb-Inf/regular/sl
-}{}
-
 \DeclareFontShape{OT1}{ETbb-Inf}{m}{it}{
       <-> alias * ETbb-Inf/regular/it
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Inf}{m}{sl}{
+      <-> alias * ETbb-Inf/regular/sl
+}{}
+
 \DeclareFontShape{OT1}{ETbb-Inf}{m}{n}{
       <-> alias * ETbb-Inf/regular/n
 }{}
@@ -82,16 +82,16 @@
       <-> 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
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{bx}{sl}{
-      <-> ssub * ETbb-Inf/b/sl
+\DeclareFontShape{OT1}{ETbb-Inf}{bx}{n}{
+      <-> ssub * ETbb-Inf/b/n
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-LF.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-LF.fd
index e2ea1709c82..f252b0f0df8 100644
--- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-LF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/17
+%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{OT1ETbb-LF.fd}
-    [2020/06/17 (autoinst)  Font definitions for OT1/ETbb-LF.]
+    [2020/06/27 (autoinst)  Font definitions for OT1/ETbb-LF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,57 +20,57 @@
 \DeclareFontFamily{OT1}{ETbb-LF}{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{ETbb-LF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-lf-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb-Italic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{bold}{sc}{
-      <-> \ETbb@@scale ETbb-Bold-lf-sc-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}{n}{
+      <-> \ETbb@@scale ETbb-Regular-lf-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}{scsl}{
-      <-> ssub * ETbb-LF/bold/scit
+\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}{regular}{sl}{
+      <-> ssub * ETbb-LF/regular/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\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}{scit}{
-      <-> \ETbb@@scale ETbb-Italic-lf-sc-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}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-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}{scsl}{
-      <-> ssub * ETbb-LF/regular/scit
+\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}{bold}{sl}{
+      <-> ssub * ETbb-LF/bold/it
 }{}
 
 %
@@ -79,39 +79,39 @@
 
 %   m --> regular
 
-\DeclareFontShape{OT1}{ETbb-LF}{m}{it}{
-      <-> alias * ETbb-LF/regular/it
+\DeclareFontShape{OT1}{ETbb-LF}{m}{scsl}{
+      <-> alias * ETbb-LF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{ETbb-LF}{m}{scit}{
       <-> alias * ETbb-LF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{m}{n}{
-      <-> alias * ETbb-LF/regular/n
+\DeclareFontShape{OT1}{ETbb-LF}{m}{sl}{
+      <-> alias * ETbb-LF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{m}{sc}{
-      <-> alias * ETbb-LF/regular/sc
+\DeclareFontShape{OT1}{ETbb-LF}{m}{it}{
+      <-> alias * ETbb-LF/regular/it
 }{}
 
-\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}{sl}{
-      <-> alias * ETbb-LF/regular/sl
+\DeclareFontShape{OT1}{ETbb-LF}{m}{n}{
+      <-> alias * ETbb-LF/regular/n
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{ETbb-LF}{b}{sl}{
-      <-> alias * ETbb-LF/bold/sl
+\DeclareFontShape{OT1}{ETbb-LF}{b}{it}{
+      <-> alias * ETbb-LF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{b}{scsl}{
-      <-> alias * ETbb-LF/bold/scsl
+\DeclareFontShape{OT1}{ETbb-LF}{b}{sl}{
+      <-> alias * ETbb-LF/bold/sl
 }{}
 
 \DeclareFontShape{OT1}{ETbb-LF}{b}{n}{
@@ -122,16 +122,16 @@
       <-> alias * ETbb-LF/bold/sc
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{b}{it}{
-      <-> alias * ETbb-LF/bold/it
-}{}
-
 \DeclareFontShape{OT1}{ETbb-LF}{b}{scit}{
       <-> alias * ETbb-LF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{bx}{it}{
-      <-> ssub * ETbb-LF/b/it
+\DeclareFontShape{OT1}{ETbb-LF}{b}{scsl}{
+      <-> alias * ETbb-LF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{ETbb-LF}{bx}{scsl}{
+      <-> ssub * ETbb-LF/b/scsl
 }{}
 
 \DeclareFontShape{OT1}{ETbb-LF}{bx}{scit}{
@@ -146,12 +146,12 @@
       <-> ssub * ETbb-LF/b/n
 }{}
 
-\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}{it}{
+      <-> ssub * ETbb-LF/b/it
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-OsF.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-OsF.fd
index 80b3e42dca2..4f93a3385b8 100644
--- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-OsF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/17
+%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{OT1ETbb-OsF.fd}
-    [2020/06/17 (autoinst)  Font definitions for OT1/ETbb-OsF.]
+    [2020/06/27 (autoinst)  Font definitions for OT1/ETbb-OsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,20 +22,20 @@
 
 %   ----  bold  ----
 
-\DeclareFontShape{OT1}{ETbb-OsF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-osf-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb-BoldItalic-osf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{bold}{sc}{
       <-> \ETbb@@scale ETbb-Bold-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-osf-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb-BoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-osf-ot1
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{bold}{scsl}{
@@ -49,20 +49,20 @@
 
 %   ----  regular  ----
 
-\DeclareFontShape{OT1}{ETbb-OsF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb-Regular-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{ETbb-OsF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-osf-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb-Italic-osf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{regular}{it}{
       <-> \ETbb@@scale ETbb-Italic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb-Italic-osf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{regular}{sc}{
+      <-> \ETbb@@scale ETbb-Regular-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{ETbb-OsF}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-osf-ot1
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{regular}{scsl}{
@@ -79,8 +79,8 @@
 
 %   m --> regular
 
-\DeclareFontShape{OT1}{ETbb-OsF}{m}{sl}{
-      <-> alias * ETbb-OsF/regular/sl
+\DeclareFontShape{OT1}{ETbb-OsF}{m}{scit}{
+      <-> alias * ETbb-OsF/regular/scit
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{m}{scsl}{
@@ -99,51 +99,51 @@
       <-> alias * ETbb-OsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{m}{scit}{
-      <-> alias * ETbb-OsF/regular/scit
+\DeclareFontShape{OT1}{ETbb-OsF}{m}{sl}{
+      <-> alias * ETbb-OsF/regular/sl
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{n}{
-      <-> alias * ETbb-OsF/bold/n
-}{}
-
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{sc}{
-      <-> alias * ETbb-OsF/bold/sc
+\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}{scit}{
-      <-> alias * ETbb-OsF/bold/scit
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{sc}{
+      <-> alias * ETbb-OsF/bold/sc
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{sl}{
-      <-> alias * ETbb-OsF/bold/sl
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{n}{
+      <-> alias * ETbb-OsF/bold/n
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{b}{scsl}{
       <-> alias * ETbb-OsF/bold/scsl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{bx}{scsl}{
-      <-> ssub * ETbb-OsF/b/scsl
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{scit}{
+      <-> alias * ETbb-OsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{bx}{sl}{
-      <-> ssub * ETbb-OsF/b/sl
+\DeclareFontShape{OT1}{ETbb-OsF}{bx}{scit}{
+      <-> ssub * ETbb-OsF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{ETbb-OsF}{bx}{scsl}{
+      <-> ssub * ETbb-OsF/b/scsl
 }{}
 
 \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}{sl}{
+      <-> ssub * ETbb-OsF/b/sl
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{bx}{sc}{
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd
index 5ed909160c1..2912386bf4a 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 2020/06/17
+%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{OT1ETbb-Sup.fd}
-    [2020/06/17 (autoinst)  Font definitions for OT1/ETbb-Sup.]
+    [2020/06/27 (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}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{ETbb-Sup}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-sup-ot1
+\DeclareFontShape{OT1}{ETbb-Sup}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-sup-ot1
+\DeclareFontShape{OT1}{ETbb-Sup}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{regular}{sl}{
-      <-> ssub * ETbb-Sup/regular/it
+\DeclareFontShape{OT1}{ETbb-Sup}{bold}{sl}{
+      <-> ssub * ETbb-Sup/bold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{ETbb-Sup}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-sup-ot1
+\DeclareFontShape{OT1}{ETbb-Sup}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-sup-ot1
+\DeclareFontShape{OT1}{ETbb-Sup}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{bold}{sl}{
-      <-> ssub * ETbb-Sup/bold/it
+\DeclareFontShape{OT1}{ETbb-Sup}{regular}{sl}{
+      <-> ssub * ETbb-Sup/regular/it
 }{}
 
 %
@@ -70,10 +70,6 @@
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{ETbb-Sup}{b}{sl}{
-      <-> alias * ETbb-Sup/bold/sl
-}{}
-
 \DeclareFontShape{OT1}{ETbb-Sup}{b}{n}{
       <-> alias * ETbb-Sup/bold/n
 }{}
@@ -82,6 +78,14 @@
       <-> alias * ETbb-Sup/bold/it
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Sup}{b}{sl}{
+      <-> alias * ETbb-Sup/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{ETbb-Sup}{bx}{it}{
+      <-> ssub * ETbb-Sup/b/it
+}{}
+
 \DeclareFontShape{OT1}{ETbb-Sup}{bx}{sl}{
       <-> ssub * ETbb-Sup/b/sl
 }{}
@@ -90,8 +94,4 @@
       <-> ssub * ETbb-Sup/b/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{bx}{it}{
-      <-> ssub * ETbb-Sup/b/it
-}{}
-
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TLF.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TLF.fd
index a4b6d8384a9..5e7e0ec31bc 100644
--- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TLF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/17
+%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{OT1ETbb-TLF.fd}
-    [2020/06/17 (autoinst)  Font definitions for OT1/ETbb-TLF.]
+    [2020/06/27 (autoinst)  Font definitions for OT1/ETbb-TLF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,22 +22,22 @@
 
 %   ----  regular  ----
 
-\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}{scit}{
-      <-> \ETbb@@scale ETbb-Italic-tlf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-tlf-ot1
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TLF}{regular}{it}{
       <-> \ETbb@@scale ETbb-Italic-tlf-ot1
 }{}
 
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb-Italic-tlf-sc-ot1
+}{}
+
 \DeclareFontShape{OT1}{ETbb-TLF}{regular}{scsl}{
       <-> ssub * ETbb-TLF/regular/scit
 }{}
@@ -49,22 +49,22 @@
 
 %   ----  bold  ----
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-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}{n}{
+      <-> \ETbb@@scale ETbb-Bold-tlf-ot1
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TLF}{bold}{it}{
       <-> \ETbb@@scale ETbb-BoldItalic-tlf-ot1
 }{}
 
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tlf-sc-ot1
+}{}
+
 \DeclareFontShape{OT1}{ETbb-TLF}{bold}{scsl}{
       <-> ssub * ETbb-TLF/bold/scit
 }{}
@@ -79,79 +79,79 @@
 
 %   m --> regular
 
-\DeclareFontShape{OT1}{ETbb-TLF}{m}{scsl}{
-      <-> alias * ETbb-TLF/regular/scsl
-}{}
-
-\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}{n}{
-      <-> alias * ETbb-TLF/regular/n
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{sl}{
+      <-> alias * ETbb-TLF/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TLF}{m}{sc}{
       <-> alias * ETbb-TLF/regular/sc
 }{}
 
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{n}{
+      <-> alias * ETbb-TLF/regular/n
+}{}
+
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{ETbb-TLF}{b}{sl}{
-      <-> alias * ETbb-TLF/bold/sl
-}{}
-
 \DeclareFontShape{OT1}{ETbb-TLF}{b}{scsl}{
       <-> alias * ETbb-TLF/bold/scsl
 }{}
 
-\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}{sl}{
+      <-> alias * ETbb-TLF/bold/sl
+}{}
+
 \DeclareFontShape{OT1}{ETbb-TLF}{b}{it}{
       <-> alias * ETbb-TLF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bx}{sl}{
-      <-> ssub * ETbb-TLF/b/sl
+\DeclareFontShape{OT1}{ETbb-TLF}{b}{sc}{
+      <-> alias * ETbb-TLF/bold/sc
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bx}{scsl}{
-      <-> ssub * ETbb-TLF/b/scsl
+\DeclareFontShape{OT1}{ETbb-TLF}{b}{n}{
+      <-> alias * ETbb-TLF/bold/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bx}{sc}{
-      <-> ssub * ETbb-TLF/b/sc
+\DeclareFontShape{OT1}{ETbb-TLF}{bx}{scit}{
+      <-> ssub * ETbb-TLF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TLF}{bx}{scsl}{
+      <-> ssub * ETbb-TLF/b/scsl
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TLF}{bx}{n}{
       <-> ssub * ETbb-TLF/b/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bx}{scit}{
-      <-> ssub * ETbb-TLF/b/scit
+\DeclareFontShape{OT1}{ETbb-TLF}{bx}{sc}{
+      <-> ssub * ETbb-TLF/b/sc
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TLF}{bx}{it}{
       <-> ssub * ETbb-TLF/b/it
 }{}
 
+\DeclareFontShape{OT1}{ETbb-TLF}{bx}{sl}{
+      <-> ssub * ETbb-TLF/b/sl
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TOsF.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TOsF.fd
index fcf8e780206..8b47e6b142e 100644
--- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/17
+%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{OT1ETbb-TOsF.fd}
-    [2020/06/17 (autoinst)  Font definitions for OT1/ETbb-TOsF.]
+    [2020/06/27 (autoinst)  Font definitions for OT1/ETbb-TOsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,57 +20,57 @@
 \DeclareFontFamily{OT1}{ETbb-TOsF}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\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}{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}{sc}{
-      <-> \ETbb@@scale ETbb-Regular-tosf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-tosf-ot1
+\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}{scsl}{
+      <-> ssub * ETbb-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{sl}{
-      <-> ssub * ETbb-TOsF/regular/it
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{sl}{
+      <-> ssub * ETbb-TOsF/bold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tosf-sc-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}{n}{
-      <-> \ETbb@@scale ETbb-Bold-tosf-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb-Italic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scsl}{
-      <-> ssub * ETbb-TOsF/bold/scit
+\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}{regular}{sl}{
+      <-> ssub * ETbb-TOsF/regular/it
 }{}
 
 %
@@ -79,20 +79,12 @@
 
 %   m --> regular
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{m}{scsl}{
-      <-> alias * ETbb-TOsF/regular/scsl
-}{}
-
-\DeclareFontShape{OT1}{ETbb-TOsF}{m}{sl}{
-      <-> alias * ETbb-TOsF/regular/sl
-}{}
-
 \DeclareFontShape{OT1}{ETbb-TOsF}{m}{it}{
       <-> alias * ETbb-TOsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{m}{scit}{
-      <-> alias * ETbb-TOsF/regular/scit
+\DeclareFontShape{OT1}{ETbb-TOsF}{m}{sl}{
+      <-> alias * ETbb-TOsF/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TOsF}{m}{sc}{
@@ -103,43 +95,47 @@
       <-> alias * ETbb-TOsF/regular/n
 }{}
 
+\DeclareFontShape{OT1}{ETbb-TOsF}{m}{scit}{
+      <-> alias * ETbb-TOsF/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TOsF}{m}{scsl}{
+      <-> alias * ETbb-TOsF/regular/scsl
+}{}
+
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{b}{it}{
-      <-> alias * ETbb-TOsF/bold/it
+\DeclareFontShape{OT1}{ETbb-TOsF}{b}{scsl}{
+      <-> alias * ETbb-TOsF/bold/scsl
 }{}
 
 \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}{n}{
       <-> alias * ETbb-TOsF/bold/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{b}{scsl}{
-      <-> alias * ETbb-TOsF/bold/scsl
+\DeclareFontShape{OT1}{ETbb-TOsF}{b}{sc}{
+      <-> alias * ETbb-TOsF/bold/sc
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TOsF}{b}{sl}{
       <-> alias * ETbb-TOsF/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{n}{
-      <-> ssub * ETbb-TOsF/b/n
+\DeclareFontShape{OT1}{ETbb-TOsF}{b}{it}{
+      <-> alias * ETbb-TOsF/bold/it
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TOsF}{bx}{sc}{
       <-> ssub * ETbb-TOsF/b/sc
 }{}
 
-\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}{it}{
@@ -150,6 +146,10 @@
       <-> ssub * ETbb-TOsF/b/sl
 }{}
 
+\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{scit}{
+      <-> ssub * ETbb-TOsF/b/scit
+}{}
+
 \DeclareFontShape{OT1}{ETbb-TOsF}{bx}{scsl}{
       <-> ssub * ETbb-TOsF/b/scsl
 }{}
diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Dnom.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Dnom.fd
index b385ca97faa..a0a2bb28576 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 2020/06/17
+%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{T1ETbb-Dnom.fd}
-    [2020/06/17 (autoinst)  Font definitions for T1/ETbb-Dnom.]
+    [2020/06/27 (autoinst)  Font definitions for T1/ETbb-Dnom.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{T1}{ETbb-Dnom}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{T1}{ETbb-Dnom}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-dnom-t1
+\DeclareFontShape{T1}{ETbb-Dnom}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Dnom}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-dnom-t1
+\DeclareFontShape{T1}{ETbb-Dnom}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Dnom}{regular}{sl}{
-      <-> ssub * ETbb-Dnom/regular/it
+\DeclareFontShape{T1}{ETbb-Dnom}{bold}{sl}{
+      <-> ssub * ETbb-Dnom/bold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{T1}{ETbb-Dnom}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-dnom-t1
+\DeclareFontShape{T1}{ETbb-Dnom}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Dnom}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-dnom-t1
+\DeclareFontShape{T1}{ETbb-Dnom}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Dnom}{bold}{sl}{
-      <-> ssub * ETbb-Dnom/bold/it
+\DeclareFontShape{T1}{ETbb-Dnom}{regular}{sl}{
+      <-> ssub * ETbb-Dnom/regular/it
 }{}
 
 %
@@ -59,14 +59,14 @@
       <-> alias * ETbb-Dnom/regular/n
 }{}
 
-\DeclareFontShape{T1}{ETbb-Dnom}{m}{it}{
-      <-> alias * ETbb-Dnom/regular/it
-}{}
-
 \DeclareFontShape{T1}{ETbb-Dnom}{m}{sl}{
       <-> alias * ETbb-Dnom/regular/sl
 }{}
 
+\DeclareFontShape{T1}{ETbb-Dnom}{m}{it}{
+      <-> alias * ETbb-Dnom/regular/it
+}{}
+
 
 %   b --> bold
 
@@ -74,16 +74,12 @@
       <-> alias * ETbb-Dnom/bold/n
 }{}
 
-\DeclareFontShape{T1}{ETbb-Dnom}{b}{it}{
-      <-> alias * ETbb-Dnom/bold/it
-}{}
-
 \DeclareFontShape{T1}{ETbb-Dnom}{b}{sl}{
       <-> alias * ETbb-Dnom/bold/sl
 }{}
 
-\DeclareFontShape{T1}{ETbb-Dnom}{bx}{sl}{
-      <-> ssub * ETbb-Dnom/b/sl
+\DeclareFontShape{T1}{ETbb-Dnom}{b}{it}{
+      <-> alias * ETbb-Dnom/bold/it
 }{}
 
 \DeclareFontShape{T1}{ETbb-Dnom}{bx}{n}{
@@ -94,4 +90,8 @@
       <-> ssub * ETbb-Dnom/b/it
 }{}
 
+\DeclareFontShape{T1}{ETbb-Dnom}{bx}{sl}{
+      <-> ssub * ETbb-Dnom/b/sl
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd
index 310cb45c2af..73722b110a6 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 2020/06/17
+%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{T1ETbb-Inf.fd}
-    [2020/06/17 (autoinst)  Font definitions for T1/ETbb-Inf.]
+    [2020/06/27 (autoinst)  Font definitions for T1/ETbb-Inf.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{T1}{ETbb-Inf}{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{T1}{ETbb-Inf}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-inf-t1
+\DeclareFontShape{T1}{ETbb-Inf}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-inf-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-inf-t1
+\DeclareFontShape{T1}{ETbb-Inf}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{bold}{sl}{
-      <-> ssub * ETbb-Inf/bold/it
+\DeclareFontShape{T1}{ETbb-Inf}{regular}{sl}{
+      <-> ssub * ETbb-Inf/regular/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{T1}{ETbb-Inf}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-inf-t1
+\DeclareFontShape{T1}{ETbb-Inf}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-inf-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-inf-t1
+\DeclareFontShape{T1}{ETbb-Inf}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{regular}{sl}{
-      <-> ssub * ETbb-Inf/regular/it
+\DeclareFontShape{T1}{ETbb-Inf}{bold}{sl}{
+      <-> ssub * ETbb-Inf/bold/it
 }{}
 
 %
@@ -74,24 +74,24 @@
       <-> alias * ETbb-Inf/bold/sl
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{b}{n}{
-      <-> alias * ETbb-Inf/bold/n
-}{}
-
 \DeclareFontShape{T1}{ETbb-Inf}{b}{it}{
       <-> alias * ETbb-Inf/bold/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{bx}{n}{
-      <-> ssub * ETbb-Inf/b/n
+\DeclareFontShape{T1}{ETbb-Inf}{b}{n}{
+      <-> alias * ETbb-Inf/bold/n
+}{}
+
+\DeclareFontShape{T1}{ETbb-Inf}{bx}{sl}{
+      <-> ssub * ETbb-Inf/b/sl
 }{}
 
 \DeclareFontShape{T1}{ETbb-Inf}{bx}{it}{
       <-> ssub * ETbb-Inf/b/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{bx}{sl}{
-      <-> ssub * ETbb-Inf/b/sl
+\DeclareFontShape{T1}{ETbb-Inf}{bx}{n}{
+      <-> ssub * ETbb-Inf/b/n
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd
index 11dbfdfb6d6..90b8b2bbd4d 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 2020/06/17
+%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{T1ETbb-Sup.fd}
-    [2020/06/17 (autoinst)  Font definitions for T1/ETbb-Sup.]
+    [2020/06/27 (autoinst)  Font definitions for T1/ETbb-Sup.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -55,16 +55,16 @@
 
 %   m --> regular
 
-\DeclareFontShape{T1}{ETbb-Sup}{m}{n}{
-      <-> alias * ETbb-Sup/regular/n
+\DeclareFontShape{T1}{ETbb-Sup}{m}{sl}{
+      <-> alias * ETbb-Sup/regular/sl
 }{}
 
 \DeclareFontShape{T1}{ETbb-Sup}{m}{it}{
       <-> alias * ETbb-Sup/regular/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Sup}{m}{sl}{
-      <-> alias * ETbb-Sup/regular/sl
+\DeclareFontShape{T1}{ETbb-Sup}{m}{n}{
+      <-> alias * ETbb-Sup/regular/n
 }{}
 
 
@@ -74,22 +74,22 @@
       <-> alias * ETbb-Sup/bold/n
 }{}
 
-\DeclareFontShape{T1}{ETbb-Sup}{b}{it}{
-      <-> alias * ETbb-Sup/bold/it
-}{}
-
 \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}{it}{
+      <-> alias * ETbb-Sup/bold/it
 }{}
 
 \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
 }{}
diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd
index ac642cf4345..8f2c4b38d90 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 2020/06/17
+%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{TS1ETbb-LF.fd}
-    [2020/06/17 (autoinst)  Font definitions for TS1/ETbb-LF.]
+    [2020/06/27 (autoinst)  Font definitions for TS1/ETbb-LF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{TS1}{ETbb-LF}{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{TS1}{ETbb-LF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-lf-ts1
+\DeclareFontShape{TS1}{ETbb-LF}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-lf-ts1
+\DeclareFontShape{TS1}{ETbb-LF}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{bold}{sl}{
-      <-> ssub * ETbb-LF/bold/it
+\DeclareFontShape{TS1}{ETbb-LF}{regular}{sl}{
+      <-> ssub * ETbb-LF/regular/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{TS1}{ETbb-LF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-lf-ts1
+\DeclareFontShape{TS1}{ETbb-LF}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-lf-ts1
+\DeclareFontShape{TS1}{ETbb-LF}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{regular}{sl}{
-      <-> ssub * ETbb-LF/regular/it
+\DeclareFontShape{TS1}{ETbb-LF}{bold}{sl}{
+      <-> ssub * ETbb-LF/bold/it
 }{}
 
 %
@@ -55,14 +55,14 @@
 
 %   m --> regular
 
-\DeclareFontShape{TS1}{ETbb-LF}{m}{sl}{
-      <-> alias * ETbb-LF/regular/sl
-}{}
-
 \DeclareFontShape{TS1}{ETbb-LF}{m}{it}{
       <-> alias * ETbb-LF/regular/it
 }{}
 
+\DeclareFontShape{TS1}{ETbb-LF}{m}{sl}{
+      <-> alias * ETbb-LF/regular/sl
+}{}
+
 \DeclareFontShape{TS1}{ETbb-LF}{m}{n}{
       <-> alias * ETbb-LF/regular/n
 }{}
@@ -70,26 +70,26 @@
 
 %   b --> bold
 
-\DeclareFontShape{TS1}{ETbb-LF}{b}{sl}{
-      <-> alias * ETbb-LF/bold/sl
-}{}
-
 \DeclareFontShape{TS1}{ETbb-LF}{b}{it}{
       <-> alias * ETbb-LF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{b}{n}{
-      <-> alias * ETbb-LF/bold/n
+\DeclareFontShape{TS1}{ETbb-LF}{b}{sl}{
+      <-> alias * ETbb-LF/bold/sl
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{bx}{sl}{
-      <-> ssub * ETbb-LF/b/sl
+\DeclareFontShape{TS1}{ETbb-LF}{b}{n}{
+      <-> alias * ETbb-LF/bold/n
 }{}
 
 \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
 }{}
diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd
index 5ba8debfa2b..cd8067c7d0e 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 2020/06/17
+%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{TS1ETbb-OsF.fd}
-    [2020/06/17 (autoinst)  Font definitions for TS1/ETbb-OsF.]
+    [2020/06/27 (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}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{TS1}{ETbb-OsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-osf-ts1
+\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}{sl}{
-      <-> ssub * ETbb-OsF/regular/it
+\DeclareFontShape{TS1}{ETbb-OsF}{bold}{sl}{
+      <-> ssub * ETbb-OsF/bold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\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}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-osf-ts1
+\DeclareFontShape{TS1}{ETbb-OsF}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-OsF}{bold}{sl}{
-      <-> ssub * ETbb-OsF/bold/it
+\DeclareFontShape{TS1}{ETbb-OsF}{regular}{sl}{
+      <-> ssub * ETbb-OsF/regular/it
 }{}
 
 %
@@ -55,10 +55,6 @@
 
 %   m --> regular
 
-\DeclareFontShape{TS1}{ETbb-OsF}{m}{it}{
-      <-> alias * ETbb-OsF/regular/it
-}{}
-
 \DeclareFontShape{TS1}{ETbb-OsF}{m}{n}{
       <-> alias * ETbb-OsF/regular/n
 }{}
@@ -67,17 +63,21 @@
       <-> alias * ETbb-OsF/regular/sl
 }{}
 
+\DeclareFontShape{TS1}{ETbb-OsF}{m}{it}{
+      <-> alias * ETbb-OsF/regular/it
+}{}
 
-%   b --> bold
 
-\DeclareFontShape{TS1}{ETbb-OsF}{b}{sl}{
-      <-> alias * ETbb-OsF/bold/sl
-}{}
+%   b --> bold
 
 \DeclareFontShape{TS1}{ETbb-OsF}{b}{n}{
       <-> alias * ETbb-OsF/bold/n
 }{}
 
+\DeclareFontShape{TS1}{ETbb-OsF}{b}{sl}{
+      <-> alias * ETbb-OsF/bold/sl
+}{}
+
 \DeclareFontShape{TS1}{ETbb-OsF}{b}{it}{
       <-> alias * ETbb-OsF/bold/it
 }{}
@@ -86,12 +86,12 @@
       <-> ssub * ETbb-OsF/b/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-OsF}{bx}{n}{
-      <-> ssub * ETbb-OsF/b/n
-}{}
-
 \DeclareFontShape{TS1}{ETbb-OsF}{bx}{sl}{
       <-> ssub * ETbb-OsF/b/sl
 }{}
 
+\DeclareFontShape{TS1}{ETbb-OsF}{bx}{n}{
+      <-> ssub * ETbb-OsF/b/n
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd
index b961918e15e..3a5605c12ff 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 2020/06/17
+%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{TS1ETbb-TLF.fd}
-    [2020/06/17 (autoinst)  Font definitions for TS1/ETbb-TLF.]
+    [2020/06/27 (autoinst)  Font definitions for TS1/ETbb-TLF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{TS1}{ETbb-TLF}{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{TS1}{ETbb-TLF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-tlf-ts1
+\DeclareFontShape{TS1}{ETbb-TLF}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TLF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{ETbb-TLF}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TLF}{bold}{sl}{
-      <-> ssub * ETbb-TLF/bold/it
+\DeclareFontShape{TS1}{ETbb-TLF}{regular}{sl}{
+      <-> ssub * ETbb-TLF/regular/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{TS1}{ETbb-TLF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-tlf-ts1
+\DeclareFontShape{TS1}{ETbb-TLF}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TLF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-tlf-ts1
+\DeclareFontShape{TS1}{ETbb-TLF}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TLF}{regular}{sl}{
-      <-> ssub * ETbb-TLF/regular/it
+\DeclareFontShape{TS1}{ETbb-TLF}{bold}{sl}{
+      <-> ssub * ETbb-TLF/bold/it
 }{}
 
 %
@@ -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
 }{}
@@ -70,6 +70,10 @@
 
 %   b --> bold
 
+\DeclareFontShape{TS1}{ETbb-TLF}{b}{it}{
+      <-> alias * ETbb-TLF/bold/it
+}{}
+
 \DeclareFontShape{TS1}{ETbb-TLF}{b}{sl}{
       <-> alias * ETbb-TLF/bold/sl
 }{}
@@ -78,18 +82,14 @@
       <-> alias * ETbb-TLF/bold/n
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TLF}{b}{it}{
-      <-> alias * ETbb-TLF/bold/it
+\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}{it}{
-      <-> ssub * ETbb-TLF/b/it
-}{}
-
 \DeclareFontShape{TS1}{ETbb-TLF}{bx}{n}{
       <-> ssub * ETbb-TLF/b/n
 }{}
diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd
index d733dddaf40..690053d29e4 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 2020/06/17
+%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{TS1ETbb-TOsF.fd}
-    [2020/06/17 (autoinst)  Font definitions for TS1/ETbb-TOsF.]
+    [2020/06/27 (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}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-tosf-ts1
+\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-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}{n}{
+      <-> \ETbb@@scale ETbb-Regular-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-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,14 +55,14 @@
 
 %   m --> regular
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{m}{sl}{
-      <-> alias * ETbb-TOsF/regular/sl
-}{}
-
 \DeclareFontShape{TS1}{ETbb-TOsF}{m}{n}{
       <-> alias * ETbb-TOsF/regular/n
 }{}
 
+\DeclareFontShape{TS1}{ETbb-TOsF}{m}{sl}{
+      <-> alias * ETbb-TOsF/regular/sl
+}{}
+
 \DeclareFontShape{TS1}{ETbb-TOsF}{m}{it}{
       <-> alias * ETbb-TOsF/regular/it
 }{}
@@ -70,6 +70,10 @@
 
 %   b --> bold
 
+\DeclareFontShape{TS1}{ETbb-TOsF}{b}{sl}{
+      <-> alias * ETbb-TOsF/bold/sl
+}{}
+
 \DeclareFontShape{TS1}{ETbb-TOsF}{b}{it}{
       <-> alias * ETbb-TOsF/bold/it
 }{}
@@ -78,8 +82,8 @@
       <-> alias * ETbb-TOsF/bold/n
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{b}{sl}{
-      <-> alias * ETbb-TOsF/bold/sl
+\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{sl}{
+      <-> ssub * ETbb-TOsF/b/sl
 }{}
 
 \DeclareFontShape{TS1}{ETbb-TOsF}{bx}{it}{
@@ -90,8 +94,4 @@
       <-> ssub * ETbb-TOsF/b/n
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{sl}{
-      <-> ssub * ETbb-TOsF/b/sl
-}{}
-
 \endinput