1 files changed, 86 insertions, 51 deletions
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