From 925eebea568c77dab877e87724fe7b001b3b5e7f Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Fri, 3 Jul 2020 03:03:30 +0000
Subject: CTAN sync 202007030303

---
 fonts/etbb/tex/OT1ETbb-LF.fd | 143 ++++++++++++++++++++++++++++---------------
 1 file changed, 93 insertions(+), 50 deletions(-)

(limited to 'fonts/etbb/tex/OT1ETbb-LF.fd')

diff --git a/fonts/etbb/tex/OT1ETbb-LF.fd b/fonts/etbb/tex/OT1ETbb-LF.fd
index f252b0f0df..828ee869d7 100644
--- a/fonts/etbb/tex/OT1ETbb-LF.fd
+++ b/fonts/etbb/tex/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
-- 
cgit v1.2.3

