From fed87c2d746629366811de126bfa863e301ec049 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Thu, 2 Jul 2020 21:43:35 +0000
Subject: etbb (2jul20)

git-svn-id: svn://tug.org/texlive/trunk@55727 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/etbb/LY1ETbb-LF.fd | 115 +++++++++++++++++--------
 1 file changed, 79 insertions(+), 36 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/etbb/LY1ETbb-LF.fd')

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
-- 
cgit v1.2.3

