etbb (2jul20)

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

26 files changed, 1207 insertions, 719 deletions

diff --git a/Master/texmf-dist/tex/latex/etbb/ETbb.sty b/Master/texmf-dist/tex/latex/etbb/ETbb.sty
index 476ee84a82b..bcdc8844094 100644
--- a/Master/texmf-dist/tex/latex/etbb/ETbb.sty
+++ b/Master/texmf-dist/tex/latex/etbb/ETbb.sty
@@ -1,11 +1,11 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.04}
-\def\filedate{2020/06/27}
+\def\fileversion{1.05}
+\def\filedate{2020/07/01}
 \ProvidesPackage{ETbb}
     [\filedate\space v\fileversion.  Style file for ETbb.]
 
-\RequirePackage[T1,LY1]{fontenc}
+\RequirePackage[LY1,T1]{fontenc}
 \RequirePackage[full]{textcomp}
 \RequirePackage{ifetex}
 \ifetex\RequirePackage{etoolbox}\fi %etoolbox loads etex.sty
@@ -13,23 +13,35 @@
 \IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
 \IfFileExists{fontaxes.sty}{
     \RequirePackage{fontaxes}
-    \fa@naming@exception{figures}{{superior}{proportional}}{Sup}
+    \DeclareRobustCommand\swshape{\not@math@alphabet\swshape\relax
+        \fontprimaryshape\itdefault\fontsecondaryshape\swdefault\selectfont}
+    \fa@naming@exception{shape}{{n}{sw}}{nw}
+    \fa@naming@exception{shape}{{it}{sw}}{sw}\fa@naming@exception{figures}{{superior}{proportional}}{Sup}
     \fa@naming@exception{figures}{{superior}{tabular}}{Sup}
-    \def\sufigures{\@nomath\sufigures
-        \fontfigurestyle{superior}\selectfont}
-    \DeclareTextFontCommand{\textsu}{\sufigures}
-    \let\textsuperior\textsu
-
     \fa@naming@exception{figures}{{inferior}{proportional}}{Inf}
     \fa@naming@exception{figures}{{inferior}{tabular}}{Inf}
-    \def\infigures{\@nomath\infigures
+    \def\supfigures{\@nomath\supfigures
+        \fontfigurestyle{superior}\selectfont}
+    \let\sufigures\supfigures
+    \DeclareTextFontCommand{\textsup}{\supfigures}
+    \let\textsu\textsup
+    \let\textsuperior\textsup
+    \def\inffigures{\@nomath\inffigures
         \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}}}
+    \let\infigures\inffigures
+    \DeclareTextFontCommand{\textinf}{\inffigures}
+    \let\textin\textinf
+    \let\textinferior\textinf
+    \fa@naming@exception{figures}{{denominators}{proportional}}{Dnom}
+    \fa@naming@exception{figures}{{denominators}{tabular}}{Dnom}
+    \def\denomfigures{\@nomath\denomfigures
+        \fontfigurestyle{denominators}\selectfont}
+    \let\defigures\denomfigures
+    \DeclareTextFontCommand{\textdenom}{\denomfigures}
+    \let\textde\textdenom
+    \let\textdenominator\textdenom
+
 }{}
-\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]
@@ -62,16 +74,11 @@
   }%
 }
 
