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/LY1ETbb-TOsF.fd | 110 ++++++++++++++++++++++++++++-------------
 1 file changed, 76 insertions(+), 34 deletions(-)

(limited to 'fonts/etbb/tex/LY1ETbb-TOsF.fd')

diff --git a/fonts/etbb/tex/LY1ETbb-TOsF.fd b/fonts/etbb/tex/LY1ETbb-TOsF.fd
index 5f5bc6b363..4cb083d4c3 100644
--- a/fonts/etbb/tex/LY1ETbb-TOsF.fd
+++ b/fonts/etbb/tex/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
-- 
cgit v1.2.3

