1 files changed, 80 insertions, 39 deletions
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