-\IfFileExists{xkeyval.sty}{
-    \newcommand*{\ETbb@scale}{1}
-    \RequirePackage{xkeyval}
-    \DeclareOptionX{scale}{\renewcommand*{\ETbb@scale}{##1}}
-    \DeclareOptionX{scaled}{\renewcommand*{\ETbb@scale}{##1}}
-}{
-    \let\DeclareOptionX\DeclareOption
-    \let\ExecuteOptionsX\ExecuteOptions
-    \let\ProcessOptionsX\ProcessOptions
-}
+\newcommand*{\ETbb@scale}{1}
+\RequirePackage{xkeyval}
+\DeclareOptionX{scale}{\renewcommand*{\ETbb@scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\ETbb@scale}{#1}}
+
 \let\orig@footnote=\thefootnote
 \let\orig@makefnmark=\@makefnmark
 %\def\bfseries@rm{b}
@@ -80,6 +87,7 @@
 \@onlypreamble\useosf
 \def\useproportional{\edef\ETbb@figurealign{}}
 \@onlypreamble\useproportional
+\def\ETbb@@swashQ{}
 \newif\if@ETbb@sharpS
 \newif\if@ETbb@sups
 \newif\if@ETbb@scosf
@@ -101,6 +109,7 @@
 \DeclareOptionX{proportional}{\useproportional}
 \DeclareOptionX{p}{\useproportional}
 \DeclareOptionX{sharpS}{\@ETbb@sharpStrue}
+\DeclareOptionX{swashQ}{\edef\ETbb@@swashQ{-swash}}
 \DeclareOptionX{mainfont}{
     \renewcommand{\familydefault}{\rmdefault}
 }
@@ -153,6 +162,9 @@
 {\fontfamily{ETbb-\ETbb@figurealign OsF}\fontshape{sc}\selectfont #1}%
 }\fi
 
+\newcommand{\Qswash}{{\fontencoding{TS1}\fontfamily{ETbb-LF}\selectfont \char59 }}
+\newcommand{\Qnoswash}{{\fontencoding{TS1}\fontfamily{ETbb-LF}\selectfont \char58 }}
+
 %\renewcommand*{\familydefault}{\rmdefault}
 \if@ETbb@sups %
  \ifdefined\sufigures
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Dnom.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Dnom.fd
index 347d6ba3ad2..4924d3a55a0 100644
--- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Dnom.fd
+++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Dnom.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{LY1ETbb-Dnom.fd}
-    [2020/06/27 (autoinst)  Font definitions for LY1/ETbb-Dnom.]
+    [2020/07/01 (autoinst)  Font definitions for LY1/ETbb-Dnom.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,14 @@
 
 %   ----  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}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-dnom-ly1
+}{}
+
 \DeclareFontShape{LY1}{ETbb-Dnom}{bold}{sl}{
       <-> ssub * ETbb-Dnom/bold/it
 }{}
@@ -55,16 +55,16 @@
 
 %   m --> regular
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{m}{it}{
-      <-> 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
+\DeclareFontShape{LY1}{ETbb-Dnom}{m}{it}{
+      <-> alias * ETbb-Dnom/regular/it
 }{}
 
 
@@ -82,14 +82,14 @@
       <-> alias * ETbb-Dnom/bold/n
 }{}
 
-\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
 }{}
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd
index 7cd45deb396..e2c933c86df 100644
--- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd
+++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{LY1ETbb-Inf.fd}
-    [2020/06/27 (autoinst)  Font definitions for LY1/ETbb-Inf.]
+    [2020/07/01 (autoinst)  Font definitions for LY1/ETbb-Inf.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,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}{n}{
+      <-> \ETbb@@scale ETbb-Regular-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-inf-ly1
+\DeclareFontShape{LY1}{ETbb-Inf}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-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}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-inf-ly1
+\DeclareFontShape{LY1}{ETbb-Inf}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{regular}{sl}{
-      <-> ssub * ETbb-Inf/regular/it
+\DeclareFontShape{LY1}{ETbb-Inf}{bold}{sl}{
+      <-> ssub * ETbb-Inf/bold/it
 }{}
 
 %
@@ -55,10 +55,6 @@
 
 %   m --> regular
 
-\DeclareFontShape{LY1}{ETbb-Inf}{m}{sl}{
-      <-> alias * ETbb-Inf/regular/sl
-}{}
-
 \DeclareFontShape{LY1}{ETbb-Inf}{m}{it}{
       <-> alias * ETbb-Inf/regular/it
 }{}
@@ -67,6 +63,10 @@
       <-> alias * ETbb-Inf/regular/n
 }{}
 
+\DeclareFontShape{LY1}{ETbb-Inf}{m}{sl}{
+      <-> alias * ETbb-Inf/regular/sl
+}{}
+
 
 %   b --> bold
 
@@ -74,12 +74,16 @@
       <-> 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}{b}{n}{
-      <-> alias * ETbb-Inf/bold/n
+\DeclareFontShape{LY1}{ETbb-Inf}{bx}{n}{
+      <-> ssub * ETbb-Inf/b/n
 }{}
 
 \DeclareFontShape{LY1}{ETbb-Inf}{bx}{sl}{
@@ -90,8 +94,4 @@
       <-> ssub * ETbb-Inf/b/it
 }{}
 
-\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 f5470e28b19..f8ed0c95421 100644
--- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-LF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-LF.fd
@@ -1,7 +1,11 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/02/15
 %%
 \ProvidesFile{LY1ETbb-LF.fd}
-    [2020/06/27 (autoinst)  Font definitions for LY1/ETbb-LF.]
+    [2020/02/15 (autoinst)  Font definitions for LY1/ETbb-LF.]
+
+\expandafter\ifx\csname ETbb@@swashQ\endcsname\relax%
+	\global\let\ETbb@@swashQ\@empty
+\fi
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -11,6 +15,13 @@
 }
 \fi
 
+\edef\ETbb@@S{} % do not use fancy sharpS
+\expandafter\ifx\csname @ETbb@sharpSfalse\endcsname\relax
+\csname iftrue\endcsname
+\else
+	\if@ETbb@sharpS\edef\ETbb@@S{1}\fi % do use fancy sharpS
+\fi
+
 \expandafter\ifx\csname ETbb@scale\endcsname\relax
     \let\ETbb@@scale\@empty
 \else
@@ -22,20 +33,28 @@
 
 %   ----  bold  ----
 
+\DeclareFontShape{LY1}{ETbb-LF}{bold}{nw}{
+      <-> \ETbb@@scale ETbb-Bold-lf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{ETbb-LF}{bold}{sw}{
+      <-> \ETbb@@scale ETbb-BoldItalic-lf-swash-ly1
+}{}
+
 \DeclareFontShape{LY1}{ETbb-LF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-lf-ly1
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-lf\ETbb@@swashQ-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{bold}{sc}{
-      <-> \ETbb@@scale ETbb-Bold-lf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-LF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-lf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-LF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-lf-ly1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-lf\ETbb@@swashQ-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb-BoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-LF}{bold}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-lf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-LF}{bold}{scsl}{
@@ -49,20 +68,28 @@
 
 %   ----  regular  ----
 
+\DeclareFontShape{LY1}{ETbb-LF}{regular}{nw}{
+      <-> \ETbb@@scale ETbb-Regular-lf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{ETbb-LF}{regular}{sw}{
+      <-> \ETbb@@scale ETbb-Italic-lf-swash-ly1
+}{}
+
 \DeclareFontShape{LY1}{ETbb-LF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-lf-ly1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-lf\ETbb@@swashQ-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-LF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb-Regular-lf-sc-ly1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-lf-ly1
+\DeclareFontShape{LY1}{ETbb-LF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb-Italic-lf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-LF}{regular}{n}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-lf\ETbb@@swashQ-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-LF}{regular}{scsl}{
@@ -79,8 +106,8 @@
 
 %   m --> regular
 
-\DeclareFontShape{LY1}{ETbb-LF}{m}{sc}{
-      <-> alias * ETbb-LF/regular/sc
+\DeclareFontShape{LY1}{ETbb-LF}{m}{scit}{
+      <-> alias * ETbb-LF/regular/scit
 }{}
 
 \DeclareFontShape{LY1}{ETbb-LF}{m}{n}{
@@ -91,6 +118,10 @@
       <-> alias * ETbb-LF/regular/sl
 }{}
 
+\DeclareFontShape{LY1}{ETbb-LF}{m}{sc}{
+      <-> alias * ETbb-LF/regular/sc
+}{}
+
 \DeclareFontShape{LY1}{ETbb-LF}{m}{it}{
       <-> alias * ETbb-LF/regular/it
 }{}
@@ -99,59 +130,71 @@
       <-> alias * ETbb-LF/regular/scsl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{m}{scit}{
-      <-> alias * ETbb-LF/regular/scit
-}{}
-
 
 %   b --> bold
 
+\DeclareFontShape{LY1}{ETbb-LF}{b}{sw}{
+      <-> alias * ETbb-LF/bold/sw
+}{}
+
+\DeclareFontShape{LY1}{ETbb-LF}{b}{nw}{
+      <-> alias * ETbb-LF/bold/nw
+}{}
+
 \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}{sl}{
       <-> alias * ETbb-LF/bold/sl
 }{}
 
-\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}{n}{
       <-> alias * ETbb-LF/bold/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{b}{scit}{
-      <-> alias * ETbb-LF/bold/scit
-}{}
-
-\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}{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}{scit}{
+      <-> ssub * ETbb-LF/b/scit
 }{}
 
 \DeclareFontShape{LY1}{ETbb-LF}{bx}{n}{
       <-> ssub * ETbb-LF/b/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{bx}{scit}{
-      <-> ssub * ETbb-LF/b/scit
+\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}{nw}{
+      <-> ssub * ETbb-LF/b/nw
+}{}
+
+\DeclareFontShape{LY1}{ETbb-LF}{bx}{sw}{
+      <-> ssub * ETbb-LF/b/sw
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-OsF.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-OsF.fd
index 339c62acd54..1904ca84c4e 100644
--- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-OsF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-OsF.fd
@@ -1,7 +1,9 @@
-%% Generated by autoinst on 2020/06/27
-%%
 \ProvidesFile{LY1ETbb-OsF.fd}
-    [2020/06/27 (autoinst)  Font definitions for LY1/ETbb-OsF.]
+    [2020/02/15  Font definitions for LY1/ETbb-OsF.]
+
+\expandafter\ifx\csname ETbb@@swashQ\endcsname\relax%
+	\global\let\ETbb@@swashQ\@empty
+\fi
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -11,6 +13,13 @@
 }
 \fi
 
+\edef\ETbb@@S{} % do not use fancy sharpS
+\expandafter\ifx\csname @ETbb@sharpSfalse\endcsname\relax
+\csname iftrue\endcsname
+\else
+	\if@ETbb@sharpS\edef\ETbb@@S{1}\fi % do use fancy sharpS
+\fi
+%\show\ETbb@@S
 \expandafter\ifx\csname ETbb@scale\endcsname\relax
     \let\ETbb@@scale\@empty
 \else
@@ -22,20 +31,28 @@
 
 %   ----  bold  ----
 
-\DeclareFontShape{LY1}{ETbb-OsF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb-BoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-OsF}{bold}{nw}{
+      <-> \ETbb@@scale ETbb-Bold-osf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{bold}{sc}{
-      <-> \ETbb@@scale ETbb-Bold-osf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-OsF}{bold}{sw}{
+      <-> \ETbb@@scale ETbb-BoldItalic-osf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{ETbb-OsF}{bold}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-osf\ETbb@@swashQ-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-OsF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-osf-ly1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-osf\ETbb@@swashQ-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-osf-ly1
+\DeclareFontShape{LY1}{ETbb-OsF}{bold}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{ETbb-OsF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-osf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-OsF}{bold}{scsl}{
@@ -50,19 +67,19 @@
 %   ----  regular  ----
 
 \DeclareFontShape{LY1}{ETbb-OsF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb-Italic-osf-sc-ly1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-osf-ly1
+\DeclareFontShape{LY1}{ETbb-OsF}{regular}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-osf-ly1
+\DeclareFontShape{LY1}{ETbb-OsF}{regular}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-osf\ETbb@@swashQ-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb-Regular-osf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-OsF}{regular}{n}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-osf\ETbb@@swashQ-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-OsF}{regular}{scsl}{
@@ -79,22 +96,26 @@
 
 %   m --> regular
 
-\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}{sc}{
-      <-> alias * ETbb-OsF/regular/sc
+\DeclareFontShape{LY1}{ETbb-OsF}{m}{nw}{
+      <-> alias * ETbb-OsF/regular/nw
 }{}
 
-\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}{it}{
       <-> alias * ETbb-OsF/regular/it
 }{}
 
+\DeclareFontShape{LY1}{ETbb-OsF}{m}{n}{
+      <-> alias * ETbb-OsF/regular/n
+}{}
+
 \DeclareFontShape{LY1}{ETbb-OsF}{m}{scsl}{
       <-> alias * ETbb-OsF/regular/scsl
 }{}
@@ -103,31 +124,55 @@
       <-> alias * ETbb-OsF/regular/scit
 }{}
 
+\DeclareFontShape{LY1}{ETbb-OsF}{m}{sl}{
+      <-> alias * ETbb-OsF/regular/sl
+}{}
+
 
 %   b --> bold
 
+\DeclareFontShape{LY1}{ETbb-OsF}{b}{sw}{
+      <-> alias * ETbb-OsF/bold/sw
+}{}
+
+\DeclareFontShape{LY1}{ETbb-OsF}{b}{nw}{
+      <-> alias * ETbb-OsF/bold/nw
+}{}
+
+\DeclareFontShape{LY1}{ETbb-OsF}{b}{scsl}{
+      <-> alias * ETbb-OsF/bold/scsl
+}{}
+
+\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}{sl}{
-      <-> alias * ETbb-OsF/bold/sl
+\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}{n}{
-      <-> alias * ETbb-OsF/bold/n
+\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}{bx}{sl}{
+      <-> ssub * ETbb-OsF/b/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{b}{scsl}{
-      <-> alias * ETbb-OsF/bold/scsl
+\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}{n}{
@@ -138,20 +183,16 @@
       <-> 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}{scsl}{
-      <-> ssub * ETbb-OsF/b/scsl
+\DeclareFontShape{LY1}{ETbb-OsF}{bx}{nw}{
+      <-> ssub * ETbb-OsF/b/nw
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{bx}{scit}{
-      <-> ssub * ETbb-OsF/b/scit
+\DeclareFontShape{LY1}{ETbb-OsF}{bx}{sw}{
+      <-> ssub * ETbb-OsF/b/sw
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd
index e34bcb15cc6..ba3f657a21e 100644
--- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd
+++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{LY1ETbb-Sup.fd}
-    [2020/06/27 (autoinst)  Font definitions for LY1/ETbb-Sup.]
+    [2020/07/01 (autoinst)  Font definitions for LY1/ETbb-Sup.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -37,14 +37,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,6 +55,10 @@
 
 %   m --> regular
 
+\DeclareFontShape{LY1}{ETbb-Sup}{m}{sl}{
+      <-> alias * ETbb-Sup/regular/sl
+}{}
+
 \DeclareFontShape{LY1}{ETbb-Sup}{m}{n}{
       <-> alias * ETbb-Sup/regular/n
 }{}
@@ -63,17 +67,9 @@
       <-> alias * ETbb-Sup/regular/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Sup}{m}{sl}{
-      <-> alias * ETbb-Sup/regular/sl
-}{}
-
 
 %   b --> bold
 
-\DeclareFontShape{LY1}{ETbb-Sup}{b}{it}{
-      <-> alias * ETbb-Sup/bold/it
-}{}
-
 \DeclareFontShape{LY1}{ETbb-Sup}{b}{sl}{
       <-> alias * ETbb-Sup/bold/sl
 }{}
@@ -82,6 +78,14 @@
       <-> alias * ETbb-Sup/bold/n
 }{}
 
+\DeclareFontShape{LY1}{ETbb-Sup}{b}{it}{
+      <-> alias * ETbb-Sup/bold/it
+}{}
+
+\DeclareFontShape{LY1}{ETbb-Sup}{bx}{it}{
+      <-> ssub * ETbb-Sup/b/it
+}{}
+
 \DeclareFontShape{LY1}{ETbb-Sup}{bx}{n}{
       <-> ssub * ETbb-Sup/b/n
 }{}
@@ -90,8 +94,4 @@
       <-> ssub * ETbb-Sup/b/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Sup}{bx}{it}{
-      <-> ssub * ETbb-Sup/b/it
-}{}
-
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TLF.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TLF.fd
index fdd06138789..74aa90041e9 100644
--- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TLF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TLF.fd
@@ -1,7 +1,10 @@
-%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{LY1ETbb-TLF.fd}
-    [2020/06/27 (autoinst)  Font definitions for LY1/ETbb-TLF.]
+    [2020/02/15  Font definitions for LY1/ETbb-TLF.]
+
+\expandafter\ifx\csname ETbb@@swashQ\endcsname\relax%
+	\global\let\ETbb@@swashQ\@empty
+\fi
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -11,6 +14,13 @@
 }
 \fi
 
+\edef\ETbb@@S{} % do not use fancy sharpS
+\expandafter\ifx\csname @ETbb@sharpSfalse\endcsname\relax
+\csname iftrue\endcsname
+\else
+	\if@ETbb@sharpS\edef\ETbb@@S{1}\fi % do use fancy sharpS
+\fi
+%\show\ETbb@@S
 \expandafter\ifx\csname ETbb@scale\endcsname\relax
     \let\ETbb@@scale\@empty
 \else
@@ -20,57 +30,65 @@
 \DeclareFontFamily{LY1}{ETbb-TLF}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{ETbb-TLF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-tlf-ly1
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{nw}{
+      <-> \ETbb@@scale ETbb-Bold-tlf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-tlf-ly1
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{sw}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tlf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb-Regular-tlf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tlf\ETbb@@swashQ-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb-Italic-tlf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{n}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-tlf\ETbb@@swashQ-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{regular}{scsl}{
-      <-> ssub * ETbb-TLF/regular/scit
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{regular}{sl}{
-      <-> ssub * ETbb-TLF/regular/it
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tlf-sc-ly1
 }{}
 
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{scsl}{
+      <-> ssub * ETbb-TLF/bold/scit
+}{}
 
-%   ----  bold  ----
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{sl}{
+      <-> ssub * ETbb-TLF/bold/it
+}{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-tlf-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{ETbb-TLF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bold}{sc}{
-      <-> \ETbb@@scale ETbb-Bold-tlf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-TLF}{regular}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{ETbb-TLF}{regular}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tlf\ETbb@@swashQ-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-TLF}{regular}{n}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tlf\ETbb@@swashQ-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bold}{scsl}{
-      <-> ssub * ETbb-TLF/bold/scit
+\DeclareFontShape{LY1}{ETbb-TLF}{regular}{scsl}{
+      <-> ssub * ETbb-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bold}{sl}{
-      <-> ssub * ETbb-TLF/bold/it
+\DeclareFontShape{LY1}{ETbb-TLF}{regular}{sl}{
+      <-> ssub * ETbb-TLF/regular/it
 }{}
 
 %
@@ -83,6 +101,14 @@
       <-> alias * ETbb-TLF/regular/sl
 }{}
 
+\DeclareFontShape{LY1}{ETbb-TLF}{m}{nw}{
+      <-> alias * ETbb-TLF/regular/nw
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TLF}{m}{sc}{
+      <-> alias * ETbb-TLF/regular/sc
+}{}
+
 \DeclareFontShape{LY1}{ETbb-TLF}{m}{it}{
       <-> alias * ETbb-TLF/regular/it
 }{}
@@ -91,10 +117,6 @@
       <-> alias * ETbb-TLF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{m}{sc}{
-      <-> alias * ETbb-TLF/regular/sc
-}{}
-
 \DeclareFontShape{LY1}{ETbb-TLF}{m}{scsl}{
       <-> alias * ETbb-TLF/regular/scsl
 }{}
@@ -103,9 +125,21 @@
       <-> alias * ETbb-TLF/regular/scit
 }{}
 
+\DeclareFontShape{LY1}{ETbb-TLF}{m}{sl}{
+      <-> alias * ETbb-TLF/regular/sl
+}{}
+
 
 %   b --> bold
 
+\DeclareFontShape{LY1}{ETbb-TLF}{b}{sw}{
+      <-> alias * ETbb-TLF/bold/sw
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TLF}{b}{nw}{
+      <-> alias * ETbb-TLF/bold/nw
+}{}
+
 \DeclareFontShape{LY1}{ETbb-TLF}{b}{scsl}{
       <-> alias * ETbb-TLF/bold/scsl
 }{}
@@ -114,6 +148,10 @@
       <-> alias * ETbb-TLF/bold/scit
 }{}
 
+\DeclareFontShape{LY1}{ETbb-TLF}{b}{it}{
+      <-> alias * ETbb-TLF/bold/it
+}{}
+
 \DeclareFontShape{LY1}{ETbb-TLF}{b}{n}{
       <-> alias * ETbb-TLF/bold/n
 }{}
@@ -126,16 +164,16 @@
       <-> alias * ETbb-TLF/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{b}{it}{
-      <-> alias * ETbb-TLF/bold/it
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{sl}{
+      <-> ssub * ETbb-TLF/b/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bx}{it}{
-      <-> ssub * ETbb-TLF/b/it
+\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}{scsl}{
+      <-> ssub * ETbb-TLF/b/scsl
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TLF}{bx}{n}{
@@ -146,12 +184,16 @@
       <-> ssub * ETbb-TLF/b/sc
 }{}
 
-\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}{scsl}{
-      <-> ssub * ETbb-TLF/b/scsl
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{nw}{
+      <-> ssub * ETbb-TLF/b/nw
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{sw}{
+      <-> ssub * ETbb-TLF/b/sw
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TOsF.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TOsF.fd
index 5f5bc6b363a..4cb083d4c3c 100644
--- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TOsF.fd
@@ -1,7 +1,10 @@
-%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{LY1ETbb-TOsF.fd}
-    [2020/06/27 (autoinst)  Font definitions for LY1/ETbb-TOsF.]
+    [2020/02/15  Font definitions for LY1/ETbb-TOsF.]
+
+\expandafter\ifx\csname ETbb@@swashQ\endcsname\relax%
+	\global\let\ETbb@@swashQ\@empty
+\fi
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -11,6 +14,13 @@
 }
 \fi
 
+\edef\ETbb@@S{} % do not use fancy sharpS
+\expandafter\ifx\csname @ETbb@sharpSfalse\endcsname\relax
+\csname iftrue\endcsname
+\else
+	\if@ETbb@sharpS\edef\ETbb@@S{1}\fi % do use fancy sharpS
+\fi
+%\show\ETbb@@S
 \expandafter\ifx\csname ETbb@scale\endcsname\relax
     \let\ETbb@@scale\@empty
 \else
@@ -22,20 +32,28 @@
 
 %   ----  bold  ----
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{sc}{
-      <-> \ETbb@@scale ETbb-Bold-tosf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{nw}{
+      <-> \ETbb@@scale ETbb-Bold-tosf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-tosf-ly1
+\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{sw}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tosf-swash-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TOsF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tosf-ly1
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tosf\ETbb@@swashQ-ly1
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{n}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-tosf\ETbb@@swashQ-ly1
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-tosf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TOsF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tosf-sc-ly1
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tosf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TOsF}{bold}{scsl}{
@@ -49,20 +67,20 @@
 
 %   ----  regular  ----
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-tosf-ly1
+\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tosf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TOsF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb-Regular-tosf-sc-ly1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tosf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TOsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-tosf-ly1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tosf\ETbb@@swashQ-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb-Italic-tosf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{n}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tosf\ETbb@@swashQ-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TOsF}{regular}{scsl}{
@@ -79,8 +97,12 @@
 
 %   m --> regular
 
-\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}{nw}{
+      <-> alias * ETbb-TOsF/regular/nw
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TOsF}{m}{sc}{
@@ -91,45 +113,69 @@
       <-> alias * ETbb-TOsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{m}{sl}{
-      <-> alias * ETbb-TOsF/regular/sl
+\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}{scit}{
       <-> alias * ETbb-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{m}{scsl}{
-      <-> alias * ETbb-TOsF/regular/scsl
+\DeclareFontShape{LY1}{ETbb-TOsF}{m}{sl}{
+      <-> alias * ETbb-TOsF/regular/sl
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{b}{scit}{
-      <-> alias * ETbb-TOsF/bold/scit
+\DeclareFontShape{LY1}{ETbb-TOsF}{b}{sw}{
+      <-> alias * ETbb-TOsF/bold/sw
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TOsF}{b}{nw}{
+      <-> alias * ETbb-TOsF/bold/nw
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TOsF}{b}{scsl}{
       <-> alias * ETbb-TOsF/bold/scsl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{b}{sc}{
-      <-> alias * ETbb-TOsF/bold/sc
+\DeclareFontShape{LY1}{ETbb-TOsF}{b}{scit}{
+      <-> alias * ETbb-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TOsF}{b}{it}{
+      <-> alias * ETbb-TOsF/bold/it
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TOsF}{b}{n}{
       <-> alias * ETbb-TOsF/bold/n
 }{}
 
-\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}{sl}{
       <-> alias * ETbb-TOsF/bold/sl
 }{}
 
+\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{sl}{
+      <-> ssub * ETbb-TOsF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{scit}{
+      <-> ssub * ETbb-TOsF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{scsl}{
+      <-> ssub * ETbb-TOsF/b/scsl
+}{}
+
 \DeclareFontShape{LY1}{ETbb-TOsF}{bx}{n}{
       <-> ssub * ETbb-TOsF/b/n
 }{}
@@ -138,20 +184,16 @@
       <-> 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}{scsl}{
-      <-> ssub * ETbb-TOsF/b/scsl
+\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{nw}{
+      <-> ssub * ETbb-TOsF/b/nw
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{scit}{
-      <-> ssub * ETbb-TOsF/b/scit
+\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{sw}{
+      <-> ssub * ETbb-TOsF/b/sw
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Dnom.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Dnom.fd
index bf1444e85de..5638d234eca 100644
--- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Dnom.fd
+++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Dnom.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{OT1ETbb-Dnom.fd}
-    [2020/06/27 (autoinst)  Font definitions for OT1/ETbb-Dnom.]
+    [2020/07/01 (autoinst)  Font definitions for OT1/ETbb-Dnom.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,14 @@
 
 %   ----  regular  ----
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-dnom-ot1
-}{}
-
 \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
 }{}
@@ -55,14 +55,14 @@
 
 %   m --> regular
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{m}{sl}{
-      <-> alias * ETbb-Dnom/regular/sl
-}{}
-
 \DeclareFontShape{OT1}{ETbb-Dnom}{m}{it}{
       <-> alias * ETbb-Dnom/regular/it
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Dnom}{m}{sl}{
+      <-> alias * ETbb-Dnom/regular/sl
+}{}
+
 \DeclareFontShape{OT1}{ETbb-Dnom}{m}{n}{
       <-> alias * ETbb-Dnom/regular/n
 }{}
@@ -70,14 +70,14 @@
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{b}{n}{
-      <-> alias * ETbb-Dnom/bold/n
-}{}
-
 \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}{b}{sl}{
       <-> alias * ETbb-Dnom/bold/sl
 }{}
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd
index c023c37a8a7..d521370a34a 100644
--- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd
+++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{OT1ETbb-Inf.fd}
-    [2020/06/27 (autoinst)  Font definitions for OT1/ETbb-Inf.]
+    [2020/07/01 (autoinst)  Font definitions for OT1/ETbb-Inf.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{OT1}{ETbb-Inf}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\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}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{regular}{sl}{
-      <-> ssub * ETbb-Inf/regular/it
+\DeclareFontShape{OT1}{ETbb-Inf}{bold}{sl}{
+      <-> ssub * ETbb-Inf/bold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\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}{n}{
+      <-> \ETbb@@scale ETbb-Regular-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{bold}{sl}{
-      <-> ssub * ETbb-Inf/bold/it
+\DeclareFontShape{OT1}{ETbb-Inf}{regular}{sl}{
+      <-> ssub * ETbb-Inf/regular/it
 }{}
 
 %
@@ -55,10 +55,6 @@
 
 %   m --> regular
 
-\DeclareFontShape{OT1}{ETbb-Inf}{m}{it}{
-      <-> alias * ETbb-Inf/regular/it
-}{}
-
 \DeclareFontShape{OT1}{ETbb-Inf}{m}{sl}{
       <-> alias * ETbb-Inf/regular/sl
 }{}
@@ -67,12 +63,12 @@
       <-> alias * ETbb-Inf/regular/n
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Inf}{m}{it}{
+      <-> alias * ETbb-Inf/regular/it
+}{}
 
-%   b --> bold
 
-\DeclareFontShape{OT1}{ETbb-Inf}{b}{sl}{
-      <-> alias * ETbb-Inf/bold/sl
-}{}
+%   b --> bold
 
 \DeclareFontShape{OT1}{ETbb-Inf}{b}{it}{
       <-> alias * ETbb-Inf/bold/it
@@ -82,14 +78,18 @@
       <-> alias * ETbb-Inf/bold/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{bx}{sl}{
-      <-> ssub * ETbb-Inf/b/sl
+\DeclareFontShape{OT1}{ETbb-Inf}{b}{sl}{
+      <-> alias * ETbb-Inf/bold/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
 }{}
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-LF.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-LF.fd
index f252b0f0df8..828ee869d7a 100644
--- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-LF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-LF.fd
@@ -1,7 +1,11 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/02/15
 %%
 \ProvidesFile{OT1ETbb-LF.fd}
-    [2020/06/27 (autoinst)  Font definitions for OT1/ETbb-LF.]
+    [2020/02/15 (autoinst)  Font definitions for OT1/ETbb-LF.]
+
+\expandafter\ifx\csname ETbb@@swashQ\endcsname\relax%
+	\global\let\ETbb@@swashQ\@empty
+\fi
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -11,6 +15,13 @@
 }
 \fi
 
+\edef\ETbb@@S{} % do not use fancy sharpS
+\expandafter\ifx\csname @ETbb@sharpSfalse\endcsname\relax
+\csname iftrue\endcsname
+\else
+	\if@ETbb@sharpS\edef\ETbb@@S{1}\fi % do use fancy sharpS
+\fi
+
 \expandafter\ifx\csname ETbb@scale\endcsname\relax
     \let\ETbb@@scale\@empty
 \else
@@ -20,57 +31,73 @@
 \DeclareFontFamily{OT1}{ETbb-LF}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{ETbb-LF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb-Italic-lf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{bold}{nw}{
+      <-> \ETbb@@scale ETbb-Bold-lf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb-Regular-lf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{bold}{sw}{
+      <-> \ETbb@@scale ETbb-BoldItalic-lf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-lf-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{bold}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-lf\ETbb@@swashQ-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-lf-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{regular}{scsl}{
-      <-> ssub * ETbb-LF/regular/scit
+\DeclareFontShape{OT1}{ETbb-LF}{bold}{n}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-lf\ETbb@@swashQ-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{regular}{sl}{
-      <-> ssub * ETbb-LF/regular/it
+\DeclareFontShape{OT1}{ETbb-LF}{bold}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-lf-sc-ot1
 }{}
 
+\DeclareFontShape{OT1}{ETbb-LF}{bold}{scsl}{
+      <-> ssub * ETbb-LF/bold/scit
+}{}
 
-%   ----  bold  ----
+\DeclareFontShape{OT1}{ETbb-LF}{bold}{sl}{
+      <-> ssub * ETbb-LF/bold/it
+}{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-lf-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{nw}{
+      <-> \ETbb@@scale ETbb-Regular-lf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{bold}{sc}{
-      <-> \ETbb@@scale ETbb-Bold-lf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{sw}{
+      <-> \ETbb@@scale ETbb-Italic-lf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-lf-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-lf\ETbb@@swashQ-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb-BoldItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{bold}{scsl}{
-      <-> ssub * ETbb-LF/bold/scit
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{bold}{sl}{
-      <-> ssub * ETbb-LF/bold/it
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{n}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-lf\ETbb@@swashQ-ot1
+}{}
+
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{scsl}{
+      <-> ssub * ETbb-LF/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{sl}{
+      <-> ssub * ETbb-LF/regular/it
 }{}
 
 %
@@ -79,41 +106,57 @@
 
 %   m --> regular
 
-\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}{sl}{
-      <-> alias * ETbb-LF/regular/sl
+\DeclareFontShape{OT1}{ETbb-LF}{m}{n}{
+      <-> alias * ETbb-LF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{m}{it}{
-      <-> alias * ETbb-LF/regular/it
+\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}{n}{
-      <-> alias * ETbb-LF/regular/n
+\DeclareFontShape{OT1}{ETbb-LF}{m}{it}{
+      <-> alias * ETbb-LF/regular/it
+}{}
+
+\DeclareFontShape{OT1}{ETbb-LF}{m}{scsl}{
+      <-> alias * ETbb-LF/regular/scsl
 }{}
 
 
 %   b --> bold
 
+\DeclareFontShape{OT1}{ETbb-LF}{b}{sw}{
+      <-> alias * ETbb-LF/bold/sw
+}{}
+
+\DeclareFontShape{OT1}{ETbb-LF}{b}{nw}{
+      <-> alias * ETbb-LF/bold/nw
+}{}
+
 \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}{scit}{
+      <-> alias * ETbb-LF/bold/scit
+}{}
+
 \DeclareFontShape{OT1}{ETbb-LF}{b}{n}{
       <-> alias * ETbb-LF/bold/n
 }{}
@@ -122,12 +165,8 @@
       <-> alias * ETbb-LF/bold/sc
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{b}{scit}{
-      <-> alias * ETbb-LF/bold/scit
-}{}
-
-\DeclareFontShape{OT1}{ETbb-LF}{b}{scsl}{
-      <-> alias * ETbb-LF/bold/scsl
+\DeclareFontShape{OT1}{ETbb-LF}{bx}{it}{
+      <-> ssub * ETbb-LF/b/it
 }{}
 
 \DeclareFontShape{OT1}{ETbb-LF}{bx}{scsl}{
@@ -138,10 +177,6 @@
       <-> ssub * ETbb-LF/b/scit
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{bx}{sc}{
-      <-> ssub * ETbb-LF/b/sc
-}{}
-
 \DeclareFontShape{OT1}{ETbb-LF}{bx}{n}{
       <-> ssub * ETbb-LF/b/n
 }{}
@@ -150,8 +185,16 @@
       <-> ssub * ETbb-LF/b/sl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{bx}{it}{
-      <-> ssub * ETbb-LF/b/it
+\DeclareFontShape{OT1}{ETbb-LF}{bx}{sc}{
+      <-> ssub * ETbb-LF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{ETbb-LF}{bx}{nw}{
+      <-> ssub * ETbb-LF/b/nw
+}{}
+
+\DeclareFontShape{OT1}{ETbb-LF}{bx}{sw}{
+      <-> ssub * ETbb-LF/b/sw
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-OsF.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-OsF.fd
index 4f93a3385b8..a055e457030 100644
--- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-OsF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-OsF.fd
@@ -1,7 +1,9 @@
-%% Generated by autoinst on 2020/06/27
-%%
 \ProvidesFile{OT1ETbb-OsF.fd}
-    [2020/06/27 (autoinst)  Font definitions for OT1/ETbb-OsF.]
+    [2020/02/15  Font definitions for OT1/ETbb-OsF.]
+
+\expandafter\ifx\csname ETbb@@swashQ\endcsname\relax%
+	\global\let\ETbb@@swashQ\@empty
+\fi
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -11,6 +13,13 @@
 }
 \fi
 
+\edef\ETbb@@S{} % do not use fancy sharpS
+\expandafter\ifx\csname @ETbb@sharpSfalse\endcsname\relax
+\csname iftrue\endcsname
+\else
+	\if@ETbb@sharpS\edef\ETbb@@S{1}\fi % do use fancy sharpS
+\fi
+%\show\ETbb@@S
 \expandafter\ifx\csname ETbb@scale\endcsname\relax
     \let\ETbb@@scale\@empty
 \else
@@ -22,20 +31,28 @@
 
 %   ----  bold  ----
 
-\DeclareFontShape{OT1}{ETbb-OsF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb-BoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{nw}{
+      <-> \ETbb@@scale ETbb-Bold-osf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{bold}{sc}{
-      <-> \ETbb@@scale ETbb-Bold-osf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{sw}{
+      <-> \ETbb@@scale ETbb-BoldItalic-osf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-osf\ETbb@@swashQ-ot1
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-osf-ot1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-osf\ETbb@@swashQ-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-osf-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-osf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{bold}{scsl}{
@@ -50,19 +67,19 @@
 %   ----  regular  ----
 
 \DeclareFontShape{OT1}{ETbb-OsF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb-Italic-osf-sc-ot1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-osf-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{regular}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb-Regular-osf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{regular}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-osf\ETbb@@swashQ-ot1
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-osf-ot1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-osf\ETbb@@swashQ-ot1
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{regular}{scsl}{
@@ -79,24 +96,32 @@
 
 %   m --> regular
 
-\DeclareFontShape{OT1}{ETbb-OsF}{m}{scit}{
-      <-> alias * ETbb-OsF/regular/scit
+\DeclareFontShape{OT1}{ETbb-OsF}{m}{sl}{
+      <-> alias * ETbb-OsF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{m}{scsl}{
-      <-> alias * ETbb-OsF/regular/scsl
+\DeclareFontShape{OT1}{ETbb-OsF}{m}{nw}{
+      <-> alias * ETbb-OsF/regular/nw
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{m}{sc}{
       <-> alias * ETbb-OsF/regular/sc
 }{}
 
+\DeclareFontShape{OT1}{ETbb-OsF}{m}{it}{
+      <-> alias * ETbb-OsF/regular/it
+}{}
+
 \DeclareFontShape{OT1}{ETbb-OsF}{m}{n}{
       <-> alias * ETbb-OsF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{m}{it}{
-      <-> alias * ETbb-OsF/regular/it
+\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}{sl}{
@@ -106,28 +131,40 @@
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{sl}{
-      <-> alias * ETbb-OsF/bold/sl
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{sw}{
+      <-> alias * ETbb-OsF/bold/sw
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{it}{
-      <-> alias * ETbb-OsF/bold/it
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{nw}{
+      <-> alias * ETbb-OsF/bold/nw
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{sc}{
-      <-> alias * ETbb-OsF/bold/sc
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{scsl}{
+      <-> alias * ETbb-OsF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{scit}{
+      <-> alias * ETbb-OsF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{it}{
+      <-> alias * ETbb-OsF/bold/it
 }{}
 
 \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}{b}{sc}{
+      <-> alias * ETbb-OsF/bold/sc
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{scit}{
-      <-> alias * ETbb-OsF/bold/scit
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{sl}{
+      <-> alias * ETbb-OsF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{ETbb-OsF}{bx}{sl}{
+      <-> ssub * ETbb-OsF/b/sl
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{bx}{scit}{
@@ -138,20 +175,24 @@
       <-> ssub * ETbb-OsF/b/scsl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{bx}{it}{
-      <-> ssub * ETbb-OsF/b/it
-}{}
-
-\DeclareFontShape{OT1}{ETbb-OsF}{bx}{sl}{
-      <-> ssub * ETbb-OsF/b/sl
+\DeclareFontShape{OT1}{ETbb-OsF}{bx}{n}{
+      <-> ssub * ETbb-OsF/b/n
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{bx}{sc}{
       <-> ssub * ETbb-OsF/b/sc
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{bx}{n}{
-      <-> ssub * ETbb-OsF/b/n
+\DeclareFontShape{OT1}{ETbb-OsF}{bx}{it}{
+      <-> ssub * ETbb-OsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{ETbb-OsF}{bx}{nw}{
+      <-> ssub * ETbb-OsF/b/nw
+}{}
+
+\DeclareFontShape{OT1}{ETbb-OsF}{bx}{sw}{
+      <-> ssub * ETbb-OsF/b/sw
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd
index 2912386bf4a..f3e90c21429 100644
--- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd
+++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{OT1ETbb-Sup.fd}
-    [2020/06/27 (autoinst)  Font definitions for OT1/ETbb-Sup.]
+    [2020/07/01 (autoinst)  Font definitions for OT1/ETbb-Sup.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{OT1}{ETbb-Sup}{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\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}{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,6 +55,10 @@
 
 %   m --> regular
 
+\DeclareFontShape{OT1}{ETbb-Sup}{m}{n}{
+      <-> alias * ETbb-Sup/regular/n
+}{}
+
 \DeclareFontShape{OT1}{ETbb-Sup}{m}{sl}{
       <-> alias * ETbb-Sup/regular/sl
 }{}
@@ -63,35 +67,31 @@
       <-> alias * ETbb-Sup/regular/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{m}{n}{
-      <-> alias * ETbb-Sup/regular/n
-}{}
-
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{ETbb-Sup}{b}{n}{
-      <-> alias * ETbb-Sup/bold/n
-}{}
-
 \DeclareFontShape{OT1}{ETbb-Sup}{b}{it}{
       <-> alias * ETbb-Sup/bold/it
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Sup}{b}{n}{
+      <-> alias * ETbb-Sup/bold/n
+}{}
+
 \DeclareFontShape{OT1}{ETbb-Sup}{b}{sl}{
       <-> alias * ETbb-Sup/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{bx}{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}{n}{
-      <-> 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 5e7e0ec31bc..be483413707 100644
--- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TLF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TLF.fd
@@ -1,7 +1,10 @@
-%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{OT1ETbb-TLF.fd}
-    [2020/06/27 (autoinst)  Font definitions for OT1/ETbb-TLF.]
+    [2020/02/15  Font definitions for OT1/ETbb-TLF.]
+
+\expandafter\ifx\csname ETbb@@swashQ\endcsname\relax%
+	\global\let\ETbb@@swashQ\@empty
+\fi
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -11,6 +14,13 @@
 }
 \fi
 
+\edef\ETbb@@S{} % do not use fancy sharpS
+\expandafter\ifx\csname @ETbb@sharpSfalse\endcsname\relax
+\csname iftrue\endcsname
+\else
+	\if@ETbb@sharpS\edef\ETbb@@S{1}\fi % do use fancy sharpS
+\fi
+%\show\ETbb@@S
 \expandafter\ifx\csname ETbb@scale\endcsname\relax
     \let\ETbb@@scale\@empty
 \else
@@ -20,57 +30,65 @@
 \DeclareFontFamily{OT1}{ETbb-TLF}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{ETbb-TLF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb-Regular-tlf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{nw}{
+      <-> \ETbb@@scale ETbb-Bold-tlf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-tlf-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{sw}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tlf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-tlf-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tlf\ETbb@@swashQ-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb-Italic-tlf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{n}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-tlf\ETbb@@swashQ-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{regular}{scsl}{
-      <-> ssub * ETbb-TLF/regular/scit
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{regular}{sl}{
-      <-> ssub * ETbb-TLF/regular/it
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tlf-sc-ot1
 }{}
 
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{scsl}{
+      <-> ssub * ETbb-TLF/bold/scit
+}{}
 
-%   ----  bold  ----
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{sl}{
+      <-> ssub * ETbb-TLF/bold/it
+}{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{sc}{
-      <-> \ETbb@@scale ETbb-Bold-tlf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-tlf-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tlf\ETbb@@swashQ-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{n}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tlf\ETbb@@swashQ-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{scsl}{
-      <-> ssub * ETbb-TLF/bold/scit
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{scsl}{
+      <-> ssub * ETbb-TLF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{sl}{
-      <-> ssub * ETbb-TLF/bold/it
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{sl}{
+      <-> ssub * ETbb-TLF/regular/it
 }{}
 
 %
@@ -79,33 +97,49 @@
 
 %   m --> regular
 
-\DeclareFontShape{OT1}{ETbb-TLF}{m}{scit}{
-      <-> alias * ETbb-TLF/regular/scit
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{sl}{
+      <-> alias * ETbb-TLF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{m}{scsl}{
-      <-> alias * ETbb-TLF/regular/scsl
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{nw}{
+      <-> alias * ETbb-TLF/regular/nw
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{sc}{
+      <-> alias * ETbb-TLF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TLF}{m}{it}{
       <-> alias * ETbb-TLF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{m}{sl}{
-      <-> alias * ETbb-TLF/regular/sl
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{n}{
+      <-> alias * ETbb-TLF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{m}{sc}{
-      <-> alias * ETbb-TLF/regular/sc
+\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}{scit}{
+      <-> alias * ETbb-TLF/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{sl}{
+      <-> alias * ETbb-TLF/regular/sl
 }{}
 
 
 %   b --> bold
 
+\DeclareFontShape{OT1}{ETbb-TLF}{b}{sw}{
+      <-> alias * ETbb-TLF/bold/sw
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TLF}{b}{nw}{
+      <-> alias * ETbb-TLF/bold/nw
+}{}
+
 \DeclareFontShape{OT1}{ETbb-TLF}{b}{scsl}{
       <-> alias * ETbb-TLF/bold/scsl
 }{}
@@ -114,20 +148,24 @@
       <-> 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}{b}{n}{
+      <-> alias * ETbb-TLF/bold/n
+}{}
+
 \DeclareFontShape{OT1}{ETbb-TLF}{b}{sc}{
       <-> alias * ETbb-TLF/bold/sc
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{b}{n}{
-      <-> alias * ETbb-TLF/bold/n
+\DeclareFontShape{OT1}{ETbb-TLF}{b}{sl}{
+      <-> alias * ETbb-TLF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TLF}{bx}{sl}{
+      <-> ssub * ETbb-TLF/b/sl
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TLF}{bx}{scit}{
@@ -150,8 +188,12 @@
       <-> ssub * ETbb-TLF/b/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bx}{sl}{
-      <-> ssub * ETbb-TLF/b/sl
+\DeclareFontShape{OT1}{ETbb-TLF}{bx}{nw}{
+      <-> ssub * ETbb-TLF/b/nw
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TLF}{bx}{sw}{
+      <-> ssub * ETbb-TLF/b/sw
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TOsF.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TOsF.fd
index 8b47e6b142e..2008624f51b 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/27
+%% Generated by autoinst on 2020/06/30
 %%
 \ProvidesFile{OT1ETbb-TOsF.fd}
-    [2020/06/27 (autoinst)  Font definitions for OT1/ETbb-TOsF.]
+    [2020/06/30 (autoinst)  Font definitions for OT1/ETbb-TOsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,57 +20,73 @@
 \DeclareFontFamily{OT1}{ETbb-TOsF}{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-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}{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}{sw}{
+      <-> \ETbb@@scale ETbb-Italic-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{nw}{
+      <-> \ETbb@@scale ETbb-Regular-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scsl}{
-      <-> ssub * ETbb-TOsF/bold/scit
+\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}{it}{
+      <-> \ETbb@@scale ETbb-Italic-tosf-ot1
 }{}
 
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{scsl}{
+      <-> ssub * ETbb-TOsF/regular/scit
+}{}
 
-%   ----  regular  ----
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{sl}{
+      <-> ssub * ETbb-TOsF/regular/it
+}{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-tosf-ot1
+
+%   ----  bold  ----
+
+\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}{sw}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tosf-swash-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}{nw}{
+      <-> \ETbb@@scale ETbb-Bold-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{scsl}{
-      <-> ssub * ETbb-TOsF/regular/scit
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{sl}{
-      <-> ssub * ETbb-TOsF/regular/it
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{sc}{
+      <-> \ETbb@@scale ETbb-Bold-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scsl}{
+      <-> ssub * ETbb-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{sl}{
+      <-> ssub * ETbb-TOsF/bold/it
 }{}
 
 %
@@ -79,33 +95,57 @@
 
 %   m --> regular
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{m}{it}{
-      <-> alias * ETbb-TOsF/regular/it
+\DeclareFontShape{OT1}{ETbb-TOsF}{m}{sc}{
+      <-> alias * ETbb-TOsF/regular/sc
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{m}{sl}{
-      <-> alias * ETbb-TOsF/regular/sl
+\DeclareFontShape{OT1}{ETbb-TOsF}{m}{nw}{
+      <-> alias * ETbb-TOsF/regular/nw
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{m}{sc}{
-      <-> alias * ETbb-TOsF/regular/sc
+\DeclareFontShape{OT1}{ETbb-TOsF}{m}{it}{
+      <-> alias * ETbb-TOsF/regular/it
 }{}
 
 \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}{sw}{
+      <-> alias * ETbb-TOsF/regular/sw
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TOsF}{m}{sl}{
+      <-> alias * ETbb-TOsF/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TOsF}{m}{scsl}{
       <-> alias * ETbb-TOsF/regular/scsl
 }{}
 
+\DeclareFontShape{OT1}{ETbb-TOsF}{m}{scit}{
+      <-> alias * ETbb-TOsF/regular/scit
+}{}
+
 
 %   b --> bold
 
+\DeclareFontShape{OT1}{ETbb-TOsF}{b}{nw}{
+      <-> alias * ETbb-TOsF/bold/nw
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TOsF}{b}{n}{
+      <-> alias * ETbb-TOsF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TOsF}{b}{it}{
+      <-> alias * ETbb-TOsF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TOsF}{b}{sw}{
+      <-> alias * ETbb-TOsF/bold/sw
+}{}
+
 \DeclareFontShape{OT1}{ETbb-TOsF}{b}{scsl}{
       <-> alias * ETbb-TOsF/bold/scsl
 }{}
@@ -114,38 +154,30 @@
       <-> 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}{sl}{
-      <-> alias * ETbb-TOsF/bold/sl
-}{}
-
-\DeclareFontShape{OT1}{ETbb-TOsF}{b}{it}{
-      <-> alias * ETbb-TOsF/bold/it
+\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{n}{
+      <-> ssub * ETbb-TOsF/b/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{sc}{
-      <-> ssub * ETbb-TOsF/b/sc
+\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{nw}{
+      <-> ssub * ETbb-TOsF/b/nw
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{n}{
-      <-> ssub * ETbb-TOsF/b/n
+\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{sw}{
+      <-> ssub * ETbb-TOsF/b/sw
 }{}
 
 \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
 }{}
@@ -154,4 +186,12 @@
       <-> ssub * ETbb-TOsF/b/scsl
 }{}
 
+\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{sl}{
+      <-> ssub * ETbb-TOsF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{sc}{
+      <-> ssub * ETbb-TOsF/b/sc
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Dnom.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Dnom.fd
index a0a2bb28576..d3c5e759422 100644
--- a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Dnom.fd
+++ b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Dnom.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{T1ETbb-Dnom.fd}
-    [2020/06/27 (autoinst)  Font definitions for T1/ETbb-Dnom.]
+    [2020/07/01 (autoinst)  Font definitions for T1/ETbb-Dnom.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,14 @@
 
 %   ----  bold  ----
 
-\DeclareFontShape{T1}{ETbb-Dnom}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-dnom-t1
-}{}
-
 \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
 }{}
@@ -55,14 +55,14 @@
 
 %   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}{n}{
+      <-> alias * ETbb-Dnom/regular/n
+}{}
+
 \DeclareFontShape{T1}{ETbb-Dnom}{m}{it}{
       <-> alias * ETbb-Dnom/regular/it
 }{}
@@ -70,18 +70,22 @@
 
 %   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}{n}{
+      <-> alias * ETbb-Dnom/bold/n
+}{}
+
 \DeclareFontShape{T1}{ETbb-Dnom}{b}{it}{
       <-> alias * ETbb-Dnom/bold/it
 }{}
 
+\DeclareFontShape{T1}{ETbb-Dnom}{bx}{sl}{
+      <-> ssub * ETbb-Dnom/b/sl
+}{}
+
 \DeclareFontShape{T1}{ETbb-Dnom}{bx}{n}{
       <-> ssub * ETbb-Dnom/b/n
 }{}
@@ -90,8 +94,4 @@
       <-> 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 73722b110a6..a207ba97ea7 100644
--- a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd
+++ b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{T1ETbb-Inf.fd}
-    [2020/06/27 (autoinst)  Font definitions for T1/ETbb-Inf.]
+    [2020/07/01 (autoinst)  Font definitions for T1/ETbb-Inf.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{T1}{ETbb-Inf}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{T1}{ETbb-Inf}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-inf-t1
+\DeclareFontShape{T1}{ETbb-Inf}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-inf-t1
+\DeclareFontShape{T1}{ETbb-Inf}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-inf-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{regular}{sl}{
-      <-> ssub * ETbb-Inf/regular/it
+\DeclareFontShape{T1}{ETbb-Inf}{bold}{sl}{
+      <-> ssub * ETbb-Inf/bold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\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}{n}{
+      <-> \ETbb@@scale ETbb-Regular-inf-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{bold}{sl}{
-      <-> ssub * ETbb-Inf/bold/it
+\DeclareFontShape{T1}{ETbb-Inf}{regular}{sl}{
+      <-> ssub * ETbb-Inf/regular/it
 }{}
 
 %
@@ -55,6 +55,10 @@
 
 %   m --> regular
 
+\DeclareFontShape{T1}{ETbb-Inf}{m}{sl}{
+      <-> alias * ETbb-Inf/regular/sl
+}{}
+
 \DeclareFontShape{T1}{ETbb-Inf}{m}{n}{
       <-> alias * ETbb-Inf/regular/n
 }{}
@@ -63,13 +67,13 @@
       <-> alias * ETbb-Inf/regular/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{m}{sl}{
-      <-> alias * ETbb-Inf/regular/sl
-}{}
-
 
 %   b --> bold
 
+\DeclareFontShape{T1}{ETbb-Inf}{b}{n}{
+      <-> alias * ETbb-Inf/bold/n
+}{}
+
 \DeclareFontShape{T1}{ETbb-Inf}{b}{sl}{
       <-> alias * ETbb-Inf/bold/sl
 }{}
@@ -78,18 +82,14 @@
       <-> alias * ETbb-Inf/bold/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{b}{n}{
-      <-> alias * ETbb-Inf/bold/n
+\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}{it}{
-      <-> ssub * ETbb-Inf/b/it
-}{}
-
 \DeclareFontShape{T1}{ETbb-Inf}{bx}{n}{
       <-> ssub * ETbb-Inf/b/n
 }{}
diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-LF.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-LF.fd
index cb71b2c4b3a..682624e3f70 100644
--- a/Master/texmf-dist/tex/latex/etbb/T1ETbb-LF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/T1ETbb-LF.fd
@@ -3,6 +3,10 @@
 \ProvidesFile{T1ETbb-LF.fd}
     [2020/02/15 (autoinst)  Font definitions for T1/ETbb-LF.]
 
+\expandafter\ifx\csname ETbb@@swashQ\endcsname\relax%
+	\global\let\ETbb@@swashQ\@empty
+\fi
+
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
 \gdef\@font@aliasinfo#1{%
@@ -29,8 +33,16 @@
 
 %   ----  bold  ----
 
+\DeclareFontShape{T1}{ETbb-LF}{bold}{nw}{
+      <-> \ETbb@@scale ETbb-Bold-lf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{ETbb-LF}{bold}{sw}{
+      <-> \ETbb@@scale ETbb-BoldItalic-lf-swash-t1
+}{}
+
 \DeclareFontShape{T1}{ETbb-LF}{bold}{it}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-lf-t1
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-lf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-LF}{bold}{scit}{
@@ -38,7 +50,7 @@
 }{}
 
 \DeclareFontShape{T1}{ETbb-LF}{bold}{n}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-lf-t1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-lf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-LF}{bold}{sc}{
@@ -56,8 +68,16 @@
 
 %   ----  regular  ----
 
+\DeclareFontShape{T1}{ETbb-LF}{regular}{nw}{
+      <-> \ETbb@@scale ETbb-Regular-lf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{ETbb-LF}{regular}{sw}{
+      <-> \ETbb@@scale ETbb-Italic-lf-swash-t1
+}{}
+
 \DeclareFontShape{T1}{ETbb-LF}{regular}{it}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-lf-t1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-lf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-LF}{regular}{sc}{
@@ -69,7 +89,7 @@
 }{}
 
 \DeclareFontShape{T1}{ETbb-LF}{regular}{n}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-lf-t1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-lf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-LF}{regular}{scsl}{
@@ -113,6 +133,14 @@
 
 %   b --> bold
 
+\DeclareFontShape{T1}{ETbb-LF}{b}{sw}{
+      <-> alias * ETbb-LF/bold/sw
+}{}
+
+\DeclareFontShape{T1}{ETbb-LF}{b}{nw}{
+      <-> alias * ETbb-LF/bold/nw
+}{}
+
 \DeclareFontShape{T1}{ETbb-LF}{b}{it}{
       <-> alias * ETbb-LF/bold/it
 }{}
@@ -161,4 +189,12 @@
       <-> ssub * ETbb-LF/b/sc
 }{}
 
+\DeclareFontShape{T1}{ETbb-LF}{bx}{nw}{
+      <-> ssub * ETbb-LF/b/nw
+}{}
+
+\DeclareFontShape{T1}{ETbb-LF}{bx}{sw}{
+      <-> ssub * ETbb-LF/b/sw
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-OsF.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-OsF.fd
index bd0c174eb50..a6a0e56c787 100644
--- a/Master/texmf-dist/tex/latex/etbb/T1ETbb-OsF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/T1ETbb-OsF.fd
@@ -1,7 +1,10 @@
-%% Generated by autoinst on 2020/02/15
 %%
 \ProvidesFile{T1ETbb-OsF.fd}
-    [2020/02/15 (autoinst)  Font definitions for T1/ETbb-OsF.]
+    [2020/02/15  Font definitions for T1/ETbb-OsF.]
+
+\expandafter\ifx\csname ETbb@@swashQ\endcsname\relax%
+	\global\let\ETbb@@swashQ\@empty
+\fi
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -17,7 +20,7 @@
 \else
 	\if@ETbb@sharpS\edef\ETbb@@S{1}\fi % do use fancy sharpS
 \fi
-
+%\show\ETbb@@S
 \expandafter\ifx\csname ETbb@scale\endcsname\relax
     \let\ETbb@@scale\@empty
 \else
@@ -27,57 +30,65 @@
 \DeclareFontFamily{T1}{ETbb-OsF}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{T1}{ETbb-OsF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-osf-sc-t1
+\DeclareFontShape{T1}{ETbb-OsF}{bold}{nw}{
+      <-> \ETbb@@scale ETbb-Bold-osf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-OsF}{regular}{n}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-osf-t1
+\DeclareFontShape{T1}{ETbb-OsF}{bold}{sw}{
+      <-> \ETbb@@scale ETbb-BoldItalic-osf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-OsF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-osf-sc-t1
+\DeclareFontShape{T1}{ETbb-OsF}{bold}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-osf\ETbb@@swashQ-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-OsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-osf-t1
+\DeclareFontShape{T1}{ETbb-OsF}{bold}{n}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-osf\ETbb@@swashQ-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-OsF}{regular}{scsl}{
-      <-> ssub * ETbb-OsF/regular/scit
+\DeclareFontShape{T1}{ETbb-OsF}{bold}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-OsF}{regular}{sl}{
-      <-> ssub * ETbb-OsF/regular/it
+\DeclareFontShape{T1}{ETbb-OsF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-osf-sc-t1
 }{}
 
+\DeclareFontShape{T1}{ETbb-OsF}{bold}{scsl}{
+      <-> ssub * ETbb-OsF/bold/scit
+}{}
 
-%   ----  bold  ----
+\DeclareFontShape{T1}{ETbb-OsF}{bold}{sl}{
+      <-> ssub * ETbb-OsF/bold/it
+}{}
 
-\DeclareFontShape{T1}{ETbb-OsF}{bold}{it}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-osf-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{ETbb-OsF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-OsF}{bold}{n}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-osf-t1
+\DeclareFontShape{T1}{ETbb-OsF}{regular}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-OsF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{ETbb-OsF}{regular}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-osf\ETbb@@swashQ-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-OsF}{bold}{sc}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-osf-sc-t1
+\DeclareFontShape{T1}{ETbb-OsF}{regular}{n}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-osf\ETbb@@swashQ-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-OsF}{bold}{scsl}{
-      <-> ssub * ETbb-OsF/bold/scit
+\DeclareFontShape{T1}{ETbb-OsF}{regular}{scsl}{
+      <-> ssub * ETbb-OsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{ETbb-OsF}{bold}{sl}{
-      <-> ssub * ETbb-OsF/bold/it
+\DeclareFontShape{T1}{ETbb-OsF}{regular}{sl}{
+      <-> ssub * ETbb-OsF/regular/it
 }{}
 
 %
@@ -90,12 +101,8 @@
       <-> alias * ETbb-OsF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{ETbb-OsF}{m}{n}{
-      <-> alias * ETbb-OsF/regular/n
-}{}
-
-\DeclareFontShape{T1}{ETbb-OsF}{m}{scit}{
-      <-> alias * ETbb-OsF/regular/scit
+\DeclareFontShape{T1}{ETbb-OsF}{m}{nw}{
+      <-> alias * ETbb-OsF/regular/nw
 }{}
 
 \DeclareFontShape{T1}{ETbb-OsF}{m}{sc}{
@@ -106,59 +113,87 @@
       <-> alias * ETbb-OsF/regular/it
 }{}
 
+\DeclareFontShape{T1}{ETbb-OsF}{m}{n}{
+      <-> alias * ETbb-OsF/regular/n
+}{}
+
 \DeclareFontShape{T1}{ETbb-OsF}{m}{scsl}{
       <-> alias * ETbb-OsF/regular/scsl
 }{}
 
+\DeclareFontShape{T1}{ETbb-OsF}{m}{scit}{
+      <-> alias * ETbb-OsF/regular/scit
+}{}
+
+\DeclareFontShape{T1}{ETbb-OsF}{m}{sl}{
+      <-> alias * ETbb-OsF/regular/sl
+}{}
+
 
 %   b --> bold
 
+\DeclareFontShape{T1}{ETbb-OsF}{b}{sw}{
+      <-> alias * ETbb-OsF/bold/sw
+}{}
+
+\DeclareFontShape{T1}{ETbb-OsF}{b}{nw}{
+      <-> alias * ETbb-OsF/bold/nw
+}{}
+
 \DeclareFontShape{T1}{ETbb-OsF}{b}{scsl}{
       <-> alias * ETbb-OsF/bold/scsl
 }{}
 
-\DeclareFontShape{T1}{ETbb-OsF}{b}{it}{
-      <-> alias * ETbb-OsF/bold/it
+\DeclareFontShape{T1}{ETbb-OsF}{b}{scit}{
+      <-> alias * ETbb-OsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{ETbb-OsF}{b}{sc}{
-      <-> alias * ETbb-OsF/bold/sc
+\DeclareFontShape{T1}{ETbb-OsF}{b}{it}{
+      <-> alias * ETbb-OsF/bold/it
 }{}
 
 \DeclareFontShape{T1}{ETbb-OsF}{b}{n}{
       <-> alias * ETbb-OsF/bold/n
 }{}
 
-\DeclareFontShape{T1}{ETbb-OsF}{b}{scit}{
-      <-> alias * ETbb-OsF/bold/scit
+\DeclareFontShape{T1}{ETbb-OsF}{b}{sc}{
+      <-> alias * ETbb-OsF/bold/sc
 }{}
 
 \DeclareFontShape{T1}{ETbb-OsF}{b}{sl}{
       <-> alias * ETbb-OsF/bold/sl
 }{}
 
-\DeclareFontShape{T1}{ETbb-OsF}{bx}{it}{
-      <-> ssub * ETbb-OsF/b/it
-}{}
-
-\DeclareFontShape{T1}{ETbb-OsF}{bx}{scsl}{
-      <-> ssub * ETbb-OsF/b/scsl
+\DeclareFontShape{T1}{ETbb-OsF}{bx}{sl}{
+      <-> ssub * ETbb-OsF/b/sl
 }{}
 
 \DeclareFontShape{T1}{ETbb-OsF}{bx}{scit}{
       <-> ssub * ETbb-OsF/b/scit
 }{}
 
-\DeclareFontShape{T1}{ETbb-OsF}{bx}{n}{
-      <-> ssub * ETbb-OsF/b/n
+\DeclareFontShape{T1}{ETbb-OsF}{bx}{scsl}{
+      <-> ssub * ETbb-OsF/b/scsl
 }{}
 
-\DeclareFontShape{T1}{ETbb-OsF}{bx}{sl}{
-      <-> ssub * ETbb-OsF/b/sl
+\DeclareFontShape{T1}{ETbb-OsF}{bx}{n}{
+      <-> ssub * ETbb-OsF/b/n
 }{}
 
 \DeclareFontShape{T1}{ETbb-OsF}{bx}{sc}{
       <-> ssub * ETbb-OsF/b/sc
 }{}
 
+\DeclareFontShape{T1}{ETbb-OsF}{bx}{it}{
+      <-> ssub * ETbb-OsF/b/it
+}{}
+
+\DeclareFontShape{T1}{ETbb-OsF}{bx}{nw}{
+      <-> ssub * ETbb-OsF/b/nw
+}{}
+
+\DeclareFontShape{T1}{ETbb-OsF}{bx}{sw}{
+      <-> ssub * ETbb-OsF/b/sw
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd
index 90b8b2bbd4d..378a6ad038a 100644
--- a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd
+++ b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{T1ETbb-Sup.fd}
-    [2020/06/27 (autoinst)  Font definitions for T1/ETbb-Sup.]
+    [2020/07/01 (autoinst)  Font definitions for T1/ETbb-Sup.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -37,14 +37,14 @@
 
 %   ----  bold  ----
 
-\DeclareFontShape{T1}{ETbb-Sup}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-sup-t1
-}{}
-
 \DeclareFontShape{T1}{ETbb-Sup}{bold}{it}{
       <-> \ETbb@@scale ETbb-BoldItalic-sup-t1
 }{}
 
+\DeclareFontShape{T1}{ETbb-Sup}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-sup-t1
+}{}
+
 \DeclareFontShape{T1}{ETbb-Sup}{bold}{sl}{
       <-> ssub * ETbb-Sup/bold/it
 }{}
@@ -55,6 +55,10 @@
 
 %   m --> regular
 
+\DeclareFontShape{T1}{ETbb-Sup}{m}{n}{
+      <-> alias * ETbb-Sup/regular/n
+}{}
+
 \DeclareFontShape{T1}{ETbb-Sup}{m}{sl}{
       <-> alias * ETbb-Sup/regular/sl
 }{}
@@ -63,33 +67,29 @@
       <-> alias * ETbb-Sup/regular/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Sup}{m}{n}{
-      <-> alias * ETbb-Sup/regular/n
-}{}
-
 
 %   b --> bold
 
-\DeclareFontShape{T1}{ETbb-Sup}{b}{n}{
-      <-> 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}{b}{it}{
-      <-> alias * ETbb-Sup/bold/it
-}{}
-
-\DeclareFontShape{T1}{ETbb-Sup}{bx}{n}{
-      <-> ssub * ETbb-Sup/b/n
+\DeclareFontShape{T1}{ETbb-Sup}{b}{n}{
+      <-> alias * ETbb-Sup/bold/n
 }{}
 
 \DeclareFontShape{T1}{ETbb-Sup}{bx}{sl}{
       <-> ssub * ETbb-Sup/b/sl
 }{}
 
+\DeclareFontShape{T1}{ETbb-Sup}{bx}{n}{
+      <-> ssub * ETbb-Sup/b/n
+}{}
+
 \DeclareFontShape{T1}{ETbb-Sup}{bx}{it}{
       <-> ssub * ETbb-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-TLF.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-TLF.fd
index f33f58df88d..12e0a438e0b 100644
--- a/Master/texmf-dist/tex/latex/etbb/T1ETbb-TLF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/T1ETbb-TLF.fd
@@ -2,6 +2,10 @@
 \ProvidesFile{T1ETbb-TLF.fd}
     [2020/02/15  Font definitions for T1/ETbb-TLF.]
 
+\expandafter\ifx\csname ETbb@@swashQ\endcsname\relax%
+	\global\let\ETbb@@swashQ\@empty
+\fi
+
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
 \gdef\@font@aliasinfo#1{%
@@ -28,12 +32,20 @@
 
 %   ----  bold  ----
 
+\DeclareFontShape{T1}{ETbb-TLF}{bold}{nw}{
+      <-> \ETbb@@scale ETbb-Bold-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{ETbb-TLF}{bold}{sw}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tlf-swash-t1
+}{}
+
 \DeclareFontShape{T1}{ETbb-TLF}{bold}{it}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tlf-t1
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tlf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-TLF}{bold}{n}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-tlf-t1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-tlf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-TLF}{bold}{sc}{
@@ -64,11 +76,11 @@
 }{}
 
 \DeclareFontShape{T1}{ETbb-TLF}{regular}{it}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tlf-t1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tlf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-TLF}{regular}{n}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tlf-t1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tlf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-TLF}{regular}{scsl}{
@@ -85,6 +97,14 @@
 
 %   m --> regular
 
+\DeclareFontShape{T1}{ETbb-TLF}{m}{sl}{
+      <-> alias * ETbb-TLF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{ETbb-TLF}{m}{nw}{
+      <-> alias * ETbb-TLF/regular/nw
+}{}
+
 \DeclareFontShape{T1}{ETbb-TLF}{m}{sc}{
       <-> alias * ETbb-TLF/regular/sc
 }{}
@@ -112,6 +132,14 @@
 
 %   b --> bold
 
+\DeclareFontShape{T1}{ETbb-TLF}{b}{sw}{
+      <-> alias * ETbb-TLF/bold/sw
+}{}
+
+\DeclareFontShape{T1}{ETbb-TLF}{b}{nw}{
+      <-> alias * ETbb-TLF/bold/nw
+}{}
+
 \DeclareFontShape{T1}{ETbb-TLF}{b}{scsl}{
       <-> alias * ETbb-TLF/bold/scsl
 }{}
@@ -160,4 +188,12 @@
       <-> ssub * ETbb-TLF/b/it
 }{}
 
+\DeclareFontShape{T1}{ETbb-TLF}{bx}{nw}{
+      <-> ssub * ETbb-TLF/b/nw
+}{}
+
+\DeclareFontShape{T1}{ETbb-TLF}{bx}{sw}{
+      <-> ssub * ETbb-TLF/b/sw
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-TOsF.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-TOsF.fd
index 50db178876b..d10195d4690 100644
--- a/Master/texmf-dist/tex/latex/etbb/T1ETbb-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/T1ETbb-TOsF.fd
@@ -1,7 +1,10 @@
-%% Generated by autoinst on 2020/02/15
 %%
 \ProvidesFile{T1ETbb-TOsF.fd}
-    [2020/02/15 (autoinst)  Font definitions for T1/ETbb-TOsF.]
+    [2020/02/15  Font definitions for T1/ETbb-TOsF.]
+
+\expandafter\ifx\csname ETbb@@swashQ\endcsname\relax%
+	\global\let\ETbb@@swashQ\@empty
+\fi
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -17,7 +20,7 @@
 \else
 	\if@ETbb@sharpS\edef\ETbb@@S{1}\fi % do use fancy sharpS
 \fi
-
+%\show\ETbb@@S
 \expandafter\ifx\csname ETbb@scale\endcsname\relax
     \let\ETbb@@scale\@empty
 \else
@@ -29,20 +32,28 @@
 
 %   ----  bold  ----
 
-\DeclareFontShape{T1}{ETbb-TOsF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{ETbb-TOsF}{bold}{nw}{
+      <-> \ETbb@@scale ETbb-Bold-tosf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{ETbb-TOsF}{bold}{sw}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tosf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{ETbb-TOsF}{bold}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tosf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-TOsF}{bold}{n}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-tosf-t1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-tosf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-TOsF}{bold}{sc}{
       <-> \ETbb@@scale ETbb\ETbb@@S-Bold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{bold}{it}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tosf-t1
+\DeclareFontShape{T1}{ETbb-TOsF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tosf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-TOsF}{bold}{scsl}{
@@ -56,20 +67,20 @@
 
 %   ----  regular  ----
 
-\DeclareFontShape{T1}{ETbb-TOsF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tosf-sc-t1
+\DeclareFontShape{T1}{ETbb-TOsF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{regular}{n}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tosf-t1
+\DeclareFontShape{T1}{ETbb-TOsF}{regular}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tosf-sc-t1
+\DeclareFontShape{T1}{ETbb-TOsF}{regular}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tosf\ETbb@@swashQ-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tosf-t1
+\DeclareFontShape{T1}{ETbb-TOsF}{regular}{n}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tosf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-TOsF}{regular}{scsl}{
@@ -86,18 +97,30 @@
 
 %   m --> regular
 
-\DeclareFontShape{T1}{ETbb-TOsF}{m}{it}{
-      <-> alias * ETbb-TOsF/regular/it
+\DeclareFontShape{T1}{ETbb-TOsF}{m}{sl}{
+      <-> alias * ETbb-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{m}{scsl}{
-      <-> alias * ETbb-TOsF/regular/scsl
+\DeclareFontShape{T1}{ETbb-TOsF}{m}{nw}{
+      <-> alias * ETbb-TOsF/regular/nw
+}{}
+
+\DeclareFontShape{T1}{ETbb-TOsF}{m}{sc}{
+      <-> alias * ETbb-TOsF/regular/sc
+}{}
+
+\DeclareFontShape{T1}{ETbb-TOsF}{m}{it}{
+      <-> alias * ETbb-TOsF/regular/it
 }{}
 
 \DeclareFontShape{T1}{ETbb-TOsF}{m}{n}{
       <-> alias * ETbb-TOsF/regular/n
 }{}
 
+\DeclareFontShape{T1}{ETbb-TOsF}{m}{scsl}{
+      <-> alias * ETbb-TOsF/regular/scsl
+}{}
+
 \DeclareFontShape{T1}{ETbb-TOsF}{m}{scit}{
       <-> alias * ETbb-TOsF/regular/scit
 }{}
@@ -106,59 +129,71 @@
       <-> alias * ETbb-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{m}{sc}{
-      <-> alias * ETbb-TOsF/regular/sc
-}{}
-
 
 %   b --> bold
 
-\DeclareFontShape{T1}{ETbb-TOsF}{b}{scsl}{
-      <-> alias * ETbb-TOsF/bold/scsl
+\DeclareFontShape{T1}{ETbb-TOsF}{b}{sw}{
+      <-> alias * ETbb-TOsF/bold/sw
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{b}{it}{
-      <-> alias * ETbb-TOsF/bold/it
+\DeclareFontShape{T1}{ETbb-TOsF}{b}{nw}{
+      <-> alias * ETbb-TOsF/bold/nw
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{b}{sc}{
-      <-> alias * ETbb-TOsF/bold/sc
+\DeclareFontShape{T1}{ETbb-TOsF}{b}{scsl}{
+      <-> alias * ETbb-TOsF/bold/scsl
 }{}
 
 \DeclareFontShape{T1}{ETbb-TOsF}{b}{scit}{
       <-> alias * ETbb-TOsF/bold/scit
 }{}
 
+\DeclareFontShape{T1}{ETbb-TOsF}{b}{it}{
+      <-> alias * ETbb-TOsF/bold/it
+}{}
+
 \DeclareFontShape{T1}{ETbb-TOsF}{b}{n}{
       <-> alias * ETbb-TOsF/bold/n
 }{}
 
+\DeclareFontShape{T1}{ETbb-TOsF}{b}{sc}{
+      <-> alias * ETbb-TOsF/bold/sc
+}{}
+
 \DeclareFontShape{T1}{ETbb-TOsF}{b}{sl}{
       <-> alias * ETbb-TOsF/bold/sl
 }{}
 
+\DeclareFontShape{T1}{ETbb-TOsF}{bx}{sl}{
+      <-> ssub * ETbb-TOsF/b/sl
+}{}
+
+\DeclareFontShape{T1}{ETbb-TOsF}{bx}{scit}{
+      <-> ssub * ETbb-TOsF/b/scit
+}{}
+
 \DeclareFontShape{T1}{ETbb-TOsF}{bx}{scsl}{
       <-> ssub * ETbb-TOsF/b/scsl
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{bx}{it}{
-      <-> ssub * ETbb-TOsF/b/it
+\DeclareFontShape{T1}{ETbb-TOsF}{bx}{n}{
+      <-> ssub * ETbb-TOsF/b/n
 }{}
 
 \DeclareFontShape{T1}{ETbb-TOsF}{bx}{sc}{
       <-> ssub * ETbb-TOsF/b/sc
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{bx}{sl}{
-      <-> ssub * ETbb-TOsF/b/sl
+\DeclareFontShape{T1}{ETbb-TOsF}{bx}{it}{
+      <-> ssub * ETbb-TOsF/b/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{bx}{scit}{
-      <-> ssub * ETbb-TOsF/b/scit
+\DeclareFontShape{T1}{ETbb-TOsF}{bx}{nw}{
+      <-> ssub * ETbb-TOsF/b/nw
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{bx}{n}{
-      <-> ssub * ETbb-TOsF/b/n
+\DeclareFontShape{T1}{ETbb-TOsF}{bx}{sw}{
+      <-> ssub * ETbb-TOsF/b/sw
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd
index 8f2c4b38d90..ad3ef7c562e 100644
--- a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{TS1ETbb-LF.fd}
-    [2020/06/27 (autoinst)  Font definitions for TS1/ETbb-LF.]
+    [2020/07/01 (autoinst)  Font definitions for TS1/ETbb-LF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{TS1}{ETbb-LF}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{TS1}{ETbb-LF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-lf-ts1
+\DeclareFontShape{TS1}{ETbb-LF}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-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
 }{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{TS1}{ETbb-LF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-lf-ts1
+\DeclareFontShape{TS1}{ETbb-LF}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-lf-ts1
+\DeclareFontShape{TS1}{ETbb-LF}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{bold}{sl}{
-      <-> ssub * ETbb-LF/bold/it
+\DeclareFontShape{TS1}{ETbb-LF}{regular}{sl}{
+      <-> ssub * ETbb-LF/regular/it
 }{}
 
 %
@@ -70,10 +70,6 @@
 
 %   b --> bold
 
-\DeclareFontShape{TS1}{ETbb-LF}{b}{it}{
-      <-> alias * ETbb-LF/bold/it
-}{}
-
 \DeclareFontShape{TS1}{ETbb-LF}{b}{sl}{
       <-> alias * ETbb-LF/bold/sl
 }{}
@@ -82,6 +78,14 @@
       <-> alias * ETbb-LF/bold/n
 }{}
 
+\DeclareFontShape{TS1}{ETbb-LF}{b}{it}{
+      <-> alias * ETbb-LF/bold/it
+}{}
+
+\DeclareFontShape{TS1}{ETbb-LF}{bx}{it}{
+      <-> ssub * ETbb-LF/b/it
+}{}
+
 \DeclareFontShape{TS1}{ETbb-LF}{bx}{n}{
       <-> ssub * ETbb-LF/b/n
 }{}
@@ -90,8 +94,4 @@
       <-> ssub * ETbb-LF/b/sl
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{bx}{it}{
-      <-> ssub * ETbb-LF/b/it
-}{}
-
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd
index cd8067c7d0e..85e7778cbe9 100644
--- a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{TS1ETbb-OsF.fd}
-    [2020/06/27 (autoinst)  Font definitions for TS1/ETbb-OsF.]
+    [2020/07/01 (autoinst)  Font definitions for TS1/ETbb-OsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -37,14 +37,14 @@
 
 %   ----  regular  ----
 
-\DeclareFontShape{TS1}{ETbb-OsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-osf-ts1
-}{}
-
 \DeclareFontShape{TS1}{ETbb-OsF}{regular}{n}{
       <-> \ETbb@@scale ETbb-Regular-osf-ts1
 }{}
 
+\DeclareFontShape{TS1}{ETbb-OsF}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-osf-ts1
+}{}
+
 \DeclareFontShape{TS1}{ETbb-OsF}{regular}{sl}{
       <-> ssub * ETbb-OsF/regular/it
 }{}
@@ -55,16 +55,16 @@
 
 %   m --> regular
 
-\DeclareFontShape{TS1}{ETbb-OsF}{m}{n}{
-      <-> alias * ETbb-OsF/regular/n
+\DeclareFontShape{TS1}{ETbb-OsF}{m}{it}{
+      <-> alias * ETbb-OsF/regular/it
 }{}
 
 \DeclareFontShape{TS1}{ETbb-OsF}{m}{sl}{
       <-> alias * ETbb-OsF/regular/sl
 }{}
 
-\DeclareFontShape{TS1}{ETbb-OsF}{m}{it}{
-      <-> alias * ETbb-OsF/regular/it
+\DeclareFontShape{TS1}{ETbb-OsF}{m}{n}{
+      <-> alias * ETbb-OsF/regular/n
 }{}
 
 
diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd
index 3a5605c12ff..b0dc0d1af47 100644
--- a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{TS1ETbb-TLF.fd}
-    [2020/06/27 (autoinst)  Font definitions for TS1/ETbb-TLF.]
+    [2020/07/01 (autoinst)  Font definitions for TS1/ETbb-TLF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -55,14 +55,14 @@
 
 %   m --> regular
 
-\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}{n}{
+      <-> alias * ETbb-TLF/regular/n
+}{}
+
 \DeclareFontShape{TS1}{ETbb-TLF}{m}{sl}{
       <-> alias * ETbb-TLF/regular/sl
 }{}
@@ -86,12 +86,12 @@
       <-> ssub * ETbb-TLF/b/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TLF}{bx}{sl}{
-      <-> ssub * ETbb-TLF/b/sl
-}{}
-
 \DeclareFontShape{TS1}{ETbb-TLF}{bx}{n}{
       <-> ssub * ETbb-TLF/b/n
 }{}
 
+\DeclareFontShape{TS1}{ETbb-TLF}{bx}{sl}{
+      <-> ssub * ETbb-TLF/b/sl
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd
index 690053d29e4..818b85f53ed 100644
--- a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{TS1ETbb-TOsF.fd}
-    [2020/06/27 (autoinst)  Font definitions for TS1/ETbb-TOsF.]
+    [2020/07/01 (autoinst)  Font definitions for TS1/ETbb-TOsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{TS1}{ETbb-TOsF}{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\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}{n}{
-      <-> \ETbb@@scale ETbb-Bold-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
 }{}
 
 
-%   ----  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
 }{}
 
 %
@@ -55,21 +55,25 @@
 
 %   m --> regular
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{m}{n}{
-      <-> alias * ETbb-TOsF/regular/n
+\DeclareFontShape{TS1}{ETbb-TOsF}{m}{it}{
+      <-> alias * ETbb-TOsF/regular/it
 }{}
 
 \DeclareFontShape{TS1}{ETbb-TOsF}{m}{sl}{
       <-> alias * ETbb-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{m}{it}{
-      <-> alias * ETbb-TOsF/regular/it
+\DeclareFontShape{TS1}{ETbb-TOsF}{m}{n}{
+      <-> alias * ETbb-TOsF/regular/n
 }{}
 
 
 %   b --> bold
 
+\DeclareFontShape{TS1}{ETbb-TOsF}{b}{n}{
+      <-> alias * ETbb-TOsF/bold/n
+}{}
+
 \DeclareFontShape{TS1}{ETbb-TOsF}{b}{sl}{
       <-> alias * ETbb-TOsF/bold/sl
 }{}
@@ -78,18 +82,14 @@
       <-> alias * ETbb-TOsF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{b}{n}{
-      <-> alias * ETbb-TOsF/bold/n
+\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{it}{
+      <-> ssub * ETbb-TOsF/b/it
 }{}
 
 \DeclareFontShape{TS1}{ETbb-TOsF}{bx}{sl}{
       <-> ssub * ETbb-TOsF/b/sl
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{it}{
-      <-> ssub * ETbb-TOsF/b/it
-}{}
-
 \DeclareFontShape{TS1}{ETbb-TOsF}{bx}{n}{
       <-> ssub * ETbb-TOsF/b/n
 }{}