etbb (2jul20)

git-svn-id: svn://tug.org/texlive/trunk@55727 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2020-07-02 21:43:35 +0000
committer: Karl Berry <karl@freefriends.org> 2020-07-02 21:43:35 +0000
commit: fed87c2d746629366811de126bfa863e301ec049 (patch)
tree: 775c95006d348cb3e81a021b69ace909e027850c
parent: 63baeff02fd19f54fcfdf472f9b29d79bd58674a (diff)
385 files changed, 3376 insertions, 976 deletions
diff --git a/Master/texmf-dist/doc/fonts/etbb/ETbb-doc.pdf b/Master/texmf-dist/doc/fonts/etbb/ETbb-doc.pdf
index b2cac1f27bd..c5232d4acbd 100644
--- a/Master/texmf-dist/doc/fonts/etbb/ETbb-doc.pdf
+++ b/Master/texmf-dist/doc/fonts/etbb/ETbb-doc.pdf
diff --git a/Master/texmf-dist/doc/fonts/etbb/ETbb-doc.tex b/Master/texmf-dist/doc/fonts/etbb/ETbb-doc.tex
index f8f6830a7d2..a6d759522e2 100644
--- a/Master/texmf-dist/doc/fonts/etbb/ETbb-doc.tex
+++ b/Master/texmf-dist/doc/fonts/etbb/ETbb-doc.tex
@@ -96,6 +96,7 @@ This package has most of the same features and options as the {\tt fbb} package
 
 In the original {\tt XETBook}, the dollar and cent currency symbols were oldstyle. I've added the new style symbols and made them the default, but option {\tt osdollar} to {\tt ETbb} changes back to the oldstyle symbols.
 
+\textbf{New in version $1.05$:} A swash version of Q has been added to all faces. You may enable it globally using option {\tt swashQ} to {\tt ETbb}, or specify it locally with the macro \verb|\Qswash|, which renders as \Qswash. If you had enabled it globally, you have access to the ordinary Q with the macro \verb|\Qnoswash|.
 
 Text figures may be selected from four types:
 \begin{itemize}
@@ -107,7 +108,6 @@ Tabular lining (TLF), selected by options {\tt lining [or lf], tabular [or t]};
 Proportional oldstyle (OsF), selected by option {\tt oldstyle [or osf], proportional [or p]};
 \item
 Tabular oldstyle (TOsF), selected by options {\tt oldstyle [or osf], tabular [or t]}.
-\item
 \end{itemize}
 The package also defines macros that allow you use alternate figure styles locally:
 
diff --git a/Master/texmf-dist/doc/fonts/etbb/README b/Master/texmf-dist/doc/fonts/etbb/README
index 3de591ecb1c..137aa7fd8b2 100644
--- a/Master/texmf-dist/doc/fonts/etbb/README
+++ b/Master/texmf-dist/doc/fonts/etbb/README
@@ -3,7 +3,11 @@ provides a version of Bembo in otf and pfb formats plus LaTeX font support files
 http://www.ctan.org/license/lppl1.3
 for the details of that license. Note that Bembo is a name trademarked by Monotype, hence the strange name for this package, drawn from the Berry id for the Bembo font family.
 
-Current version: 1.04 2020-06-29
+Current version: 1.05 2020-07-01
+
+Changes in version 1.05
+1. Added swashQ glyph to all faces, along with changes to latex support to enable it. See the documentation.
+2. Full support now enabled for all features in LY1 and OT1 as well as T1.
 
 Changes in version 1.04
 1. Added glyph numero (U+2116) in all styles.
diff --git a/Master/texmf-dist/fonts/afm/public/etbb/ETbb-Bold.afm b/Master/texmf-dist/fonts/afm/public/etbb/ETbb-Bold.afm
index 9218a89701c..ae9b5c6f8cc 100644
--- a/Master/texmf-dist/fonts/afm/public/etbb/ETbb-Bold.afm
+++ b/Master/texmf-dist/fonts/afm/public/etbb/ETbb-Bold.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20200314
-Comment Creation Date: Fri Jun 26 21:00:52 2020
+Comment Creation Date: Tue Jun 30 20:58:23 2020
 FontName ETbb-Bold
 FullName ET Bembo Bold
 FamilyName ETbb
@@ -15,12 +15,12 @@ UnderlinePosition -161
 UnderlineThickness 50
 Version 001.001
 EncodingScheme FontSpecific
-FontBBox -145 -301 1162 1224
+FontBBox -145 -301 1374 1224
 CapHeight 673
 XHeight 431
 Ascender 744
 Descender -280
-StartCharMetrics 591
+StartCharMetrics 592
 C 0 ; WX 764 ; N .notdef ; B 0 0 0 0 ;
 C 1 ; WX 253 ; N space ; B 0 0 0 0 ;
 C 2 ; WX 281 ; N exclam ; B 82 -9 202 713 ;
@@ -612,6 +612,7 @@ C -1 ; WX 357 ; N eight.denominator ; B 35 -17 332 362 ;
 C -1 ; WX 356 ; N nine.denominator ; B 27 -9 332 356 ;
 C -1 ; WX 365 ; N q.sup ; B 20 155 364 548 ;
 C -1 ; WX 1175 ; N numero ; B 30 -10 1162 674 ;
+C -1 ; WX 849 ; N Q.swsh ; B 39 -219 1374 689 ;
 EndCharMetrics
 StartKernData
 StartKernPairs 8634
diff --git a/Master/texmf-dist/fonts/afm/public/etbb/ETbb-BoldItalic.afm b/Master/texmf-dist/fonts/afm/public/etbb/ETbb-BoldItalic.afm
index 29a2664d20f..f7641cf0a21 100644
--- a/Master/texmf-dist/fonts/afm/public/etbb/ETbb-BoldItalic.afm
+++ b/Master/texmf-dist/fonts/afm/public/etbb/ETbb-BoldItalic.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20200314
-Comment Creation Date: Fri Jun 26 20:55:22 2020
+Comment Creation Date: Tue Jun 30 20:57:47 2020
 FontName ETbb-BoldItalic
 FullName ET Bembo Bold Italic
 FamilyName ETbb
@@ -16,12 +16,12 @@ UnderlinePosition -161
 UnderlineThickness 50
 Version 001.001
 EncodingScheme FontSpecific
-FontBBox -197 -365 1130 1170
+FontBBox -197 -365 1370 1170
 CapHeight 673
 XHeight 445
 Ascender 785
 Descender -280
-StartCharMetrics 567
+StartCharMetrics 568
 C 0 ; WX 276 ; N space ; B 0 0 0 0 ;
 C 1 ; WX 321 ; N exclam ; B 90 -15 322 688 ;
 C 2 ; WX 465 ; N quotedbl ; B 175 366 531 688 ;
@@ -589,6 +589,7 @@ C -1 ; WX 386 ; N seven.denominator ; B 42 -4 404 370 ;
 C -1 ; WX 410 ; N eight.denominator ; B 30 -8 377 377 ;
 C -1 ; WX 384 ; N nine.denominator ; B 20 -8 358 377 ;
 C -1 ; WX 1112 ; N numero ; B 12 -16 1130 673 ;
+C -1 ; WX 856 ; N Q.swsh ; B 64 -212 1370 690 ;
 EndCharMetrics
 StartKernData
 StartKernPairs 14257
diff --git a/Master/texmf-dist/fonts/afm/public/etbb/ETbb-Italic.afm b/Master/texmf-dist/fonts/afm/public/etbb/ETbb-Italic.afm
index 327ef44281f..b63dd551ff1 100644
--- a/Master/texmf-dist/fonts/afm/public/etbb/ETbb-Italic.afm
+++ b/Master/texmf-dist/fonts/afm/public/etbb/ETbb-Italic.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20200314
-Comment Creation Date: Fri Jun 26 20:50:10 2020
+Comment Creation Date: Tue Jun 30 20:58:01 2020
 FontName ETbb-Italic
 FullName ET Bembo Italic
 FamilyName ETbb
@@ -16,12 +16,12 @@ UnderlinePosition -161
 UnderlineThickness 50
 Version 001.001
 EncodingScheme FontSpecific
-FontBBox -196 -351 1100 1148
+FontBBox -196 -351 1296 1148
 CapHeight 668
 XHeight 442
 Ascender 781
 Descender -280
-StartCharMetrics 594
+StartCharMetrics 595
 C 0 ; WX 262 ; N space ; B 0 0 0 0 ;
 C 1 ; WX 306 ; N exclam ; B 90 -14 308 684 ;
 C 2 ; WX 438 ; N quotedbl ; B 174 376 502 684 ;
@@ -616,6 +616,7 @@ C -1 ; WX 334 ; N seven.denominator ; B 29 -14 358 357 ;
 C -1 ; WX 312 ; N eight.denominator ; B 7 -18 318 365 ;
 C -1 ; WX 334 ; N nine.denominator ; B -25 -19 350 365 ;
 C -1 ; WX 1067 ; N numero ; B 13 -16 1100 668 ;
+C -1 ; WX 748 ; N Q.swsh ; B 30 -207 1296 684 ;
 EndCharMetrics
 StartKernData
 StartKernPairs 18964
diff --git a/Master/texmf-dist/fonts/afm/public/etbb/ETbb-Regular.afm b/Master/texmf-dist/fonts/afm/public/etbb/ETbb-Regular.afm
index 0bbbed35c28..8f4b2afae1e 100644
--- a/Master/texmf-dist/fonts/afm/public/etbb/ETbb-Regular.afm
+++ b/Master/texmf-dist/fonts/afm/public/etbb/ETbb-Regular.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20200314
-Comment Creation Date: Wed Jun 17 08:27:09 2020
+Comment Creation Date: Tue Jun 30 20:58:09 2020
 FontName ETbb-Regular
 FullName ET Bembo Regular
 FamilyName ETbb
@@ -15,12 +15,12 @@ UnderlinePosition -261
 UnderlineThickness 50
 Version 001.001
 EncodingScheme FontSpecific
-FontBBox -189 -310 1372 1184
+FontBBox -189 -310 1397 1184
 CapHeight 673
 XHeight 431
 Ascender 759
 Descender -280
-StartCharMetrics 630
+StartCharMetrics 631
 C 0 ; WX 516 ; N .notdef ; B 52 0 465 551 ;
 C 1 ; WX 253 ; N space ; B 0 0 0 0 ;
 C 2 ; WX 240 ; N exclam ; B 63 -16 177 713 ;
@@ -651,6 +651,7 @@ C -1 ; WX 336 ; N six.denominator ; B 25 -14 309 361 ;
 C -1 ; WX 318 ; N seven.denominator ; B 26 -19 298 358 ;
 C -1 ; WX 389 ; N eight.denominator ; B 53 -14 336 360 ;
 C -1 ; WX 337 ; N nine.denominator ; B 24 -7 315 357 ;
+C -1 ; WX 849 ; N Q.swsh ; B 54 -217 1397 689 ;
 EndCharMetrics
 StartKernData
 StartKernPairs 32055
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_2wngtz.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_2wngtz.enc
index 41f22198170..45d82a7bf1a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_2wngtz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_2wngtz.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_2wngtzno6dnkbgy6u3wuotcora
-% Encoding created by otftotfm on Sat Jun 27 21:28:47 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:43 2020
 % Command line follows encoding
 /AutoEnc1_2wngtzno6dnkbgy6u3wuotcora [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_3ccbvp.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_3ccbvp.enc
index a3e91a4b0fc..487e1e0a902 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_3ccbvp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_3ccbvp.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_3ccbvpb2mahh6euinpg3u7qqze
-% Encoding created by otftotfm on Sat Jun 27 21:28:31 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:14 2020
 % Command line follows encoding
 /AutoEnc1_3ccbvpb2mahh6euinpg3u7qqze [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_5325we.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_5325we.enc
index 035116de8e3..74c7cba4e42 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_5325we.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_5325we.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_5325we5aho44lxbyegll2vl3dc
-% Encoding created by otftotfm on Sat Jun 27 21:28:32 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:15 2020
 % Command line follows encoding
 /AutoEnc1_5325we5aho44lxbyegll2vl3dc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_77pqsh.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_77pqsh.enc
index 289e4718485..e937ab5a8e7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_77pqsh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_77pqsh.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_77pqsh35tfbpgcie3v2crjtyef
-% Encoding created by otftotfm on Sat Jun 27 21:28:45 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:34 2020
 % Command line follows encoding
 /AutoEnc1_77pqsh35tfbpgcie3v2crjtyef [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_eqc2ac.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_eqc2ac.enc
index 23557a5a2c6..f90464217c5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_eqc2ac.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_eqc2ac.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_eqc2ac2qcg4bxjlkwezu334h4f
-% Encoding created by otftotfm on Sat Jun 27 21:28:27 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:16 2020
 % Command line follows encoding
 /AutoEnc1_eqc2ac2qcg4bxjlkwezu334h4f [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hah5or.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hah5or.enc
index de9d7b0ac72..799f90bcd36 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hah5or.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hah5or.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_hah5orya7ruvjmqzsfnwzilfbf
-% Encoding created by otftotfm on Sat Jun 27 21:28:33 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:11 2020
 % Command line follows encoding
 /AutoEnc1_hah5orya7ruvjmqzsfnwzilfbf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hibu6u.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hibu6u.enc
index 4310c98c8e6..e0c0f95bc8e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hibu6u.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hibu6u.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_hibu6umvrjtqrirvpvs25evi3c
-% Encoding created by otftotfm on Sat Jun 27 21:28:26 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:09 2020
 % Command line follows encoding
 /AutoEnc1_hibu6umvrjtqrirvpvs25evi3c [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_mgm6re.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_mgm6re.enc
new file mode 100644
index 00000000000..46724349810
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_mgm6re.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_mgm6reivyglzs2cwtx35q2y4ye
+% Encoding created by otftotfm on Wed Jul  1 20:56:18 2020
+% Command line follows encoding
+/AutoEnc1_mgm6reivyglzs2cwtx35q2y4ye [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.pnum /one.pnum /two.pnum /three.pnum /four.pnum /five.pnum /six.pnum /seven.pnum
+  /eight.pnum /nine.pnum /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+  /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+  /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+  /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+  /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls.ss02
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=swsh --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --include-alternates=*.swash ETbb-Bold.otf
+% ETbb-Bold-lf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_pvrda3.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_pvrda3.enc
index 369012db08c..a6f39089f15 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_pvrda3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_pvrda3.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_pvrda3ayd24l2jz24a3yz6f4kd
-% Encoding created by otftotfm on Sat Jun 27 21:28:26 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:09 2020
 % Command line follows encoding
 /AutoEnc1_pvrda3ayd24l2jz24a3yz6f4kd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_rwec2l.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_rwec2l.enc
index e42ac924e10..8a9f062b7b3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_rwec2l.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_rwec2l.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_rwec2ltafusdbpjxc5bs7fdg3b
-% Encoding created by otftotfm on Sat Jun 27 21:28:51 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:40 2020
 % Command line follows encoding
 /AutoEnc1_rwec2ltafusdbpjxc5bs7fdg3b [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_sp7p3o.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_sp7p3o.enc
index 0862a284614..0085c04b31e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_sp7p3o.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_sp7p3o.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_sp7p3ogzc33lxwuaxiyoy7i63e
-% Encoding created by otftotfm on Sat Jun 27 21:28:53 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:37 2020
 % Command line follows encoding
 /AutoEnc1_sp7p3ogzc33lxwuaxiyoy7i63e [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_vtabip.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_vtabip.enc
new file mode 100644
index 00000000000..c9850c56e4a
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_vtabip.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_vtabipmm4e5xag7gq2nwm3p6gc
+% Encoding created by otftotfm on Wed Jul  1 20:56:15 2020
+% Command line follows encoding
+/AutoEnc1_vtabipmm4e5xag7gq2nwm3p6gc [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+  /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+  /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+  /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+  /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls.ss02
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=swsh --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --include-alternates=*.swash ETbb-Bold.otf
+% ETbb-Bold-tosf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_w52zjg.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_w52zjg.enc
index 8e78f680a12..9ecee9638b2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_w52zjg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_w52zjg.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh
-% Encoding created by otftotfm on Sat Jun 27 21:28:30 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:08 2020
 % Command line follows encoding
 /AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_x5rskw.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_x5rskw.enc
index aee06e1ccb9..ae12e6cb7f7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_x5rskw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_x5rskw.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_x5rskwfdgrpeovvnp5dgzgax7e
-% Encoding created by otftotfm on Sat Jun 27 21:28:28 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:17 2020
 % Command line follows encoding
 /AutoEnc1_x5rskwfdgrpeovvnp5dgzgax7e [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_xaqh3v.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_xaqh3v.enc
new file mode 100644
index 00000000000..952f4d4f122
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_xaqh3v.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_xaqh3v7my6v7plsnnlq32jk5pb
+% Encoding created by otftotfm on Wed Jul  1 20:56:12 2020
+% Command line follows encoding
+/AutoEnc1_xaqh3v7my6v7plsnnlq32jk5pb [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
+  /eight.onum /nine.onum /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+  /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+  /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+  /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+  /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls.ss02
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=swsh --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --include-alternates=*.swash ETbb-Bold.otf
+% ETbb-Bold-osf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_yziesh.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_yziesh.enc
new file mode 100644
index 00000000000..3e27d1da583
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_yziesh.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc1_yzieshsd44fbunydsrfnu5dloe
+% Encoding created by otftotfm on Wed Jul  1 20:56:10 2020
+% Command line follows encoding
+/AutoEnc1_yzieshsd44fbunydsrfnu5dloe [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero /one /two /three /four /five /six /seven
+  /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+  /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+  /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+  /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+  /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls.ss02
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=swsh --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --include-alternates=*.swash ETbb-Bold.otf
+% ETbb-Bold-tlf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_zxy3n5.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_zxy3n5.enc
index a7cadddf139..aef2d878cb8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_zxy3n5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_zxy3n5.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_zxy3n5aiatzd3xjlhm2urzyfuc
-% Encoding created by otftotfm on Sat Jun 27 21:28:34 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:12 2020
 % Command line follows encoding
 /AutoEnc1_zxy3n5aiatzd3xjlhm2urzyfuc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_22apno.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_22apno.enc
index 0b065409e17..4c4c02df22c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_22apno.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_22apno.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_22apnozoce6wprtbuf6ihvsd5b
-% Encoding created by otftotfm on Sat Jun 27 21:29:02 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:54 2020
 % Command line follows encoding
 /AutoEnc_22apnozoce6wprtbuf6ihvsd5b [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_242knm.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_242knm.enc
index 6a151053823..27bdfc87c82 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_242knm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_242knm.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_242knmbltpk57lyn3w752okimf
-% Encoding created by otftotfm on Sat Jun 27 21:28:43 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:23 2020
 % Command line follows encoding
 /AutoEnc_242knmbltpk57lyn3w752okimf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_2wngtz.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_2wngtz.enc
index 1b91daa0dc7..a4fdf521864 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_2wngtz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_2wngtz.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_2wngtzno6dnkbgy6u3wuotcora
-% Encoding created by otftotfm on Sat Jun 27 21:28:47 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:43 2020
 % Command line follows encoding
 /AutoEnc_2wngtzno6dnkbgy6u3wuotcora [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_33mftd.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_33mftd.enc
index 66014a68af0..399a28cb31f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_33mftd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_33mftd.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_33mftda5zpj2atc2k5o52aguyh
-% Encoding created by otftotfm on Sat Jun 27 21:28:33 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:11 2020
 % Command line follows encoding
 /AutoEnc_33mftda5zpj2atc2k5o52aguyh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3ccbvp.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3ccbvp.enc
index 0c23deafd22..20a176f82d5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3ccbvp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3ccbvp.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_3ccbvpb2mahh6euinpg3u7qqze
-% Encoding created by otftotfm on Sat Jun 27 21:28:31 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:14 2020
 % Command line follows encoding
 /AutoEnc_3ccbvpb2mahh6euinpg3u7qqze [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3jmjat.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3jmjat.enc
index d7149b21a15..ecda1af4fc2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3jmjat.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3jmjat.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_3jmjatxposyckyyeodfflfb4zf
-% Encoding created by otftotfm on Sat Jun 27 21:28:45 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:34 2020
 % Command line follows encoding
 /AutoEnc_3jmjatxposyckyyeodfflfb4zf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3li7dq.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3li7dq.enc
index 7ada11d15a1..e643c6f2bd2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3li7dq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3li7dq.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_3li7dqpy2izcpma72gvve2muqf
-% Encoding created by otftotfm on Sat Jun 27 21:28:33 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:11 2020
 % Command line follows encoding
 /AutoEnc_3li7dqpy2izcpma72gvve2muqf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3pfdgz.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3pfdgz.enc
index b1cee12f6ec..0ed0555f82e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3pfdgz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3pfdgz.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_3pfdgzsbueyunimviyizcdlq3b
-% Encoding created by otftotfm on Sat Jun 27 21:28:30 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:19 2020
 % Command line follows encoding
 /AutoEnc_3pfdgzsbueyunimviyizcdlq3b [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4hpi45.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4hpi45.enc
new file mode 100644
index 00000000000..158486f27e1
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4hpi45.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_4hpi45xua3rf7rmnl54bpggxkg
+% Encoding created by otftotfm on Wed Jul  1 20:56:31 2020
+% Command line follows encoding
+/AutoEnc_4hpi45xua3rf7rmnl54bpggxkg [
+%00
+  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.pnum /one.pnum /two.pnum /three.pnum /four.pnum /five.pnum /six.pnum /seven.pnum
+  /eight.pnum /nine.pnum /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /.notdef /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+  /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=swsh --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --include-alternates=*.swash ETbb-BoldItalic.otf
+% ETbb-BoldItalic-lf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4qfaj2.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4qfaj2.enc
new file mode 100644
index 00000000000..250aee14616
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4qfaj2.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_4qfaj2fkf6gpmcsvmpnfqrb6ib
+% Encoding created by otftotfm on Wed Jul  1 20:56:54 2020
+% Command line follows encoding
+/AutoEnc_4qfaj2fkf6gpmcsvmpnfqrb6ib [
+%00
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Omega /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
+% --feature=swsh --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --include-alternates=*.swash ETbb-Regular.otf ETbb-Regular-tosf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4sxvu4.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4sxvu4.enc
index 422742da2fd..07f972d8dda 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4sxvu4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4sxvu4.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_4sxvu4thduhlpavew6yzmuysdd
-% Encoding created by otftotfm on Sat Jun 27 21:28:59 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:52 2020
 % Command line follows encoding
 /AutoEnc_4sxvu4thduhlpavew6yzmuysdd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_c2mply.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4x2qhb.enc
index 79dfc6d7986..3b321182a95 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_c2mply.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4x2qhb.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_c2mplyudeciwn36qnmuoytwrjf
-% Encoding created by otftotfm on Sat Jun 27 21:28:36 2020
+%%AutoEnc_4x2qhbzfqbq2uyy7krhzfopuua
+% Encoding created by otftotfm on Wed Jul  1 20:56:23 2020
 % Command line follows encoding
-/AutoEnc_c2mplyudeciwn36qnmuoytwrjf [
+/AutoEnc_4x2qhbzfqbq2uyy7krhzfopuua [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /exclam /asterisk
@@ -15,7 +15,7 @@
   /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
 %30
   /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /.notdef /.notdef /.notdef /minus /.notdef /.notdef
+  /eight.taboldstyle /nine.taboldstyle /Q /Q.swsh /.notdef /minus /.notdef /.notdef
 %40
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5325we.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5325we.enc
index 55a6adb9c66..d5c23fc6b34 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5325we.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5325we.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_5325we5aho44lxbyegll2vl3dc
-% Encoding created by otftotfm on Sat Jun 27 21:28:32 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:15 2020
 % Command line follows encoding
 /AutoEnc_5325we5aho44lxbyegll2vl3dc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5cjnk5.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5cjnk5.enc
index 80255241d2c..3b2a1f04c75 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5cjnk5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5cjnk5.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_5cjnk55s6lighj2fknbv2zorpf
-% Encoding created by otftotfm on Sat Jun 27 21:28:57 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:56 2020
 % Command line follows encoding
 /AutoEnc_5cjnk55s6lighj2fknbv2zorpf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5iollt.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5iollt.enc
index a484117b560..5adac8d5b7c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5iollt.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5iollt.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_5iolltwrolq7y3af3zfxbxwjhg
-% Encoding created by otftotfm on Sat Jun 27 21:28:46 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:42 2020
 % Command line follows encoding
 /AutoEnc_5iolltwrolq7y3af3zfxbxwjhg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_6tax72.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_6tax72.enc
index a51fd041cee..aa7642701d6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_6tax72.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_6tax72.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_6tax72yid4piwl3l7e6mpqevrf
-% Encoding created by otftotfm on Sat Jun 27 21:28:44 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:24 2020
 % Command line follows encoding
 /AutoEnc_6tax72yid4piwl3l7e6mpqevrf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_77pqsh.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_77pqsh.enc
index ae01fee1984..1737a46b06e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_77pqsh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_77pqsh.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_77pqsh35tfbpgcie3v2crjtyef
-% Encoding created by otftotfm on Sat Jun 27 21:28:45 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:34 2020
 % Command line follows encoding
 /AutoEnc_77pqsh35tfbpgcie3v2crjtyef [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_7pzsmk.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_7pzsmk.enc
index fb73b1e368a..04ed1e24121 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_7pzsmk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_7pzsmk.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_7pzsmkr2zp4z2jzsqyz5xypura
-% Encoding created by otftotfm on Sat Jun 27 21:29:00 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:58 2020
 % Command line follows encoding
 /AutoEnc_7pzsmkr2zp4z2jzsqyz5xypura [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_7t4ywj.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_7t4ywj.enc
index 873136e2fdb..d46e640e1ad 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_7t4ywj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_7t4ywj.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_7t4ywj5n7dfcy72ielrltqzb7a
-% Encoding created by otftotfm on Sat Jun 27 21:28:40 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:32 2020
 % Command line follows encoding
 /AutoEnc_7t4ywj5n7dfcy72ielrltqzb7a [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_atf2m5.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_atf2m5.enc
index e5250055317..f8b2cd9844b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_atf2m5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_atf2m5.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_atf2m5uqgbwoyyy5ueppslzajb
-% Encoding created by otftotfm on Sat Jun 27 21:28:31 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:19 2020
 % Command line follows encoding
 /AutoEnc_atf2m5uqgbwoyyy5ueppslzajb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ay4ati.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ay4ati.enc
new file mode 100644
index 00000000000..2564329e52e
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ay4ati.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ay4atisik7ffogqasevzhgjvtc
+% Encoding created by otftotfm on Wed Jul  1 20:56:12 2020
+% Command line follows encoding
+/AutoEnc_ay4atisik7ffogqasevzhgjvtc [
+%00
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
+  /eight.onum /nine.onum /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
+% --feature=pnum --feature=swsh --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --include-alternates=*.swash ETbb-Bold.otf ETbb-Bold-osf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_behrx3.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_behrx3.enc
index 4ec2222c567..8b1aff3eba6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_behrx3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_behrx3.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_behrx3e73zcxs6ypih5z3jwzfc
-% Encoding created by otftotfm on Sat Jun 27 21:28:58 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:52 2020
 % Command line follows encoding
 /AutoEnc_behrx3e73zcxs6ypih5z3jwzfc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_bowihu.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_bowihu.enc
index 259460f7a5d..3d70e64bd77 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_bowihu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_bowihu.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_bowihunnspwduw2eofxbzcdp7b
-% Encoding created by otftotfm on Sat Jun 27 21:28:38 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:30 2020
 % Command line follows encoding
 /AutoEnc_bowihunnspwduw2eofxbzcdp7b [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_c6gjhm.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_c6gjhm.enc
index 4d1c64ab805..a63d1393ad4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_c6gjhm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_c6gjhm.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_c6gjhmb3ta3czdt7nhimutsk5c
-% Encoding created by otftotfm on Sat Jun 27 21:28:28 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:17 2020
 % Command line follows encoding
 /AutoEnc_c6gjhmb3ta3czdt7nhimutsk5c [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_2mysj3.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_chsevo.enc
index fa6d4e1e859..d43499e8f6a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_2mysj3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_chsevo.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_2mysj3r5ge4vrkh7fk26pe4rbd
-% Encoding created by otftotfm on Sat Jun 27 21:28:58 2020
+%%AutoEnc_chsevodrrrotdjwzaqukesefqe
+% Encoding created by otftotfm on Wed Jul  1 20:56:51 2020
 % Command line follows encoding
-/AutoEnc_2mysj3r5ge4vrkh7fk26pe4rbd [
+/AutoEnc_chsevodrrrotdjwzaqukesefqe [
 %00
   /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap
   /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /.notdef /.notdef
@@ -15,7 +15,7 @@
   /.notdef /.notdef /asteriskmath /.notdef /comma /hyphendbl /period /fraction
 %30
   /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
-  /eight.onum /nine.onum /.notdef /.notdef /uni27E8 /minus /uni27E9 /.notdef
+  /eight.onum /nine.onum /Q /Q.swsh /uni27E8 /minus /uni27E9 /.notdef
 %40
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /Omegainv /.notdef /bigcircle
@@ -60,4 +60,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/etbb
 % --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
 % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=pnum ETbb-Regular.otf ETbb-Regular-lf-ts1'
+% --feature=pnum ETbb-Regular.otf ETbb-Regular-osf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cluc7m.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cluc7m.enc
index f727185b179..43b61354624 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cluc7m.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cluc7m.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_cluc7m4ium2bcpwlcwz2h6yxsd
-% Encoding created by otftotfm on Sat Jun 27 21:28:29 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:13 2020
 % Command line follows encoding
 /AutoEnc_cluc7m4ium2bcpwlcwz2h6yxsd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cpb6sd.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cpb6sd.enc
new file mode 100644
index 00000000000..7e825a0f7a9
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cpb6sd.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_cpb6sdrmtmjdkd4dvmojrwtfyb
+% Encoding created by otftotfm on Wed Jul  1 20:56:15 2020
+% Command line follows encoding
+/AutoEnc_cpb6sdrmtmjdkd4dvmojrwtfyb [
+%00
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
+% --feature=swsh --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --include-alternates=*.swash ETbb-Bold.otf ETbb-Bold-tosf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cpdyi3.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cpdyi3.enc
index 63a30948512..5cfd1ac62f5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cpdyi3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cpdyi3.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_cpdyi3iny2nijyt7gl7sena5id
-% Encoding created by otftotfm on Sat Jun 27 21:28:32 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:15 2020
 % Command line follows encoding
 /AutoEnc_cpdyi3iny2nijyt7gl7sena5id [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4nf2t3.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cpixk3.enc
index 02b24264167..3636a5e9808 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4nf2t3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cpixk3.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_4nf2t33jqvsejadw6cvgnjdiwf
-% Encoding created by otftotfm on Sat Jun 27 21:28:29 2020
+%%AutoEnc_cpixk3kzz7zlit4vgu64uofbpa
+% Encoding created by otftotfm on Wed Jul  1 20:56:13 2020
 % Command line follows encoding
-/AutoEnc_4nf2t33jqvsejadw6cvgnjdiwf [
+/AutoEnc_cpixk3kzz7zlit4vgu64uofbpa [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /exclam /asterisk
@@ -15,7 +15,7 @@
   /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
 %30
   /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
-  /eight.onum /nine.onum /.notdef /.notdef /.notdef /minus /.notdef /.notdef
+  /eight.onum /nine.onum /Q /Q.swsh /.notdef /minus /.notdef /.notdef
 %40
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /bigcircle
@@ -60,4 +60,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/etbb
 % --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
 % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=pnum ETbb-Bold.otf ETbb-Bold-lf-ts1'
+% --feature=pnum ETbb-Bold.otf ETbb-Bold-osf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cq6xx2.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cq6xx2.enc
new file mode 100644
index 00000000000..011075026bf
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cq6xx2.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_cq6xx2fn5plzdjapa525zg3uad
+% Encoding created by otftotfm on Wed Jul  1 20:56:25 2020
+% Command line follows encoding
+/AutoEnc_cq6xx2fn5plzdjapa525zg3uad [
+%00
+  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
+  /eight.onum /nine.onum /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /.notdef /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+  /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=swsh --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --include-alternates=*.swash ETbb-BoldItalic.otf
+% ETbb-BoldItalic-osf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cuqhrj.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cuqhrj.enc
index c0654e20d50..f793b23fb89 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cuqhrj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cuqhrj.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_cuqhrji6wzmpdmxr5b7kf5n6ha
-% Encoding created by otftotfm on Sat Jun 27 21:28:58 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:57 2020
 % Command line follows encoding
 /AutoEnc_cuqhrji6wzmpdmxr5b7kf5n6ha [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cxbogn.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cxbogn.enc
new file mode 100644
index 00000000000..292378787c8
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cxbogn.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_cxbognvjc6orz6vd7e4qkufizg
+% Encoding created by otftotfm on Wed Jul  1 20:56:35 2020
+% Command line follows encoding
+/AutoEnc_cxbognvjc6orz6vd7e4qkufizg [
+%00
+  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero /one /two /three /four /five /six /seven
+  /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /.notdef /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
+  /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=swsh --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --include-alternates=*.swash ETbb-Italic.otf
+% ETbb-Italic-tlf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cyyszv.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cyyszv.enc
index 0deb125383d..abc51f8f27c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cyyszv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cyyszv.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_cyyszv3tgoadb7habjipfqte7b
-% Encoding created by otftotfm on Sat Jun 27 21:28:41 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:27 2020
 % Command line follows encoding
 /AutoEnc_cyyszv3tgoadb7habjipfqte7b [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dcps7k.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dcps7k.enc
index 3637410706a..21714c5302c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dcps7k.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dcps7k.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_dcps7kztgw3wzbkeqywcdknetd
-% Encoding created by otftotfm on Sat Jun 27 21:28:34 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:11 2020
 % Command line follows encoding
 /AutoEnc_dcps7kztgw3wzbkeqywcdknetd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dep6cd.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dep6cd.enc
index 03a7c3bec54..3a4287d7630 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dep6cd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dep6cd.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_dep6cdmobxdewjybmud7kefdcf
-% Encoding created by otftotfm on Sat Jun 27 21:29:00 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:58 2020
 % Command line follows encoding
 /AutoEnc_dep6cdmobxdewjybmud7kefdcf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dz2qg3.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dz2qg3.enc
index 4044a96eaf2..60be80b686c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dz2qg3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dz2qg3.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_dz2qg3d3q3x6zjjkul4syetglf
-% Encoding created by otftotfm on Sat Jun 27 21:28:53 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:36 2020
 % Command line follows encoding
 /AutoEnc_dz2qg3d3q3x6zjjkul4syetglf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_e3m4fz.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_e3m4fz.enc
index 261a8a8249a..a88ebd19ea9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_e3m4fz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_e3m4fz.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_e3m4fzaal3fm6lwih762ck4hoh
-% Encoding created by otftotfm on Sat Jun 27 21:28:54 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:46 2020
 % Command line follows encoding
 /AutoEnc_e3m4fzaal3fm6lwih762ck4hoh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ea2dgh.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ea2dgh.enc
index b8e1602e102..a64296cbbc2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ea2dgh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ea2dgh.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ea2dgh24m4p3kft426m6vb5nre
-% Encoding created by otftotfm on Sat Jun 27 21:28:40 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:31 2020
 % Command line follows encoding
 /AutoEnc_ea2dgh24m4p3kft426m6vb5nre [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_elsw3h.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_elsw3h.enc
index 8d5a1cad9bb..b4ed6be0632 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_elsw3h.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_elsw3h.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_elsw3hdxi5xivsxqghfqivctad
-% Encoding created by otftotfm on Sat Jun 27 21:28:26 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:09 2020
 % Command line follows encoding
 /AutoEnc_elsw3hdxi5xivsxqghfqivctad [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_eqc2ac.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_eqc2ac.enc
index 8d31182bd72..f91c518474d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_eqc2ac.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_eqc2ac.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_eqc2ac2qcg4bxjlkwezu334h4f
-% Encoding created by otftotfm on Sat Jun 27 21:28:27 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:16 2020
 % Command line follows encoding
 /AutoEnc_eqc2ac2qcg4bxjlkwezu334h4f [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f55msl.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f55msl.enc
new file mode 100644
index 00000000000..570e6ebc4e7
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f55msl.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_f55mslfj4hkccrqglfkn6satdb
+% Encoding created by otftotfm on Wed Jul  1 20:56:44 2020
+% Command line follows encoding
+/AutoEnc_f55mslfj4hkccrqglfkn6satdb [
+%00
+  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.pnum /one.pnum /two.pnum /three.pnum /four.pnum /five.pnum /six.pnum /seven.pnum
+  /eight.pnum /nine.pnum /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /.notdef /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
+  /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=swsh --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --include-alternates=*.swash ETbb-Italic.otf
+% ETbb-Italic-lf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f7n52p.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f7n52p.enc
index 132d7b42500..6ad1804c141 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f7n52p.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f7n52p.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_f7n52pgkdu3b46yojqf7dkhspc
-% Encoding created by otftotfm on Sat Jun 27 21:28:47 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:43 2020
 % Command line follows encoding
 /AutoEnc_f7n52pgkdu3b46yojqf7dkhspc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4cncp6.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f7rui7.enc
index 0092ae20d44..981d00e10fc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4cncp6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f7rui7.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_4cncp6242bsoif7r55lnjzb3le
-% Encoding created by otftotfm on Sat Jun 27 21:28:27 2020
+%%AutoEnc_f7rui7qr5yqayibtf4z2zsyhec
+% Encoding created by otftotfm on Wed Jul  1 20:56:10 2020
 % Command line follows encoding
-/AutoEnc_4cncp6242bsoif7r55lnjzb3le [
+/AutoEnc_f7rui7qr5yqayibtf4z2zsyhec [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /exclam /asterisk
@@ -15,7 +15,7 @@
   /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
 %30
   /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /.notdef /.notdef /.notdef /minus /.notdef /.notdef
+  /eight.taboldstyle /nine.taboldstyle /Q /Q.swsh /.notdef /minus /.notdef /.notdef
 %40
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /bigcircle
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fpvlkw.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fpvlkw.enc
new file mode 100644
index 00000000000..19c6cc0b2c3
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fpvlkw.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_fpvlkwpxsrxluug5fok7c7hwmg
+% Encoding created by otftotfm on Wed Jul  1 20:56:10 2020
+% Command line follows encoding
+/AutoEnc_fpvlkwpxsrxluug5fok7c7hwmg [
+%00
+  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero /one /two /three /four /five /six /seven
+  /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
+  /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=swsh --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --include-alternates=*.swash ETbb-Bold.otf
+% ETbb-Bold-tlf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ftphfy.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ftphfy.enc
index a4463e98b69..5fc8b047c8b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ftphfy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ftphfy.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ftphfyliafmvcwfqlg66apswmh
-% Encoding created by otftotfm on Sat Jun 27 21:28:58 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:52 2020
 % Command line follows encoding
 /AutoEnc_ftphfyliafmvcwfqlg66apswmh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fue2l2.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fue2l2.enc
index 09fe414326d..ab2d50ad8c7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fue2l2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fue2l2.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_fue2l2dyo4hhc3efyctqx2ll4c
-% Encoding created by otftotfm on Sat Jun 27 21:28:54 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:37 2020
 % Command line follows encoding
 /AutoEnc_fue2l2dyo4hhc3efyctqx2ll4c [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fwcdph.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fwcdph.enc
new file mode 100644
index 00000000000..b3525b4567d
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fwcdph.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_fwcdpht2mk2iigledipz2k5mxb
+% Encoding created by otftotfm on Wed Jul  1 20:56:38 2020
+% Command line follows encoding
+/AutoEnc_fwcdpht2mk2iigledipz2k5mxb [
+%00
+  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
+  /eight.onum /nine.onum /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /.notdef /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
+  /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=swsh --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --include-alternates=*.swash ETbb-Italic.otf
+% ETbb-Italic-osf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gkmjhd.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gkmjhd.enc
index 92603578414..3b8dc1ee644 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gkmjhd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gkmjhd.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_gkmjhd3seclagiouwe46zxr2nh
-% Encoding created by otftotfm on Sat Jun 27 21:28:36 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:22 2020
 % Command line follows encoding
 /AutoEnc_gkmjhd3seclagiouwe46zxr2nh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gtayjy.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gtayjy.enc
index e7cb0f519ad..718a8554e6d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gtayjy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gtayjy.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_gtayjyqjbvkxwi76vvo5bz5rsh
-% Encoding created by otftotfm on Sat Jun 27 21:28:28 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:17 2020
 % Command line follows encoding
 /AutoEnc_gtayjyqjbvkxwi76vvo5bz5rsh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gtqfg2.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gtqfg2.enc
new file mode 100644
index 00000000000..23d81247716
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gtqfg2.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_gtqfg2y4h5nuzq6u24ubertl3h
+% Encoding created by otftotfm on Wed Jul  1 20:56:18 2020
+% Command line follows encoding
+/AutoEnc_gtqfg2y4h5nuzq6u24ubertl3h [
+%00
+  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.pnum /one.pnum /two.pnum /three.pnum /four.pnum /five.pnum /six.pnum /seven.pnum
+  /eight.pnum /nine.pnum /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
+  /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=swsh --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --include-alternates=*.swash ETbb-Bold.otf
+% ETbb-Bold-lf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_h4dyum.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_h4dyum.enc
index 75b4812d90c..2c9b747c4ac 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_h4dyum.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_h4dyum.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_h4dyumvfz6ek2rcxjxry72wymd
-% Encoding created by otftotfm on Sat Jun 27 21:28:30 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:08 2020
 % Command line follows encoding
 /AutoEnc_h4dyumvfz6ek2rcxjxry72wymd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hah5or.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hah5or.enc
index 6aeb1643649..c3c154736e9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hah5or.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hah5or.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_hah5orya7ruvjmqzsfnwzilfbf
-% Encoding created by otftotfm on Sat Jun 27 21:28:33 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:11 2020
 % Command line follows encoding
 /AutoEnc_hah5orya7ruvjmqzsfnwzilfbf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_abqwpj.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hcre2c.enc
index f8a8abbafd9..3f83a5f08ef 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_abqwpj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hcre2c.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_abqwpjn7v3lxf3bxfl2f27q5zd
-% Encoding created by otftotfm on Sat Jun 27 21:28:46 2020
+%%AutoEnc_hcre2coaukgjtmccse7rcteipa
+% Encoding created by otftotfm on Wed Jul  1 20:56:35 2020
 % Command line follows encoding
-/AutoEnc_abqwpjn7v3lxf3bxfl2f27q5zd [
+/AutoEnc_hcre2coaukgjtmccse7rcteipa [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /exclam /asterisk
@@ -15,7 +15,7 @@
   /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
 %30
   /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /.notdef /.notdef /.notdef /minus /.notdef /.notdef
+  /eight.taboldstyle /nine.taboldstyle /Q /Q.swsh /.notdef /minus /.notdef /.notdef
 %40
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hibu6u.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hibu6u.enc
index e4942e574fe..ce0354e808b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hibu6u.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hibu6u.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_hibu6umvrjtqrirvpvs25evi3c
-% Encoding created by otftotfm on Sat Jun 27 21:28:26 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:09 2020
 % Command line follows encoding
 /AutoEnc_hibu6umvrjtqrirvpvs25evi3c [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_i5ezvi.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_i5ezvi.enc
index 6dbaeec33c0..1266ff3315c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_i5ezvi.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_i5ezvi.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_i5ezvitppcazvehmki6u25ne3h
-% Encoding created by otftotfm on Sat Jun 27 21:28:45 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:33 2020
 % Command line follows encoding
 /AutoEnc_i5ezvitppcazvehmki6u25ne3h [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ihmnlr.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ihmnlr.enc
index 0f2e56f8c39..c8d0badfe3a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ihmnlr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ihmnlr.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ihmnlry5rdqsk57rbbszezzogb
-% Encoding created by otftotfm on Sat Jun 27 21:28:25 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:08 2020
 % Command line follows encoding
 /AutoEnc_ihmnlry5rdqsk57rbbszezzogb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_imedjx.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_imedjx.enc
index 2e56496941f..60f652363d1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_imedjx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_imedjx.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_imedjxssqsfkutdv3rq6n6nujc
-% Encoding created by otftotfm on Sat Jun 27 21:28:42 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:27 2020
 % Command line follows encoding
 /AutoEnc_imedjxssqsfkutdv3rq6n6nujc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_j7myeh.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_j7myeh.enc
index 58c7c8fd33a..0c0d4d967fc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_j7myeh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_j7myeh.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_j7myehdyrz6gorvvepmwcnbthh
-% Encoding created by otftotfm on Sat Jun 27 21:28:37 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:29 2020
 % Command line follows encoding
 /AutoEnc_j7myehdyrz6gorvvepmwcnbthh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_i4xjyq.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_kkjcws.enc
index b895efcb5fb..63840be4edc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_i4xjyq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_kkjcws.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_i4xjyqywguvmtvyod6rfzcdx6f
-% Encoding created by otftotfm on Sat Jun 27 21:28:48 2020
+%%AutoEnc_kkjcwsqdbeecfyy7hgz5besbsh
+% Encoding created by otftotfm on Wed Jul  1 20:56:38 2020
 % Command line follows encoding
-/AutoEnc_i4xjyqywguvmtvyod6rfzcdx6f [
+/AutoEnc_kkjcwsqdbeecfyy7hgz5besbsh [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /exclam /asterisk
@@ -15,7 +15,7 @@
   /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
 %30
   /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
-  /eight.onum /nine.onum /.notdef /.notdef /.notdef /minus /.notdef /.notdef
+  /eight.onum /nine.onum /Q /Q.swsh /.notdef /minus /.notdef /.notdef
 %40
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -60,4 +60,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/etbb
 % --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
 % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=pnum ETbb-Italic.otf ETbb-Italic-lf-ts1'
+% --feature=pnum ETbb-Italic.otf ETbb-Italic-osf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ko4aue.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ko4aue.enc
index 15dc3a31516..87cf0427a00 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ko4aue.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ko4aue.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ko4auenlxbrvzhbacuekbifdwd
-% Encoding created by otftotfm on Sat Jun 27 21:28:47 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:42 2020
 % Command line follows encoding
 /AutoEnc_ko4auenlxbrvzhbacuekbifdwd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_kuig7z.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_kuig7z.enc
index ab88a82a110..b7ef91e9568 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_kuig7z.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_kuig7z.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_kuig7zeiv5iolg6nn736gdpm7h
-% Encoding created by otftotfm on Sat Jun 27 21:28:27 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:09 2020
 % Command line follows encoding
 /AutoEnc_kuig7zeiv5iolg6nn736gdpm7h [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_kvzzr3.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_kvzzr3.enc
index 20af7d13db1..a35462f0521 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_kvzzr3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_kvzzr3.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_kvzzr3edrncu7vt2awvffb64cc
-% Encoding created by otftotfm on Sat Jun 27 21:28:39 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:26 2020
 % Command line follows encoding
 /AutoEnc_kvzzr3edrncu7vt2awvffb64cc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lchj55.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lchj55.enc
index 65adcceb1f5..d9afcebecee 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lchj55.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lchj55.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_lchj55yasnnqx5ykwctrzateoh
-% Encoding created by otftotfm on Sat Jun 27 21:28:56 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:47 2020
 % Command line follows encoding
 /AutoEnc_lchj55yasnnqx5ykwctrzateoh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nmcbzq.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lfrz6w.enc
index 1b81b20a489..67d211f0ffc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nmcbzq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lfrz6w.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_nmcbzq4sgpjqihlgrfjsupvbaf
-% Encoding created by otftotfm on Sat Jun 27 21:28:56 2020
+%%AutoEnc_lfrz6wrssnt2zjyix45pqgahrd
+% Encoding created by otftotfm on Wed Jul  1 20:56:48 2020
 % Command line follows encoding
-/AutoEnc_nmcbzq4sgpjqihlgrfjsupvbaf [
+/AutoEnc_lfrz6wrssnt2zjyix45pqgahrd [
 %00
   /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap
   /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /.notdef /.notdef
@@ -15,7 +15,7 @@
   /.notdef /.notdef /asteriskmath /.notdef /comma /hyphendbl /period /fraction
 %30
   /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /.notdef /.notdef /uni27E8 /minus /uni27E9 /.notdef
+  /eight.taboldstyle /nine.taboldstyle /Q /Q.swsh /uni27E8 /minus /uni27E9 /.notdef
 %40
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /Omegainv /.notdef /bigcircle
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lolxkk.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lolxkk.enc
new file mode 100644
index 00000000000..175fbf4962e
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lolxkk.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_lolxkkcm4a3fwq36qi7tvqprqd
+% Encoding created by otftotfm on Wed Jul  1 20:56:18 2020
+% Command line follows encoding
+/AutoEnc_lolxkkcm4a3fwq36qi7tvqprqd [
+%00
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.pnum /one.pnum /two.pnum /three.pnum /four.pnum /five.pnum /six.pnum /seven.pnum
+  /eight.pnum /nine.pnum /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
+% --feature=pnum --feature=swsh --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --include-alternates=*.swash ETbb-Bold.otf ETbb-Bold-lf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_m5kdwt.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_m5kdwt.enc
index 4a1d40417fe..e2fbc71e6d1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_m5kdwt.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_m5kdwt.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_m5kdwta2ya4v2cpfk2w7yaatjb
-% Encoding created by otftotfm on Sat Jun 27 21:28:53 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:36 2020
 % Command line follows encoding
 /AutoEnc_m5kdwta2ya4v2cpfk2w7yaatjb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_mgm6re.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_mgm6re.enc
new file mode 100644
index 00000000000..aa0585978cf
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_mgm6re.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_mgm6reivyglzs2cwtx35q2y4ye
+% Encoding created by otftotfm on Wed Jul  1 20:56:18 2020
+% Command line follows encoding
+/AutoEnc_mgm6reivyglzs2cwtx35q2y4ye [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.pnum /one.pnum /two.pnum /three.pnum /four.pnum /five.pnum /six.pnum /seven.pnum
+  /eight.pnum /nine.pnum /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+  /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+  /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+  /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+  /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E.ss02
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls.ss02
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=swsh --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --include-alternates=*.swash ETbb-Bold.otf
+% ETbb-Bold-lf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_mpvq56.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_mpvq56.enc
index 9f32e3aad5f..7e661d1e227 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_mpvq56.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_mpvq56.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_mpvq56haezsrrjg72prw5fumwf
-% Encoding created by otftotfm on Sat Jun 27 21:28:30 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:08 2020
 % Command line follows encoding
 /AutoEnc_mpvq56haezsrrjg72prw5fumwf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_na6tk5.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_na6tk5.enc
index be34dc8acb0..f0cdcdc3e96 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_na6tk5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_na6tk5.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_na6tk5osakq2zemkf5qfxhpzie
-% Encoding created by otftotfm on Sat Jun 27 21:29:01 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:53 2020
 % Command line follows encoding
 /AutoEnc_na6tk5osakq2zemkf5qfxhpzie [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nfh2ow.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nfh2ow.enc
index bf984550873..4dacd726e2f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nfh2ow.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nfh2ow.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_nfh2owxdg6o6hn6aumhzqgw4xe
-% Encoding created by otftotfm on Sat Jun 27 21:29:00 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:52 2020
 % Command line follows encoding
 /AutoEnc_nfh2owxdg6o6hn6aumhzqgw4xe [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nnawaw.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nnawaw.enc
index cc11d661258..ad5d97448f4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nnawaw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nnawaw.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_nnawawhrqtfql6ks2vijrjl4ef
-% Encoding created by otftotfm on Sat Jun 27 21:28:29 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:13 2020
 % Command line follows encoding
 /AutoEnc_nnawawhrqtfql6ks2vijrjl4ef [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ohc25e.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ohc25e.enc
index 9eb89893404..a5ca913d7db 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ohc25e.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ohc25e.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ohc25e7nugkq5uftwleqtlzhic
-% Encoding created by otftotfm on Sat Jun 27 21:28:28 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:17 2020
 % Command line follows encoding
 /AutoEnc_ohc25e7nugkq5uftwleqtlzhic [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ohvjcv.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ohvjcv.enc
index 597a0962a04..7ae64f899e6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ohvjcv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ohvjcv.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ohvjcvc5bqqlbwbvbss6jzvdvg
-% Encoding created by otftotfm on Sat Jun 27 21:28:30 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:19 2020
 % Command line follows encoding
 /AutoEnc_ohvjcvc5bqqlbwbvbss6jzvdvg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_oynaqb.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_oynaqb.enc
index 3d739facc76..e40301fd4dd 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_oynaqb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_oynaqb.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_oynaqbx2tknlw3aeddaeveg26e
-% Encoding created by otftotfm on Sat Jun 27 21:28:50 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:45 2020
 % Command line follows encoding
 /AutoEnc_oynaqbx2tknlw3aeddaeveg26e [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_p4wmli.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_p4wmli.enc
new file mode 100644
index 00000000000..7ef41a4245a
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_p4wmli.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_p4wmligvvkue2xskkzbfmabuja
+% Encoding created by otftotfm on Wed Jul  1 20:56:10 2020
+% Command line follows encoding
+/AutoEnc_p4wmligvvkue2xskkzbfmabuja [
+%00
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero /one /two /three /four /five /six /seven
+  /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
+% --feature=swsh --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --include-alternates=*.swash ETbb-Bold.otf ETbb-Bold-tlf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_pijcl4.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_pijcl4.enc
index 668ff3b97e3..498bdc18c58 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_pijcl4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_pijcl4.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_pijcl45xbcrh3ujmxpu2uuufoe
-% Encoding created by otftotfm on Sat Jun 27 21:28:27 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:16 2020
 % Command line follows encoding
 /AutoEnc_pijcl45xbcrh3ujmxpu2uuufoe [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_pvrda3.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_pvrda3.enc
index 7573395a453..4194f703d1b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_pvrda3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_pvrda3.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_pvrda3ayd24l2jz24a3yz6f4kd
-% Encoding created by otftotfm on Sat Jun 27 21:28:26 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:09 2020
 % Command line follows encoding
 /AutoEnc_pvrda3ayd24l2jz24a3yz6f4kd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_qmwyqz.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_qmwyqz.enc
index e63082c8aee..e96cf34173a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_qmwyqz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_qmwyqz.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_qmwyqz2zii3wt5czsrhsmdlqle
-% Encoding created by otftotfm on Sat Jun 27 21:28:52 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:40 2020
 % Command line follows encoding
 /AutoEnc_qmwyqz2zii3wt5czsrhsmdlqle [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_qqjyre.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_qqjyre.enc
index 7e305d72a4b..4e8529ba54f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_qqjyre.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_qqjyre.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_qqjyrebwkze4pfxo72toftkebf
-% Encoding created by otftotfm on Sat Jun 27 21:28:56 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:55 2020
 % Command line follows encoding
 /AutoEnc_qqjyrebwkze4pfxo72toftkebf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_r34xpu.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_r34xpu.enc
index c6ebb00d436..34d0e43a7ed 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_r34xpu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_r34xpu.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_r34xpuqbjubisgsjxlr74lrpqd
-% Encoding created by otftotfm on Sat Jun 27 21:29:02 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:49 2020
 % Command line follows encoding
 /AutoEnc_r34xpuqbjubisgsjxlr74lrpqd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_riohwx.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_riohwx.enc
index dd2177532e3..425581d3e4f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_riohwx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_riohwx.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_riohwxsior5lnnjjsjpbvpslke
-% Encoding created by otftotfm on Sat Jun 27 21:28:35 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:21 2020
 % Command line follows encoding
 /AutoEnc_riohwxsior5lnnjjsjpbvpslke [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rt4kro.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rt4kro.enc
index 9bf9f18cf4b..c079e4c8c2b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rt4kro.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rt4kro.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_rt4krokhlnwam4wxhivtc42zod
-% Encoding created by otftotfm on Sat Jun 27 21:28:31 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:14 2020
 % Command line follows encoding
 /AutoEnc_rt4krokhlnwam4wxhivtc42zod [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rwec2l.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rwec2l.enc
index b5dacdc9e6c..ab8987bfd05 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rwec2l.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rwec2l.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_rwec2ltafusdbpjxc5bs7fdg3b
-% Encoding created by otftotfm on Sat Jun 27 21:28:51 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:40 2020
 % Command line follows encoding
 /AutoEnc_rwec2ltafusdbpjxc5bs7fdg3b [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rzlqzq.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rzlqzq.enc
index 67f2a2c8e72..7a4ba508fcc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rzlqzq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rzlqzq.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_rzlqzq4dfqtplm3j7w5fz6domf
-% Encoding created by otftotfm on Sat Jun 27 21:28:49 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:33 2020
 % Command line follows encoding
 /AutoEnc_rzlqzq4dfqtplm3j7w5fz6domf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_s2dnn6.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_s2dnn6.enc
index 5c54bbc877d..6662edd6811 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_s2dnn6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_s2dnn6.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_s2dnn6rj7tbunhbchxk63iytpd
-% Encoding created by otftotfm on Sat Jun 27 21:28:40 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:32 2020
 % Command line follows encoding
 /AutoEnc_s2dnn6rj7tbunhbchxk63iytpd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sk3nrp.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sk3nrp.enc
index 5753d719af3..cf229bbeb1a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sk3nrp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sk3nrp.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_sk3nrpgzyacs2cd4rfqahjbzdc
-% Encoding created by otftotfm on Sat Jun 27 21:29:00 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:58 2020
 % Command line follows encoding
 /AutoEnc_sk3nrpgzyacs2cd4rfqahjbzdc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_skushq.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_skushq.enc
new file mode 100644
index 00000000000..9f46704593f
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_skushq.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_skushqlalkfgdo46rxhdwryuge
+% Encoding created by otftotfm on Wed Jul  1 20:56:28 2020
+% Command line follows encoding
+/AutoEnc_skushqlalkfgdo46rxhdwryuge [
+%00
+  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /.notdef /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+  /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=swsh --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --include-alternates=*.swash ETbb-BoldItalic.otf
+% ETbb-BoldItalic-tosf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sp7p3o.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sp7p3o.enc
index 21109cc2600..d0125eede28 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sp7p3o.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sp7p3o.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_sp7p3ogzc33lxwuaxiyoy7i63e
-% Encoding created by otftotfm on Sat Jun 27 21:28:53 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:37 2020
 % Command line follows encoding
 /AutoEnc_sp7p3ogzc33lxwuaxiyoy7i63e [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sz3fgd.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sz3fgd.enc
index 2d27d809caf..1e72f7fd4cb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sz3fgd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sz3fgd.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_sz3fgdxm5o6umjwa4dgutu666f
-% Encoding created by otftotfm on Sat Jun 27 21:28:34 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:12 2020
 % Command line follows encoding
 /AutoEnc_sz3fgdxm5o6umjwa4dgutu666f [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_tbmtgo.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_tbmtgo.enc
new file mode 100644
index 00000000000..63e099c851e
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_tbmtgo.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_tbmtgoznr33jpt6iokvjfw4jnd
+% Encoding created by otftotfm on Wed Jul  1 20:56:41 2020
+% Command line follows encoding
+/AutoEnc_tbmtgoznr33jpt6iokvjfw4jnd [
+%00
+  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /.notdef /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
+  /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=swsh --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --include-alternates=*.swash ETbb-Italic.otf
+% ETbb-Italic-tosf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_tif2yn.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_tif2yn.enc
index 20aa758dbc5..04b619b8959 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_tif2yn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_tif2yn.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_tif2ynv3fdnyajhtthl5l33lxb
-% Encoding created by otftotfm on Sat Jun 27 21:28:50 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:44 2020
 % Command line follows encoding
 /AutoEnc_tif2ynv3fdnyajhtthl5l33lxb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ujmsnd.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ujmsnd.enc
new file mode 100644
index 00000000000..3cd4816129b
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ujmsnd.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ujmsnd4wrjk5td66f5dpjczund
+% Encoding created by otftotfm on Wed Jul  1 20:56:50 2020
+% Command line follows encoding
+/AutoEnc_ujmsnd4wrjk5td66f5dpjczund [
+%00
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Omega /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
+  /eight.onum /nine.onum /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
+% --feature=pnum --feature=swsh --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --include-alternates=*.swash ETbb-Regular.otf ETbb-Regular-osf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_un2f5f.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_un2f5f.enc
index 9e7cf10334e..81edc8cf189 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_un2f5f.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_un2f5f.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_un2f5ft3vrvcnpf2fv5j434njb
-% Encoding created by otftotfm on Sat Jun 27 21:28:32 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:14 2020
 % Command line follows encoding
 /AutoEnc_un2f5ft3vrvcnpf2fv5j434njb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_uoncjt.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_uoncjt.enc
index 712c6e2b873..d7915b83ab6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_uoncjt.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_uoncjt.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_uoncjtwnmhcjmejtj3u7v6bsxh
-% Encoding created by otftotfm on Sat Jun 27 21:28:59 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:45 2020
 % Command line follows encoding
 /AutoEnc_uoncjtwnmhcjmejtj3u7v6bsxh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_v2eodf.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_v2eodf.enc
index 81b94d27e32..bdd539d7743 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_v2eodf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_v2eodf.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_v2eodfhfoafkknfaq4dvfpm3vf
-% Encoding created by otftotfm on Sat Jun 27 21:28:26 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:09 2020
 % Command line follows encoding
 /AutoEnc_v2eodfhfoafkknfaq4dvfpm3vf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_v6nho7.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_v6nho7.enc
new file mode 100644
index 00000000000..f7297ab2758
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_v6nho7.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_v6nho72t4emng74mnbztuynq6f
+% Encoding created by otftotfm on Wed Jul  1 20:56:22 2020
+% Command line follows encoding
+/AutoEnc_v6nho72t4emng74mnbztuynq6f [
+%00
+  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero /one /two /three /four /five /six /seven
+  /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /.notdef /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+  /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=swsh --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --include-alternates=*.swash ETbb-BoldItalic.otf
+% ETbb-BoldItalic-tlf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_vmkycp.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_vmkycp.enc
index 7da10793ee0..b3c01189967 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_vmkycp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_vmkycp.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_vmkycpf7ajyvncqs3krblmkupe
-% Encoding created by otftotfm on Sat Jun 27 21:28:55 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:47 2020
 % Command line follows encoding
 /AutoEnc_vmkycpf7ajyvncqs3krblmkupe [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_vtabip.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_vtabip.enc
new file mode 100644
index 00000000000..2664807efce
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_vtabip.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_vtabipmm4e5xag7gq2nwm3p6gc
+% Encoding created by otftotfm on Wed Jul  1 20:56:15 2020
+% Command line follows encoding
+/AutoEnc_vtabipmm4e5xag7gq2nwm3p6gc [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+  /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+  /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+  /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+  /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E.ss02
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls.ss02
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=swsh --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --include-alternates=*.swash ETbb-Bold.otf
+% ETbb-Bold-tosf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_w52zjg.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_w52zjg.enc
index 8be51af5d07..762b48cd124 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_w52zjg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_w52zjg.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh
-% Encoding created by otftotfm on Sat Jun 27 21:28:30 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:08 2020
 % Command line follows encoding
 /AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_whnzkz.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_whnzkz.enc
index c3b3a90863d..ec6d13e48d5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_whnzkz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_whnzkz.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_whnzkzr322c66cgq4nlbs67x7d
-% Encoding created by otftotfm on Sat Jun 27 21:28:51 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:40 2020
 % Command line follows encoding
 /AutoEnc_whnzkzr322c66cgq4nlbs67x7d [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_wplash.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_wplash.enc
new file mode 100644
index 00000000000..11ccf7cd5ea
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_wplash.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_wplashkp5h2u4lgwljah7kwuab
+% Encoding created by otftotfm on Wed Jul  1 20:56:57 2020
+% Command line follows encoding
+/AutoEnc_wplashkp5h2u4lgwljah7kwuab [
+%00
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Omega /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.pnum /one.pnum /two.pnum /three.pnum /four.pnum /five.pnum /six.pnum /seven.pnum
+  /eight.pnum /nine.pnum /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
+% --feature=pnum --feature=swsh --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --include-alternates=*.swash ETbb-Regular.otf ETbb-Regular-lf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_x5rskw.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_x5rskw.enc
index 854f35fc5a7..ffd6526395b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_x5rskw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_x5rskw.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_x5rskwfdgrpeovvnp5dgzgax7e
-% Encoding created by otftotfm on Sat Jun 27 21:28:28 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:17 2020
 % Command line follows encoding
 /AutoEnc_x5rskwfdgrpeovvnp5dgzgax7e [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xaqh3v.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xaqh3v.enc
new file mode 100644
index 00000000000..f5b738c9b68
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xaqh3v.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_xaqh3v7my6v7plsnnlq32jk5pb
+% Encoding created by otftotfm on Wed Jul  1 20:56:12 2020
+% Command line follows encoding
+/AutoEnc_xaqh3v7my6v7plsnnlq32jk5pb [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
+  /eight.onum /nine.onum /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+  /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+  /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+  /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+  /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E.ss02
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls.ss02
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=swsh --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --include-alternates=*.swash ETbb-Bold.otf
+% ETbb-Bold-osf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_iaohom.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xdptht.enc
index bd361183cb4..453098e92e8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_iaohom.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xdptht.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_iaohomlitomsjx7jlvx77nhdub
-% Encoding created by otftotfm on Sat Jun 27 21:28:38 2020
+%%AutoEnc_xdpthtxgnuplprpqhazm34unne
+% Encoding created by otftotfm on Wed Jul  1 20:56:25 2020
 % Command line follows encoding
-/AutoEnc_iaohomlitomsjx7jlvx77nhdub [
+/AutoEnc_xdpthtxgnuplprpqhazm34unne [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /exclam /asterisk
@@ -15,7 +15,7 @@
   /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
 %30
   /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
-  /eight.onum /nine.onum /.notdef /.notdef /.notdef /minus /.notdef /.notdef
+  /eight.onum /nine.onum /Q /Q.swsh /.notdef /minus /.notdef /.notdef
 %40
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -60,4 +60,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/etbb
 % --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
 % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=pnum ETbb-BoldItalic.otf ETbb-BoldItalic-lf-ts1'
+% --feature=pnum ETbb-BoldItalic.otf ETbb-BoldItalic-osf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xe5wuh.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xe5wuh.enc
index 4314c571a1c..42f5a2832d9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xe5wuh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xe5wuh.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_xe5wuhzidgbvcpd4udlt7isypc
-% Encoding created by otftotfm on Sat Jun 27 21:28:51 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:39 2020
 % Command line follows encoding
 /AutoEnc_xe5wuhzidgbvcpd4udlt7isypc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xmn5et.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xmn5et.enc
new file mode 100644
index 00000000000..d4a7ed12e61
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xmn5et.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_xmn5etwdfamaoydl5hgcpvzzmh
+% Encoding created by otftotfm on Wed Jul  1 20:56:16 2020
+% Command line follows encoding
+/AutoEnc_xmn5etwdfamaoydl5hgcpvzzmh [
+%00
+  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
+  /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=swsh --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --include-alternates=*.swash ETbb-Bold.otf
+% ETbb-Bold-tosf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ybjyd4.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ybjyd4.enc
index e71d5e2be22..7d312e86b45 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ybjyd4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ybjyd4.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ybjyd4l7q3pzoonr2vgt7y7cye
-% Encoding created by otftotfm on Sat Jun 27 21:28:31 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:14 2020
 % Command line follows encoding
 /AutoEnc_ybjyd4l7q3pzoonr2vgt7y7cye [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ydcfbc.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ydcfbc.enc
new file mode 100644
index 00000000000..36db7ab14a6
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ydcfbc.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ydcfbcl5ljqkibbzqu2uvlk5mh
+% Encoding created by otftotfm on Wed Jul  1 20:56:48 2020
+% Command line follows encoding
+/AutoEnc_ydcfbcl5ljqkibbzqu2uvlk5mh [
+%00
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Omega /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero /one /two /three /four /five /six /seven
+  /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
+% --feature=swsh --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --include-alternates=*.swash ETbb-Regular.otf ETbb-Regular-tlf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yhvmm4.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yhvmm4.enc
index 49fbf778a5a..9833c443391 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yhvmm4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yhvmm4.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_yhvmm4p7ob5occ6mmnesxbgljh
-% Encoding created by otftotfm on Sat Jun 27 21:29:03 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:50 2020
 % Command line follows encoding
 /AutoEnc_yhvmm4p7ob5occ6mmnesxbgljh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yiqwpu.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yiqwpu.enc
index b6f4080d543..e2e95881df5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yiqwpu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yiqwpu.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_yiqwpuq7peloj5eprodwnynevc
-% Encoding created by otftotfm on Sat Jun 27 21:28:39 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:20 2020
 % Command line follows encoding
 /AutoEnc_yiqwpuq7peloj5eprodwnynevc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yjlloh.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yjlloh.enc
index 770d485c609..64f77725c19 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yjlloh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yjlloh.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_yjllohyiapvbznlcedbxnkm3sa
-% Encoding created by otftotfm on Sat Jun 27 21:28:50 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:45 2020
 % Command line follows encoding
 /AutoEnc_yjllohyiapvbznlcedbxnkm3sa [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ytzykv.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ytzykv.enc
index 55a8366827f..cc8a3ee59b3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ytzykv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ytzykv.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ytzykvcotxef33p6cozlsx4zlh
-% Encoding created by otftotfm on Sat Jun 27 21:28:48 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:39 2020
 % Command line follows encoding
 /AutoEnc_ytzykvcotxef33p6cozlsx4zlh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yziesh.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yziesh.enc
new file mode 100644
index 00000000000..d984e30427f
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yziesh.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_yzieshsd44fbunydsrfnu5dloe
+% Encoding created by otftotfm on Wed Jul  1 20:56:10 2020
+% Command line follows encoding
+/AutoEnc_yzieshsd44fbunydsrfnu5dloe [
+%00
+  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+  /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+  /.notdef /dotlessi /dotlessj /ff /fi /fl /ffi /ffl
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero /one /two /three /four /five /six /seven
+  /eight /nine /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+  /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+  /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
+%90
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+  /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+  /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
+%B0
+  /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+  /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E.ss02
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls.ss02
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=swsh --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --include-alternates=*.swash ETbb-Bold.otf
+% ETbb-Bold-tlf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yzoycr.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yzoycr.enc
index 52c336c1a67..a6f52fdd3ea 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yzoycr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yzoycr.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_yzoycro7xigz5wnd723rnypzae
-% Encoding created by otftotfm on Sat Jun 27 21:28:29 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:13 2020
 % Command line follows encoding
 /AutoEnc_yzoycro7xigz5wnd723rnypzae [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yzujze.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yzujze.enc
index 7d363ab5eaf..8d3dc54bf20 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yzujze.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yzujze.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_yzujze46wjghaaaz6ede3o5zpg
-% Encoding created by otftotfm on Sat Jun 27 21:29:04 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:50 2020
 % Command line follows encoding
 /AutoEnc_yzujze46wjghaaaz6ede3o5zpg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_z6brcn.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_z6brcn.enc
index 9d43a644151..c1b58762c24 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_z6brcn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_z6brcn.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_z6brcnoe5prjyyjcyzrsnkxmxe
-% Encoding created by otftotfm on Sat Jun 27 21:28:45 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:34 2020
 % Command line follows encoding
 /AutoEnc_z6brcnoe5prjyyjcyzrsnkxmxe [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_zpkt7y.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_zpkt7y.enc
new file mode 100644
index 00000000000..d9a4317a4b5
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_zpkt7y.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_zpkt7yo2662luadsq46ip6qshh
+% Encoding created by otftotfm on Wed Jul  1 20:56:13 2020
+% Command line follows encoding
+/AutoEnc_zpkt7yo2662luadsq46ip6qshh [
+%00
+  /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+%10
+  /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+  /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+  /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
+  /eight.onum /nine.onum /colon /semicolon /less /equal /greater /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.swsh /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+  /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+  /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+  /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+  /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+  /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+  /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+  /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
+  /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+  /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+  /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+  /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+  /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+  /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+  /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/etbb
+% --vf-directory=texmf/fonts/vf/public/etbb
+% --type1-directory=texmf/fonts/type1/public/etbb
+% --encoding-directory=texmf/fonts/enc/dvips/etbb
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=swsh --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --include-alternates=*.swash ETbb-Bold.otf
+% ETbb-Bold-osf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_zxy3n5.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_zxy3n5.enc
index b5107e25985..cdb11eecc69 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_zxy3n5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_zxy3n5.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_zxy3n5aiatzd3xjlhm2urzyfuc
-% Encoding created by otftotfm on Sat Jun 27 21:28:34 2020
+% Encoding created by otftotfm on Wed Jul  1 20:56:12 2020
 % Command line follows encoding
 /AutoEnc_zxy3n5aiatzd3xjlhm2urzyfuc [
 %00
diff --git a/Master/texmf-dist/fonts/map/dvips/etbb/ETbb.map b/Master/texmf-dist/fonts/map/dvips/etbb/ETbb.map
index 38f7b84773d..264aea3107e 100644
--- a/Master/texmf-dist/fonts/map/dvips/etbb/ETbb.map
+++ b/Master/texmf-dist/fonts/map/dvips/etbb/ETbb.map
@@ -1,186 +1,250 @@
 % Automatically maintained by otftotfm or other programs. Do not edit.
 
+ETbb-Bold-dnom-ot1 ETbb-Bold "AutoEnc_h4dyumvfz6ek2rcxjxry72wymd ReEncodeFont" <[etbb_h4dyum.enc <ETbb-Bold.pfb
+ETbb-Bold-dnom-t1--base ETbb-Bold "AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb_w52zjg.enc <ETbb-Bold.pfb
+ETbb-Bold-dnom-ly1--base ETbb-Bold "AutoEnc_mpvq56haezsrrjg72prw5fumwf ReEncodeFont" <[etbb_mpvq56.enc <ETbb-Bold.pfb
 ETbb-Bold-tlf-ot1 ETbb-Bold "AutoEnc_ihmnlry5rdqsk57rbbszezzogb ReEncodeFont" <[etbb_ihmnlr.enc <ETbb-Bold.pfb
 ETbb-Bold-tlf-t1--base ETbb-Bold "AutoEnc_pvrda3ayd24l2jz24a3yz6f4kd ReEncodeFont" <[etbb_pvrda3.enc <ETbb-Bold.pfb
 ETbb-Bold-tlf-ly1--base ETbb-Bold "AutoEnc_elsw3hdxi5xivsxqghfqivctad ReEncodeFont" <[etbb_elsw3h.enc <ETbb-Bold.pfb
 ETbb-Bold-tlf-sc-ot1--base ETbb-Bold "AutoEnc_v2eodfhfoafkknfaq4dvfpm3vf ReEncodeFont" <[etbb_v2eodf.enc <ETbb-Bold.pfb
 ETbb-Bold-tlf-sc-t1--base ETbb-Bold "AutoEnc_hibu6umvrjtqrirvpvs25evi3c ReEncodeFont" <[etbb_hibu6u.enc <ETbb-Bold.pfb
 ETbb-Bold-tlf-sc-ly1--base ETbb-Bold "AutoEnc_kuig7zeiv5iolg6nn736gdpm7h ReEncodeFont" <[etbb_kuig7z.enc <ETbb-Bold.pfb
-ETbb-Bold-tlf-ts1--base ETbb-Bold "AutoEnc_4cncp6242bsoif7r55lnjzb3le ReEncodeFont" <[etbb_4cncp6.enc <ETbb-Bold.pfb
-ETbb-Bold-lf-ot1 ETbb-Bold "AutoEnc_pijcl45xbcrh3ujmxpu2uuufoe ReEncodeFont" <[etbb_pijcl4.enc <ETbb-Bold.pfb
-ETbb-Bold-lf-t1--base ETbb-Bold "AutoEnc_eqc2ac2qcg4bxjlkwezu334h4f ReEncodeFont" <[etbb_eqc2ac.enc <ETbb-Bold.pfb
-ETbb-Bold-lf-ly1--base ETbb-Bold "AutoEnc_ohc25e7nugkq5uftwleqtlzhic ReEncodeFont" <[etbb_ohc25e.enc <ETbb-Bold.pfb
-ETbb-Bold-lf-sc-ot1--base ETbb-Bold "AutoEnc_gtayjyqjbvkxwi76vvo5bz5rsh ReEncodeFont" <[etbb_gtayjy.enc <ETbb-Bold.pfb
-ETbb-Bold-lf-sc-t1--base ETbb-Bold "AutoEnc_x5rskwfdgrpeovvnp5dgzgax7e ReEncodeFont" <[etbb_x5rskw.enc <ETbb-Bold.pfb
-ETbb-Bold-lf-sc-ly1--base ETbb-Bold "AutoEnc_c6gjhmb3ta3czdt7nhimutsk5c ReEncodeFont" <[etbb_c6gjhm.enc <ETbb-Bold.pfb
-ETbb-Bold-lf-ts1--base ETbb-Bold "AutoEnc_4nf2t33jqvsejadw6cvgnjdiwf ReEncodeFont" <[etbb_4nf2t3.enc <ETbb-Bold.pfb
+ETbb-Bold-tlf-swash-ot1 ETbb-Bold "AutoEnc_p4wmligvvkue2xskkzbfmabuja ReEncodeFont" <[etbb_p4wmli.enc <ETbb-Bold.pfb
+ETbb-Bold-tlf-swash-t1--base ETbb-Bold "AutoEnc_yzieshsd44fbunydsrfnu5dloe ReEncodeFont" <[etbb_yziesh.enc <ETbb-Bold.pfb
+ETbb-Bold-tlf-swash-ly1--base ETbb-Bold "AutoEnc_fpvlkwpxsrxluug5fok7c7hwmg ReEncodeFont" <[etbb_fpvlkw.enc <ETbb-Bold.pfb
+ETbb-Bold-tlf-ts1--base ETbb-Bold "AutoEnc_f7rui7qr5yqayibtf4z2zsyhec ReEncodeFont" <[etbb_f7rui7.enc <ETbb-Bold.pfb
+ETbb-Bold-osf-ot1 ETbb-Bold "AutoEnc_3li7dqpy2izcpma72gvve2muqf ReEncodeFont" <[etbb_3li7dq.enc <ETbb-Bold.pfb
+ETbb-Bold-osf-t1--base ETbb-Bold "AutoEnc_hah5orya7ruvjmqzsfnwzilfbf ReEncodeFont" <[etbb_hah5or.enc <ETbb-Bold.pfb
+ETbb-Bold-osf-ly1--base ETbb-Bold "AutoEnc_33mftda5zpj2atc2k5o52aguyh ReEncodeFont" <[etbb_33mftd.enc <ETbb-Bold.pfb
+ETbb-Bold-osf-sc-ot1--base ETbb-Bold "AutoEnc_dcps7kztgw3wzbkeqywcdknetd ReEncodeFont" <[etbb_dcps7k.enc <ETbb-Bold.pfb
+ETbb-Bold-osf-sc-t1--base ETbb-Bold "AutoEnc_zxy3n5aiatzd3xjlhm2urzyfuc ReEncodeFont" <[etbb_zxy3n5.enc <ETbb-Bold.pfb
+ETbb-Bold-osf-sc-ly1--base ETbb-Bold "AutoEnc_sz3fgdxm5o6umjwa4dgutu666f ReEncodeFont" <[etbb_sz3fgd.enc <ETbb-Bold.pfb
+ETbb-Bold-osf-swash-ot1 ETbb-Bold "AutoEnc_ay4atisik7ffogqasevzhgjvtc ReEncodeFont" <[etbb_ay4ati.enc <ETbb-Bold.pfb
+ETbb-Bold-osf-swash-t1--base ETbb-Bold "AutoEnc_xaqh3v7my6v7plsnnlq32jk5pb ReEncodeFont" <[etbb_xaqh3v.enc <ETbb-Bold.pfb
+ETbb-Bold-osf-swash-ly1--base ETbb-Bold "AutoEnc_zpkt7yo2662luadsq46ip6qshh ReEncodeFont" <[etbb_zpkt7y.enc <ETbb-Bold.pfb
+ETbb-Bold-osf-ts1--base ETbb-Bold "AutoEnc_cpixk3kzz7zlit4vgu64uofbpa ReEncodeFont" <[etbb_cpixk3.enc <ETbb-Bold.pfb
 ETbb-Bold-inf-ot1 ETbb-Bold "AutoEnc_cluc7m4ium2bcpwlcwz2h6yxsd ReEncodeFont" <[etbb_cluc7m.enc <ETbb-Bold.pfb
 ETbb-Bold-inf-t1--base ETbb-Bold "AutoEnc_nnawawhrqtfql6ks2vijrjl4ef ReEncodeFont" <[etbb_nnawaw.enc <ETbb-Bold.pfb
 ETbb-Bold-inf-ly1--base ETbb-Bold "AutoEnc_yzoycro7xigz5wnd723rnypzae ReEncodeFont" <[etbb_yzoycr.enc <ETbb-Bold.pfb
-ETbb-Bold-dnom-ot1 ETbb-Bold "AutoEnc_h4dyumvfz6ek2rcxjxry72wymd ReEncodeFont" <[etbb_h4dyum.enc <ETbb-Bold.pfb
-ETbb-Bold-dnom-t1--base ETbb-Bold "AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb_w52zjg.enc <ETbb-Bold.pfb
-ETbb-Bold-dnom-ly1--base ETbb-Bold "AutoEnc_mpvq56haezsrrjg72prw5fumwf ReEncodeFont" <[etbb_mpvq56.enc <ETbb-Bold.pfb
-ETbb-Bold-sup-ot1 ETbb-Bold "AutoEnc_ohvjcvc5bqqlbwbvbss6jzvdvg ReEncodeFont" <[etbb_ohvjcv.enc <ETbb-Bold.pfb
-ETbb-Bold-sup-t1--base ETbb-Bold "AutoEnc_3pfdgzsbueyunimviyizcdlq3b ReEncodeFont" <[etbb_3pfdgz.enc <ETbb-Bold.pfb
-ETbb-Bold-sup-ly1--base ETbb-Bold "AutoEnc_atf2m5uqgbwoyyy5ueppslzajb ReEncodeFont" <[etbb_atf2m5.enc <ETbb-Bold.pfb
 ETbb-Bold-tosf-ot1 ETbb-Bold "AutoEnc_rt4krokhlnwam4wxhivtc42zod ReEncodeFont" <[etbb_rt4kro.enc <ETbb-Bold.pfb
 ETbb-Bold-tosf-t1--base ETbb-Bold "AutoEnc_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb_3ccbvp.enc <ETbb-Bold.pfb
 ETbb-Bold-tosf-ly1--base ETbb-Bold "AutoEnc_ybjyd4l7q3pzoonr2vgt7y7cye ReEncodeFont" <[etbb_ybjyd4.enc <ETbb-Bold.pfb
 ETbb-Bold-tosf-sc-ot1--base ETbb-Bold "AutoEnc_un2f5ft3vrvcnpf2fv5j434njb ReEncodeFont" <[etbb_un2f5f.enc <ETbb-Bold.pfb
 ETbb-Bold-tosf-sc-t1--base ETbb-Bold "AutoEnc_5325we5aho44lxbyegll2vl3dc ReEncodeFont" <[etbb_5325we.enc <ETbb-Bold.pfb
 ETbb-Bold-tosf-sc-ly1--base ETbb-Bold "AutoEnc_cpdyi3iny2nijyt7gl7sena5id ReEncodeFont" <[etbb_cpdyi3.enc <ETbb-Bold.pfb
-ETbb-Bold-tosf-ts1--base ETbb-Bold "AutoEnc_4cncp6242bsoif7r55lnjzb3le ReEncodeFont" <[etbb_4cncp6.enc <ETbb-Bold.pfb
-ETbb-Bold-osf-ot1 ETbb-Bold "AutoEnc_3li7dqpy2izcpma72gvve2muqf ReEncodeFont" <[etbb_3li7dq.enc <ETbb-Bold.pfb
-ETbb-Bold-osf-t1--base ETbb-Bold "AutoEnc_hah5orya7ruvjmqzsfnwzilfbf ReEncodeFont" <[etbb_hah5or.enc <ETbb-Bold.pfb
-ETbb-Bold-osf-ly1--base ETbb-Bold "AutoEnc_33mftda5zpj2atc2k5o52aguyh ReEncodeFont" <[etbb_33mftd.enc <ETbb-Bold.pfb
-ETbb-Bold-osf-sc-ot1--base ETbb-Bold "AutoEnc_dcps7kztgw3wzbkeqywcdknetd ReEncodeFont" <[etbb_dcps7k.enc <ETbb-Bold.pfb
-ETbb-Bold-osf-sc-t1--base ETbb-Bold "AutoEnc_zxy3n5aiatzd3xjlhm2urzyfuc ReEncodeFont" <[etbb_zxy3n5.enc <ETbb-Bold.pfb
-ETbb-Bold-osf-sc-ly1--base ETbb-Bold "AutoEnc_sz3fgdxm5o6umjwa4dgutu666f ReEncodeFont" <[etbb_sz3fgd.enc <ETbb-Bold.pfb
-ETbb-Bold-osf-ts1--base ETbb-Bold "AutoEnc_4nf2t33jqvsejadw6cvgnjdiwf ReEncodeFont" <[etbb_4nf2t3.enc <ETbb-Bold.pfb
+ETbb-Bold-tosf-swash-ot1 ETbb-Bold "AutoEnc_cpb6sdrmtmjdkd4dvmojrwtfyb ReEncodeFont" <[etbb_cpb6sd.enc <ETbb-Bold.pfb
+ETbb-Bold-tosf-swash-t1--base ETbb-Bold "AutoEnc_vtabipmm4e5xag7gq2nwm3p6gc ReEncodeFont" <[etbb_vtabip.enc <ETbb-Bold.pfb
+ETbb-Bold-tosf-swash-ly1--base ETbb-Bold "AutoEnc_xmn5etwdfamaoydl5hgcpvzzmh ReEncodeFont" <[etbb_xmn5et.enc <ETbb-Bold.pfb
+ETbb-Bold-tosf-ts1--base ETbb-Bold "AutoEnc_f7rui7qr5yqayibtf4z2zsyhec ReEncodeFont" <[etbb_f7rui7.enc <ETbb-Bold.pfb
+ETbb-Bold-lf-ot1 ETbb-Bold "AutoEnc_pijcl45xbcrh3ujmxpu2uuufoe ReEncodeFont" <[etbb_pijcl4.enc <ETbb-Bold.pfb
+ETbb-Bold-lf-t1--base ETbb-Bold "AutoEnc_eqc2ac2qcg4bxjlkwezu334h4f ReEncodeFont" <[etbb_eqc2ac.enc <ETbb-Bold.pfb
+ETbb-Bold-lf-ly1--base ETbb-Bold "AutoEnc_ohc25e7nugkq5uftwleqtlzhic ReEncodeFont" <[etbb_ohc25e.enc <ETbb-Bold.pfb
+ETbb-Bold-lf-sc-ot1--base ETbb-Bold "AutoEnc_gtayjyqjbvkxwi76vvo5bz5rsh ReEncodeFont" <[etbb_gtayjy.enc <ETbb-Bold.pfb
+ETbb-Bold-lf-sc-t1--base ETbb-Bold "AutoEnc_x5rskwfdgrpeovvnp5dgzgax7e ReEncodeFont" <[etbb_x5rskw.enc <ETbb-Bold.pfb
+ETbb-Bold-lf-sc-ly1--base ETbb-Bold "AutoEnc_c6gjhmb3ta3czdt7nhimutsk5c ReEncodeFont" <[etbb_c6gjhm.enc <ETbb-Bold.pfb
+ETbb-Bold-lf-swash-ot1 ETbb-Bold "AutoEnc_lolxkkcm4a3fwq36qi7tvqprqd ReEncodeFont" <[etbb_lolxkk.enc <ETbb-Bold.pfb
+ETbb-Bold-lf-swash-t1--base ETbb-Bold "AutoEnc_mgm6reivyglzs2cwtx35q2y4ye ReEncodeFont" <[etbb_mgm6re.enc <ETbb-Bold.pfb
+ETbb-Bold-lf-swash-ly1--base ETbb-Bold "AutoEnc_gtqfg2y4h5nuzq6u24ubertl3h ReEncodeFont" <[etbb_gtqfg2.enc <ETbb-Bold.pfb
+ETbb-Bold-lf-ts1--base ETbb-Bold "AutoEnc_cpixk3kzz7zlit4vgu64uofbpa ReEncodeFont" <[etbb_cpixk3.enc <ETbb-Bold.pfb
+ETbb-Bold-sup-ot1 ETbb-Bold "AutoEnc_ohvjcvc5bqqlbwbvbss6jzvdvg ReEncodeFont" <[etbb_ohvjcv.enc <ETbb-Bold.pfb
+ETbb-Bold-sup-t1--base ETbb-Bold "AutoEnc_3pfdgzsbueyunimviyizcdlq3b ReEncodeFont" <[etbb_3pfdgz.enc <ETbb-Bold.pfb
+ETbb-Bold-sup-ly1--base ETbb-Bold "AutoEnc_atf2m5uqgbwoyyy5ueppslzajb ReEncodeFont" <[etbb_atf2m5.enc <ETbb-Bold.pfb
+ETbb-BoldItalic-dnom-ot1 ETbb-BoldItalic "AutoEnc_h4dyumvfz6ek2rcxjxry72wymd ReEncodeFont" <[etbb_h4dyum.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-dnom-t1--base ETbb-BoldItalic "AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb_w52zjg.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-dnom-ly1--base ETbb-BoldItalic "AutoEnc_yiqwpuq7peloj5eprodwnynevc ReEncodeFont" <[etbb_yiqwpu.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-tlf-ot1 ETbb-BoldItalic "AutoEnc_ihmnlry5rdqsk57rbbszezzogb ReEncodeFont" <[etbb_ihmnlr.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-tlf-t1--base ETbb-BoldItalic "AutoEnc_pvrda3ayd24l2jz24a3yz6f4kd ReEncodeFont" <[etbb_pvrda3.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-tlf-ly1--base ETbb-BoldItalic "AutoEnc_riohwxsior5lnnjjsjpbvpslke ReEncodeFont" <[etbb_riohwx.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-tlf-sc-ot1--base ETbb-BoldItalic "AutoEnc_v2eodfhfoafkknfaq4dvfpm3vf ReEncodeFont" <[etbb_v2eodf.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-tlf-sc-t1--base ETbb-BoldItalic "AutoEnc_hibu6umvrjtqrirvpvs25evi3c ReEncodeFont" <[etbb_hibu6u.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-tlf-sc-ly1--base ETbb-BoldItalic "AutoEnc_gkmjhd3seclagiouwe46zxr2nh ReEncodeFont" <[etbb_gkmjhd.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-tlf-ts1--base ETbb-BoldItalic "AutoEnc_c2mplyudeciwn36qnmuoytwrjf ReEncodeFont" <[etbb_c2mply.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-lf-ot1 ETbb-BoldItalic "AutoEnc_pijcl45xbcrh3ujmxpu2uuufoe ReEncodeFont" <[etbb_pijcl4.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-lf-t1--base ETbb-BoldItalic "AutoEnc_eqc2ac2qcg4bxjlkwezu334h4f ReEncodeFont" <[etbb_eqc2ac.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-lf-ly1--base ETbb-BoldItalic "AutoEnc_j7myehdyrz6gorvvepmwcnbthh ReEncodeFont" <[etbb_j7myeh.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-lf-sc-ot1--base ETbb-BoldItalic "AutoEnc_gtayjyqjbvkxwi76vvo5bz5rsh ReEncodeFont" <[etbb_gtayjy.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-lf-sc-t1--base ETbb-BoldItalic "AutoEnc_x5rskwfdgrpeovvnp5dgzgax7e ReEncodeFont" <[etbb_x5rskw.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-lf-sc-ly1--base ETbb-BoldItalic "AutoEnc_bowihunnspwduw2eofxbzcdp7b ReEncodeFont" <[etbb_bowihu.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-lf-ts1--base ETbb-BoldItalic "AutoEnc_iaohomlitomsjx7jlvx77nhdub ReEncodeFont" <[etbb_iaohom.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-tlf-swash-ot1 ETbb-BoldItalic "AutoEnc_p4wmligvvkue2xskkzbfmabuja ReEncodeFont" <[etbb_p4wmli.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-tlf-swash-t1--base ETbb-BoldItalic "AutoEnc_yzieshsd44fbunydsrfnu5dloe ReEncodeFont" <[etbb_yziesh.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-tlf-swash-ly1--base ETbb-BoldItalic "AutoEnc_v6nho72t4emng74mnbztuynq6f ReEncodeFont" <[etbb_v6nho7.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-tlf-ts1--base ETbb-BoldItalic "AutoEnc_4x2qhbzfqbq2uyy7krhzfopuua ReEncodeFont" <[etbb_4x2qhb.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-osf-ot1 ETbb-BoldItalic "AutoEnc_3li7dqpy2izcpma72gvve2muqf ReEncodeFont" <[etbb_3li7dq.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-osf-t1--base ETbb-BoldItalic "AutoEnc_hah5orya7ruvjmqzsfnwzilfbf ReEncodeFont" <[etbb_hah5or.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-osf-ly1--base ETbb-BoldItalic "AutoEnc_242knmbltpk57lyn3w752okimf ReEncodeFont" <[etbb_242knm.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-osf-sc-ot1--base ETbb-BoldItalic "AutoEnc_dcps7kztgw3wzbkeqywcdknetd ReEncodeFont" <[etbb_dcps7k.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-osf-sc-t1--base ETbb-BoldItalic "AutoEnc_zxy3n5aiatzd3xjlhm2urzyfuc ReEncodeFont" <[etbb_zxy3n5.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-osf-sc-ly1--base ETbb-BoldItalic "AutoEnc_6tax72yid4piwl3l7e6mpqevrf ReEncodeFont" <[etbb_6tax72.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-osf-swash-ot1 ETbb-BoldItalic "AutoEnc_ay4atisik7ffogqasevzhgjvtc ReEncodeFont" <[etbb_ay4ati.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-osf-swash-t1--base ETbb-BoldItalic "AutoEnc_xaqh3v7my6v7plsnnlq32jk5pb ReEncodeFont" <[etbb_xaqh3v.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-osf-swash-ly1--base ETbb-BoldItalic "AutoEnc_cq6xx2fn5plzdjapa525zg3uad ReEncodeFont" <[etbb_cq6xx2.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-osf-ts1--base ETbb-BoldItalic "AutoEnc_xdpthtxgnuplprpqhazm34unne ReEncodeFont" <[etbb_xdptht.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-inf-ot1 ETbb-BoldItalic "AutoEnc_cluc7m4ium2bcpwlcwz2h6yxsd ReEncodeFont" <[etbb_cluc7m.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-inf-t1--base ETbb-BoldItalic "AutoEnc_nnawawhrqtfql6ks2vijrjl4ef ReEncodeFont" <[etbb_nnawaw.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-inf-ly1--base ETbb-BoldItalic "AutoEnc_kvzzr3edrncu7vt2awvffb64cc ReEncodeFont" <[etbb_kvzzr3.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-dnom-ot1 ETbb-BoldItalic "AutoEnc_h4dyumvfz6ek2rcxjxry72wymd ReEncodeFont" <[etbb_h4dyum.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-dnom-t1--base ETbb-BoldItalic "AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb_w52zjg.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-dnom-ly1--base ETbb-BoldItalic "AutoEnc_yiqwpuq7peloj5eprodwnynevc ReEncodeFont" <[etbb_yiqwpu.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-sup-ot1 ETbb-BoldItalic "AutoEnc_ea2dgh24m4p3kft426m6vb5nre ReEncodeFont" <[etbb_ea2dgh.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-sup-t1--base ETbb-BoldItalic "AutoEnc_s2dnn6rj7tbunhbchxk63iytpd ReEncodeFont" <[etbb_s2dnn6.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-sup-ly1--base ETbb-BoldItalic "AutoEnc_7t4ywj5n7dfcy72ielrltqzb7a ReEncodeFont" <[etbb_7t4ywj.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-tosf-ot1 ETbb-BoldItalic "AutoEnc_rt4krokhlnwam4wxhivtc42zod ReEncodeFont" <[etbb_rt4kro.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-tosf-t1--base ETbb-BoldItalic "AutoEnc_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb_3ccbvp.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-tosf-ly1--base ETbb-BoldItalic "AutoEnc_cyyszv3tgoadb7habjipfqte7b ReEncodeFont" <[etbb_cyyszv.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-tosf-sc-ot1--base ETbb-BoldItalic "AutoEnc_un2f5ft3vrvcnpf2fv5j434njb ReEncodeFont" <[etbb_un2f5f.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-tosf-sc-t1--base ETbb-BoldItalic "AutoEnc_5325we5aho44lxbyegll2vl3dc ReEncodeFont" <[etbb_5325we.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-tosf-sc-ly1--base ETbb-BoldItalic "AutoEnc_imedjxssqsfkutdv3rq6n6nujc ReEncodeFont" <[etbb_imedjx.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-tosf-ts1--base ETbb-BoldItalic "AutoEnc_c2mplyudeciwn36qnmuoytwrjf ReEncodeFont" <[etbb_c2mply.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-osf-ot1 ETbb-BoldItalic "AutoEnc_3li7dqpy2izcpma72gvve2muqf ReEncodeFont" <[etbb_3li7dq.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-osf-t1--base ETbb-BoldItalic "AutoEnc_hah5orya7ruvjmqzsfnwzilfbf ReEncodeFont" <[etbb_hah5or.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-osf-ly1--base ETbb-BoldItalic "AutoEnc_242knmbltpk57lyn3w752okimf ReEncodeFont" <[etbb_242knm.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-osf-sc-ot1--base ETbb-BoldItalic "AutoEnc_dcps7kztgw3wzbkeqywcdknetd ReEncodeFont" <[etbb_dcps7k.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-osf-sc-t1--base ETbb-BoldItalic "AutoEnc_zxy3n5aiatzd3xjlhm2urzyfuc ReEncodeFont" <[etbb_zxy3n5.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-osf-sc-ly1--base ETbb-BoldItalic "AutoEnc_6tax72yid4piwl3l7e6mpqevrf ReEncodeFont" <[etbb_6tax72.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-osf-ts1--base ETbb-BoldItalic "AutoEnc_iaohomlitomsjx7jlvx77nhdub ReEncodeFont" <[etbb_iaohom.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-tosf-swash-ot1 ETbb-BoldItalic "AutoEnc_cpb6sdrmtmjdkd4dvmojrwtfyb ReEncodeFont" <[etbb_cpb6sd.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-tosf-swash-t1--base ETbb-BoldItalic "AutoEnc_vtabipmm4e5xag7gq2nwm3p6gc ReEncodeFont" <[etbb_vtabip.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-tosf-swash-ly1--base ETbb-BoldItalic "AutoEnc_skushqlalkfgdo46rxhdwryuge ReEncodeFont" <[etbb_skushq.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-tosf-ts1--base ETbb-BoldItalic "AutoEnc_4x2qhbzfqbq2uyy7krhzfopuua ReEncodeFont" <[etbb_4x2qhb.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-lf-ot1 ETbb-BoldItalic "AutoEnc_pijcl45xbcrh3ujmxpu2uuufoe ReEncodeFont" <[etbb_pijcl4.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-lf-t1--base ETbb-BoldItalic "AutoEnc_eqc2ac2qcg4bxjlkwezu334h4f ReEncodeFont" <[etbb_eqc2ac.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-lf-ly1--base ETbb-BoldItalic "AutoEnc_j7myehdyrz6gorvvepmwcnbthh ReEncodeFont" <[etbb_j7myeh.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-lf-sc-ot1--base ETbb-BoldItalic "AutoEnc_gtayjyqjbvkxwi76vvo5bz5rsh ReEncodeFont" <[etbb_gtayjy.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-lf-sc-t1--base ETbb-BoldItalic "AutoEnc_x5rskwfdgrpeovvnp5dgzgax7e ReEncodeFont" <[etbb_x5rskw.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-lf-sc-ly1--base ETbb-BoldItalic "AutoEnc_bowihunnspwduw2eofxbzcdp7b ReEncodeFont" <[etbb_bowihu.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-lf-swash-ot1 ETbb-BoldItalic "AutoEnc_lolxkkcm4a3fwq36qi7tvqprqd ReEncodeFont" <[etbb_lolxkk.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-lf-swash-t1--base ETbb-BoldItalic "AutoEnc_mgm6reivyglzs2cwtx35q2y4ye ReEncodeFont" <[etbb_mgm6re.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-lf-swash-ly1--base ETbb-BoldItalic "AutoEnc_4hpi45xua3rf7rmnl54bpggxkg ReEncodeFont" <[etbb_4hpi45.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-lf-ts1--base ETbb-BoldItalic "AutoEnc_xdpthtxgnuplprpqhazm34unne ReEncodeFont" <[etbb_xdptht.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-sup-ot1 ETbb-BoldItalic "AutoEnc_ea2dgh24m4p3kft426m6vb5nre ReEncodeFont" <[etbb_ea2dgh.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-sup-t1--base ETbb-BoldItalic "AutoEnc_s2dnn6rj7tbunhbchxk63iytpd ReEncodeFont" <[etbb_s2dnn6.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-sup-ly1--base ETbb-BoldItalic "AutoEnc_7t4ywj5n7dfcy72ielrltqzb7a ReEncodeFont" <[etbb_7t4ywj.enc <ETbb-BoldItalic.pfb
+ETbb-Italic-dnom-ot1 ETbb-Italic "AutoEnc_h4dyumvfz6ek2rcxjxry72wymd ReEncodeFont" <[etbb_h4dyum.enc <ETbb-Italic.pfb
+ETbb-Italic-dnom-t1--base ETbb-Italic "AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb_w52zjg.enc <ETbb-Italic.pfb
+ETbb-Italic-dnom-ly1--base ETbb-Italic "AutoEnc_rzlqzq4dfqtplm3j7w5fz6domf ReEncodeFont" <[etbb_rzlqzq.enc <ETbb-Italic.pfb
 ETbb-Italic-tlf-ot1 ETbb-Italic "AutoEnc_ihmnlry5rdqsk57rbbszezzogb ReEncodeFont" <[etbb_ihmnlr.enc <ETbb-Italic.pfb
 ETbb-Italic-tlf-t1--base ETbb-Italic "AutoEnc_pvrda3ayd24l2jz24a3yz6f4kd ReEncodeFont" <[etbb_pvrda3.enc <ETbb-Italic.pfb
 ETbb-Italic-tlf-ly1--base ETbb-Italic "AutoEnc_i5ezvitppcazvehmki6u25ne3h ReEncodeFont" <[etbb_i5ezvi.enc <ETbb-Italic.pfb
 ETbb-Italic-tlf-sc-ot1--base ETbb-Italic "AutoEnc_3jmjatxposyckyyeodfflfb4zf ReEncodeFont" <[etbb_3jmjat.enc <ETbb-Italic.pfb
 ETbb-Italic-tlf-sc-t1--base ETbb-Italic "AutoEnc_77pqsh35tfbpgcie3v2crjtyef ReEncodeFont" <[etbb_77pqsh.enc <ETbb-Italic.pfb
 ETbb-Italic-tlf-sc-ly1--base ETbb-Italic "AutoEnc_z6brcnoe5prjyyjcyzrsnkxmxe ReEncodeFont" <[etbb_z6brcn.enc <ETbb-Italic.pfb
-ETbb-Italic-tlf-ts1--base ETbb-Italic "AutoEnc_abqwpjn7v3lxf3bxfl2f27q5zd ReEncodeFont" <[etbb_abqwpj.enc <ETbb-Italic.pfb
-ETbb-Italic-lf-ot1 ETbb-Italic "AutoEnc_pijcl45xbcrh3ujmxpu2uuufoe ReEncodeFont" <[etbb_pijcl4.enc <ETbb-Italic.pfb
-ETbb-Italic-lf-t1--base ETbb-Italic "AutoEnc_eqc2ac2qcg4bxjlkwezu334h4f ReEncodeFont" <[etbb_eqc2ac.enc <ETbb-Italic.pfb
-ETbb-Italic-lf-ly1--base ETbb-Italic "AutoEnc_5iolltwrolq7y3af3zfxbxwjhg ReEncodeFont" <[etbb_5iollt.enc <ETbb-Italic.pfb
-ETbb-Italic-lf-sc-ot1--base ETbb-Italic "AutoEnc_ko4auenlxbrvzhbacuekbifdwd ReEncodeFont" <[etbb_ko4aue.enc <ETbb-Italic.pfb
-ETbb-Italic-lf-sc-t1--base ETbb-Italic "AutoEnc_2wngtzno6dnkbgy6u3wuotcora ReEncodeFont" <[etbb_2wngtz.enc <ETbb-Italic.pfb
-ETbb-Italic-lf-sc-ly1--base ETbb-Italic "AutoEnc_f7n52pgkdu3b46yojqf7dkhspc ReEncodeFont" <[etbb_f7n52p.enc <ETbb-Italic.pfb
-ETbb-Italic-lf-ts1--base ETbb-Italic "AutoEnc_i4xjyqywguvmtvyod6rfzcdx6f ReEncodeFont" <[etbb_i4xjyq.enc <ETbb-Italic.pfb
+ETbb-Italic-tlf-swash-ot1 ETbb-Italic "AutoEnc_p4wmligvvkue2xskkzbfmabuja ReEncodeFont" <[etbb_p4wmli.enc <ETbb-Italic.pfb
+ETbb-Italic-tlf-swash-t1--base ETbb-Italic "AutoEnc_yzieshsd44fbunydsrfnu5dloe ReEncodeFont" <[etbb_yziesh.enc <ETbb-Italic.pfb
+ETbb-Italic-tlf-swash-ly1--base ETbb-Italic "AutoEnc_cxbognvjc6orz6vd7e4qkufizg ReEncodeFont" <[etbb_cxbogn.enc <ETbb-Italic.pfb
+ETbb-Italic-tlf-ts1--base ETbb-Italic "AutoEnc_hcre2coaukgjtmccse7rcteipa ReEncodeFont" <[etbb_hcre2c.enc <ETbb-Italic.pfb
+ETbb-Italic-osf-ot1 ETbb-Italic "AutoEnc_3li7dqpy2izcpma72gvve2muqf ReEncodeFont" <[etbb_3li7dq.enc <ETbb-Italic.pfb
+ETbb-Italic-osf-t1--base ETbb-Italic "AutoEnc_hah5orya7ruvjmqzsfnwzilfbf ReEncodeFont" <[etbb_hah5or.enc <ETbb-Italic.pfb
+ETbb-Italic-osf-ly1--base ETbb-Italic "AutoEnc_m5kdwta2ya4v2cpfk2w7yaatjb ReEncodeFont" <[etbb_m5kdwt.enc <ETbb-Italic.pfb
+ETbb-Italic-osf-sc-ot1--base ETbb-Italic "AutoEnc_dz2qg3d3q3x6zjjkul4syetglf ReEncodeFont" <[etbb_dz2qg3.enc <ETbb-Italic.pfb
+ETbb-Italic-osf-sc-t1--base ETbb-Italic "AutoEnc_sp7p3ogzc33lxwuaxiyoy7i63e ReEncodeFont" <[etbb_sp7p3o.enc <ETbb-Italic.pfb
+ETbb-Italic-osf-sc-ly1--base ETbb-Italic "AutoEnc_fue2l2dyo4hhc3efyctqx2ll4c ReEncodeFont" <[etbb_fue2l2.enc <ETbb-Italic.pfb
+ETbb-Italic-osf-swash-ot1 ETbb-Italic "AutoEnc_ay4atisik7ffogqasevzhgjvtc ReEncodeFont" <[etbb_ay4ati.enc <ETbb-Italic.pfb
+ETbb-Italic-osf-swash-t1--base ETbb-Italic "AutoEnc_xaqh3v7my6v7plsnnlq32jk5pb ReEncodeFont" <[etbb_xaqh3v.enc <ETbb-Italic.pfb
+ETbb-Italic-osf-swash-ly1--base ETbb-Italic "AutoEnc_fwcdpht2mk2iigledipz2k5mxb ReEncodeFont" <[etbb_fwcdph.enc <ETbb-Italic.pfb
+ETbb-Italic-osf-ts1--base ETbb-Italic "AutoEnc_kkjcwsqdbeecfyy7hgz5besbsh ReEncodeFont" <[etbb_kkjcws.enc <ETbb-Italic.pfb
 ETbb-Italic-inf-ot1 ETbb-Italic "AutoEnc_cluc7m4ium2bcpwlcwz2h6yxsd ReEncodeFont" <[etbb_cluc7m.enc <ETbb-Italic.pfb
 ETbb-Italic-inf-t1--base ETbb-Italic "AutoEnc_nnawawhrqtfql6ks2vijrjl4ef ReEncodeFont" <[etbb_nnawaw.enc <ETbb-Italic.pfb
 ETbb-Italic-inf-ly1--base ETbb-Italic "AutoEnc_ytzykvcotxef33p6cozlsx4zlh ReEncodeFont" <[etbb_ytzykv.enc <ETbb-Italic.pfb
-ETbb-Italic-dnom-ot1 ETbb-Italic "AutoEnc_h4dyumvfz6ek2rcxjxry72wymd ReEncodeFont" <[etbb_h4dyum.enc <ETbb-Italic.pfb
-ETbb-Italic-dnom-t1--base ETbb-Italic "AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb_w52zjg.enc <ETbb-Italic.pfb
-ETbb-Italic-dnom-ly1--base ETbb-Italic "AutoEnc_rzlqzq4dfqtplm3j7w5fz6domf ReEncodeFont" <[etbb_rzlqzq.enc <ETbb-Italic.pfb
-ETbb-Italic-sup-ot1 ETbb-Italic "AutoEnc_tif2ynv3fdnyajhtthl5l33lxb ReEncodeFont" <[etbb_tif2yn.enc <ETbb-Italic.pfb
-ETbb-Italic-sup-t1--base ETbb-Italic "AutoEnc_yjllohyiapvbznlcedbxnkm3sa ReEncodeFont" <[etbb_yjlloh.enc <ETbb-Italic.pfb
-ETbb-Italic-sup-ly1--base ETbb-Italic "AutoEnc_oynaqbx2tknlw3aeddaeveg26e ReEncodeFont" <[etbb_oynaqb.enc <ETbb-Italic.pfb
 ETbb-Italic-tosf-ot1 ETbb-Italic "AutoEnc_rt4krokhlnwam4wxhivtc42zod ReEncodeFont" <[etbb_rt4kro.enc <ETbb-Italic.pfb
 ETbb-Italic-tosf-t1--base ETbb-Italic "AutoEnc_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb_3ccbvp.enc <ETbb-Italic.pfb
 ETbb-Italic-tosf-ly1--base ETbb-Italic "AutoEnc_xe5wuhzidgbvcpd4udlt7isypc ReEncodeFont" <[etbb_xe5wuh.enc <ETbb-Italic.pfb
 ETbb-Italic-tosf-sc-ot1--base ETbb-Italic "AutoEnc_whnzkzr322c66cgq4nlbs67x7d ReEncodeFont" <[etbb_whnzkz.enc <ETbb-Italic.pfb
 ETbb-Italic-tosf-sc-t1--base ETbb-Italic "AutoEnc_rwec2ltafusdbpjxc5bs7fdg3b ReEncodeFont" <[etbb_rwec2l.enc <ETbb-Italic.pfb
 ETbb-Italic-tosf-sc-ly1--base ETbb-Italic "AutoEnc_qmwyqz2zii3wt5czsrhsmdlqle ReEncodeFont" <[etbb_qmwyqz.enc <ETbb-Italic.pfb
-ETbb-Italic-tosf-ts1--base ETbb-Italic "AutoEnc_abqwpjn7v3lxf3bxfl2f27q5zd ReEncodeFont" <[etbb_abqwpj.enc <ETbb-Italic.pfb
-ETbb-Italic-osf-ot1 ETbb-Italic "AutoEnc_3li7dqpy2izcpma72gvve2muqf ReEncodeFont" <[etbb_3li7dq.enc <ETbb-Italic.pfb
-ETbb-Italic-osf-t1--base ETbb-Italic "AutoEnc_hah5orya7ruvjmqzsfnwzilfbf ReEncodeFont" <[etbb_hah5or.enc <ETbb-Italic.pfb
-ETbb-Italic-osf-ly1--base ETbb-Italic "AutoEnc_m5kdwta2ya4v2cpfk2w7yaatjb ReEncodeFont" <[etbb_m5kdwt.enc <ETbb-Italic.pfb
-ETbb-Italic-osf-sc-ot1--base ETbb-Italic "AutoEnc_dz2qg3d3q3x6zjjkul4syetglf ReEncodeFont" <[etbb_dz2qg3.enc <ETbb-Italic.pfb
-ETbb-Italic-osf-sc-t1--base ETbb-Italic "AutoEnc_sp7p3ogzc33lxwuaxiyoy7i63e ReEncodeFont" <[etbb_sp7p3o.enc <ETbb-Italic.pfb
-ETbb-Italic-osf-sc-ly1--base ETbb-Italic "AutoEnc_fue2l2dyo4hhc3efyctqx2ll4c ReEncodeFont" <[etbb_fue2l2.enc <ETbb-Italic.pfb
-ETbb-Italic-osf-ts1--base ETbb-Italic "AutoEnc_i4xjyqywguvmtvyod6rfzcdx6f ReEncodeFont" <[etbb_i4xjyq.enc <ETbb-Italic.pfb
+ETbb-Italic-tosf-swash-ot1 ETbb-Italic "AutoEnc_cpb6sdrmtmjdkd4dvmojrwtfyb ReEncodeFont" <[etbb_cpb6sd.enc <ETbb-Italic.pfb
+ETbb-Italic-tosf-swash-t1--base ETbb-Italic "AutoEnc_vtabipmm4e5xag7gq2nwm3p6gc ReEncodeFont" <[etbb_vtabip.enc <ETbb-Italic.pfb
+ETbb-Italic-tosf-swash-ly1--base ETbb-Italic "AutoEnc_tbmtgoznr33jpt6iokvjfw4jnd ReEncodeFont" <[etbb_tbmtgo.enc <ETbb-Italic.pfb
+ETbb-Italic-tosf-ts1--base ETbb-Italic "AutoEnc_hcre2coaukgjtmccse7rcteipa ReEncodeFont" <[etbb_hcre2c.enc <ETbb-Italic.pfb
+ETbb-Italic-lf-ot1 ETbb-Italic "AutoEnc_pijcl45xbcrh3ujmxpu2uuufoe ReEncodeFont" <[etbb_pijcl4.enc <ETbb-Italic.pfb
+ETbb-Italic-lf-t1--base ETbb-Italic "AutoEnc_eqc2ac2qcg4bxjlkwezu334h4f ReEncodeFont" <[etbb_eqc2ac.enc <ETbb-Italic.pfb
+ETbb-Italic-lf-ly1--base ETbb-Italic "AutoEnc_5iolltwrolq7y3af3zfxbxwjhg ReEncodeFont" <[etbb_5iollt.enc <ETbb-Italic.pfb
+ETbb-Italic-lf-sc-ot1--base ETbb-Italic "AutoEnc_ko4auenlxbrvzhbacuekbifdwd ReEncodeFont" <[etbb_ko4aue.enc <ETbb-Italic.pfb
+ETbb-Italic-lf-sc-t1--base ETbb-Italic "AutoEnc_2wngtzno6dnkbgy6u3wuotcora ReEncodeFont" <[etbb_2wngtz.enc <ETbb-Italic.pfb
+ETbb-Italic-lf-sc-ly1--base ETbb-Italic "AutoEnc_f7n52pgkdu3b46yojqf7dkhspc ReEncodeFont" <[etbb_f7n52p.enc <ETbb-Italic.pfb
+ETbb-Italic-lf-swash-ot1 ETbb-Italic "AutoEnc_lolxkkcm4a3fwq36qi7tvqprqd ReEncodeFont" <[etbb_lolxkk.enc <ETbb-Italic.pfb
+ETbb-Italic-lf-swash-t1--base ETbb-Italic "AutoEnc_mgm6reivyglzs2cwtx35q2y4ye ReEncodeFont" <[etbb_mgm6re.enc <ETbb-Italic.pfb
+ETbb-Italic-lf-swash-ly1--base ETbb-Italic "AutoEnc_f55mslfj4hkccrqglfkn6satdb ReEncodeFont" <[etbb_f55msl.enc <ETbb-Italic.pfb
+ETbb-Italic-lf-ts1--base ETbb-Italic "AutoEnc_kkjcwsqdbeecfyy7hgz5besbsh ReEncodeFont" <[etbb_kkjcws.enc <ETbb-Italic.pfb
+ETbb-Italic-sup-ot1 ETbb-Italic "AutoEnc_tif2ynv3fdnyajhtthl5l33lxb ReEncodeFont" <[etbb_tif2yn.enc <ETbb-Italic.pfb
+ETbb-Italic-sup-t1--base ETbb-Italic "AutoEnc_yjllohyiapvbznlcedbxnkm3sa ReEncodeFont" <[etbb_yjlloh.enc <ETbb-Italic.pfb
+ETbb-Italic-sup-ly1--base ETbb-Italic "AutoEnc_oynaqbx2tknlw3aeddaeveg26e ReEncodeFont" <[etbb_oynaqb.enc <ETbb-Italic.pfb
+ETbb-Regular-dnom-ot1 ETbb-Regular "AutoEnc_uoncjtwnmhcjmejtj3u7v6bsxh ReEncodeFont" <[etbb_uoncjt.enc <ETbb-Regular.pfb
+ETbb-Regular-dnom-t1--base ETbb-Regular "AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb_w52zjg.enc <ETbb-Regular.pfb
+ETbb-Regular-dnom-ly1--base ETbb-Regular "AutoEnc_mpvq56haezsrrjg72prw5fumwf ReEncodeFont" <[etbb_mpvq56.enc <ETbb-Regular.pfb
 ETbb-Regular-tlf-ot1 ETbb-Regular "AutoEnc_e3m4fzaal3fm6lwih762ck4hoh ReEncodeFont" <[etbb_e3m4fz.enc <ETbb-Regular.pfb
 ETbb-Regular-tlf-t1--base ETbb-Regular "AutoEnc_pvrda3ayd24l2jz24a3yz6f4kd ReEncodeFont" <[etbb_pvrda3.enc <ETbb-Regular.pfb
 ETbb-Regular-tlf-ly1--base ETbb-Regular "AutoEnc_elsw3hdxi5xivsxqghfqivctad ReEncodeFont" <[etbb_elsw3h.enc <ETbb-Regular.pfb
 ETbb-Regular-tlf-sc-ot1--base ETbb-Regular "AutoEnc_vmkycpf7ajyvncqs3krblmkupe ReEncodeFont" <[etbb_vmkycp.enc <ETbb-Regular.pfb
 ETbb-Regular-tlf-sc-t1--base ETbb-Regular "AutoEnc_77pqsh35tfbpgcie3v2crjtyef ReEncodeFont" <[etbb_77pqsh.enc <ETbb-Regular.pfb
 ETbb-Regular-tlf-sc-ly1--base ETbb-Regular "AutoEnc_lchj55yasnnqx5ykwctrzateoh ReEncodeFont" <[etbb_lchj55.enc <ETbb-Regular.pfb
-ETbb-Regular-tlf-ts1--base ETbb-Regular "AutoEnc_nmcbzq4sgpjqihlgrfjsupvbaf ReEncodeFont" <[etbb_nmcbzq.enc <ETbb-Regular.pfb
-ETbb-Regular-lf-ot1 ETbb-Regular "AutoEnc_qqjyrebwkze4pfxo72toftkebf ReEncodeFont" <[etbb_qqjyre.enc <ETbb-Regular.pfb
-ETbb-Regular-lf-t1--base ETbb-Regular "AutoEnc_eqc2ac2qcg4bxjlkwezu334h4f ReEncodeFont" <[etbb_eqc2ac.enc <ETbb-Regular.pfb
-ETbb-Regular-lf-ly1--base ETbb-Regular "AutoEnc_ohc25e7nugkq5uftwleqtlzhic ReEncodeFont" <[etbb_ohc25e.enc <ETbb-Regular.pfb
-ETbb-Regular-lf-sc-ot1--base ETbb-Regular "AutoEnc_5cjnk55s6lighj2fknbv2zorpf ReEncodeFont" <[etbb_5cjnk5.enc <ETbb-Regular.pfb
-ETbb-Regular-lf-sc-t1--base ETbb-Regular "AutoEnc_2wngtzno6dnkbgy6u3wuotcora ReEncodeFont" <[etbb_2wngtz.enc <ETbb-Regular.pfb
-ETbb-Regular-lf-sc-ly1--base ETbb-Regular "AutoEnc_cuqhrji6wzmpdmxr5b7kf5n6ha ReEncodeFont" <[etbb_cuqhrj.enc <ETbb-Regular.pfb
-ETbb-Regular-lf-ts1--base ETbb-Regular "AutoEnc_2mysj3r5ge4vrkh7fk26pe4rbd ReEncodeFont" <[etbb_2mysj3.enc <ETbb-Regular.pfb
+ETbb-Regular-tlf-swash-ot1 ETbb-Regular "AutoEnc_ydcfbcl5ljqkibbzqu2uvlk5mh ReEncodeFont" <[etbb_ydcfbc.enc <ETbb-Regular.pfb
+ETbb-Regular-tlf-swash-t1--base ETbb-Regular "AutoEnc_yzieshsd44fbunydsrfnu5dloe ReEncodeFont" <[etbb_yziesh.enc <ETbb-Regular.pfb
+ETbb-Regular-tlf-swash-ly1--base ETbb-Regular "AutoEnc_fpvlkwpxsrxluug5fok7c7hwmg ReEncodeFont" <[etbb_fpvlkw.enc <ETbb-Regular.pfb
+ETbb-Regular-tlf-ts1--base ETbb-Regular "AutoEnc_lfrz6wrssnt2zjyix45pqgahrd ReEncodeFont" <[etbb_lfrz6w.enc <ETbb-Regular.pfb
+ETbb-Regular-osf-ot1 ETbb-Regular "AutoEnc_r34xpuqbjubisgsjxlr74lrpqd ReEncodeFont" <[etbb_r34xpu.enc <ETbb-Regular.pfb
+ETbb-Regular-osf-t1--base ETbb-Regular "AutoEnc_hah5orya7ruvjmqzsfnwzilfbf ReEncodeFont" <[etbb_hah5or.enc <ETbb-Regular.pfb
+ETbb-Regular-osf-ly1--base ETbb-Regular "AutoEnc_33mftda5zpj2atc2k5o52aguyh ReEncodeFont" <[etbb_33mftd.enc <ETbb-Regular.pfb
+ETbb-Regular-osf-sc-ot1--base ETbb-Regular "AutoEnc_yhvmm4p7ob5occ6mmnesxbgljh ReEncodeFont" <[etbb_yhvmm4.enc <ETbb-Regular.pfb
+ETbb-Regular-osf-sc-t1--base ETbb-Regular "AutoEnc_sp7p3ogzc33lxwuaxiyoy7i63e ReEncodeFont" <[etbb_sp7p3o.enc <ETbb-Regular.pfb
+ETbb-Regular-osf-sc-ly1--base ETbb-Regular "AutoEnc_yzujze46wjghaaaz6ede3o5zpg ReEncodeFont" <[etbb_yzujze.enc <ETbb-Regular.pfb
+ETbb-Regular-osf-swash-ot1 ETbb-Regular "AutoEnc_ujmsnd4wrjk5td66f5dpjczund ReEncodeFont" <[etbb_ujmsnd.enc <ETbb-Regular.pfb
+ETbb-Regular-osf-swash-t1--base ETbb-Regular "AutoEnc_xaqh3v7my6v7plsnnlq32jk5pb ReEncodeFont" <[etbb_xaqh3v.enc <ETbb-Regular.pfb
+ETbb-Regular-osf-swash-ly1--base ETbb-Regular "AutoEnc_zpkt7yo2662luadsq46ip6qshh ReEncodeFont" <[etbb_zpkt7y.enc <ETbb-Regular.pfb
+ETbb-Regular-osf-ts1--base ETbb-Regular "AutoEnc_chsevodrrrotdjwzaqukesefqe ReEncodeFont" <[etbb_chsevo.enc <ETbb-Regular.pfb
 ETbb-Regular-inf-ot1 ETbb-Regular "AutoEnc_ftphfyliafmvcwfqlg66apswmh ReEncodeFont" <[etbb_ftphfy.enc <ETbb-Regular.pfb
 ETbb-Regular-inf-t1--base ETbb-Regular "AutoEnc_behrx3e73zcxs6ypih5z3jwzfc ReEncodeFont" <[etbb_behrx3.enc <ETbb-Regular.pfb
 ETbb-Regular-inf-ly1--base ETbb-Regular "AutoEnc_4sxvu4thduhlpavew6yzmuysdd ReEncodeFont" <[etbb_4sxvu4.enc <ETbb-Regular.pfb
-ETbb-Regular-dnom-ot1 ETbb-Regular "AutoEnc_uoncjtwnmhcjmejtj3u7v6bsxh ReEncodeFont" <[etbb_uoncjt.enc <ETbb-Regular.pfb
-ETbb-Regular-dnom-t1--base ETbb-Regular "AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb_w52zjg.enc <ETbb-Regular.pfb
-ETbb-Regular-dnom-ly1--base ETbb-Regular "AutoEnc_mpvq56haezsrrjg72prw5fumwf ReEncodeFont" <[etbb_mpvq56.enc <ETbb-Regular.pfb
-ETbb-Regular-sup-ot1 ETbb-Regular "AutoEnc_dep6cdmobxdewjybmud7kefdcf ReEncodeFont" <[etbb_dep6cd.enc <ETbb-Regular.pfb
-ETbb-Regular-sup-t1--base ETbb-Regular "AutoEnc_sk3nrpgzyacs2cd4rfqahjbzdc ReEncodeFont" <[etbb_sk3nrp.enc <ETbb-Regular.pfb
-ETbb-Regular-sup-ly1--base ETbb-Regular "AutoEnc_7pzsmkr2zp4z2jzsqyz5xypura ReEncodeFont" <[etbb_7pzsmk.enc <ETbb-Regular.pfb
 ETbb-Regular-tosf-ot1 ETbb-Regular "AutoEnc_nfh2owxdg6o6hn6aumhzqgw4xe ReEncodeFont" <[etbb_nfh2ow.enc <ETbb-Regular.pfb
 ETbb-Regular-tosf-t1--base ETbb-Regular "AutoEnc_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb_3ccbvp.enc <ETbb-Regular.pfb
 ETbb-Regular-tosf-ly1--base ETbb-Regular "AutoEnc_ybjyd4l7q3pzoonr2vgt7y7cye ReEncodeFont" <[etbb_ybjyd4.enc <ETbb-Regular.pfb
 ETbb-Regular-tosf-sc-ot1--base ETbb-Regular "AutoEnc_na6tk5osakq2zemkf5qfxhpzie ReEncodeFont" <[etbb_na6tk5.enc <ETbb-Regular.pfb
 ETbb-Regular-tosf-sc-t1--base ETbb-Regular "AutoEnc_rwec2ltafusdbpjxc5bs7fdg3b ReEncodeFont" <[etbb_rwec2l.enc <ETbb-Regular.pfb
 ETbb-Regular-tosf-sc-ly1--base ETbb-Regular "AutoEnc_22apnozoce6wprtbuf6ihvsd5b ReEncodeFont" <[etbb_22apno.enc <ETbb-Regular.pfb
-ETbb-Regular-tosf-ts1--base ETbb-Regular "AutoEnc_nmcbzq4sgpjqihlgrfjsupvbaf ReEncodeFont" <[etbb_nmcbzq.enc <ETbb-Regular.pfb
-ETbb-Regular-osf-ot1 ETbb-Regular "AutoEnc_r34xpuqbjubisgsjxlr74lrpqd ReEncodeFont" <[etbb_r34xpu.enc <ETbb-Regular.pfb
-ETbb-Regular-osf-t1--base ETbb-Regular "AutoEnc_hah5orya7ruvjmqzsfnwzilfbf ReEncodeFont" <[etbb_hah5or.enc <ETbb-Regular.pfb
-ETbb-Regular-osf-ly1--base ETbb-Regular "AutoEnc_33mftda5zpj2atc2k5o52aguyh ReEncodeFont" <[etbb_33mftd.enc <ETbb-Regular.pfb
-ETbb-Regular-osf-sc-ot1--base ETbb-Regular "AutoEnc_yhvmm4p7ob5occ6mmnesxbgljh ReEncodeFont" <[etbb_yhvmm4.enc <ETbb-Regular.pfb
-ETbb-Regular-osf-sc-t1--base ETbb-Regular "AutoEnc_sp7p3ogzc33lxwuaxiyoy7i63e ReEncodeFont" <[etbb_sp7p3o.enc <ETbb-Regular.pfb
-ETbb-Regular-osf-sc-ly1--base ETbb-Regular "AutoEnc_yzujze46wjghaaaz6ede3o5zpg ReEncodeFont" <[etbb_yzujze.enc <ETbb-Regular.pfb
-ETbb-Regular-osf-ts1--base ETbb-Regular "AutoEnc_2mysj3r5ge4vrkh7fk26pe4rbd ReEncodeFont" <[etbb_2mysj3.enc <ETbb-Regular.pfb
+ETbb-Regular-tosf-swash-ot1 ETbb-Regular "AutoEnc_4qfaj2fkf6gpmcsvmpnfqrb6ib ReEncodeFont" <[etbb_4qfaj2.enc <ETbb-Regular.pfb
+ETbb-Regular-tosf-swash-t1--base ETbb-Regular "AutoEnc_vtabipmm4e5xag7gq2nwm3p6gc ReEncodeFont" <[etbb_vtabip.enc <ETbb-Regular.pfb
+ETbb-Regular-tosf-swash-ly1--base ETbb-Regular "AutoEnc_xmn5etwdfamaoydl5hgcpvzzmh ReEncodeFont" <[etbb_xmn5et.enc <ETbb-Regular.pfb
+ETbb-Regular-tosf-ts1--base ETbb-Regular "AutoEnc_lfrz6wrssnt2zjyix45pqgahrd ReEncodeFont" <[etbb_lfrz6w.enc <ETbb-Regular.pfb
+ETbb-Regular-lf-ot1 ETbb-Regular "AutoEnc_qqjyrebwkze4pfxo72toftkebf ReEncodeFont" <[etbb_qqjyre.enc <ETbb-Regular.pfb
+ETbb-Regular-lf-t1--base ETbb-Regular "AutoEnc_eqc2ac2qcg4bxjlkwezu334h4f ReEncodeFont" <[etbb_eqc2ac.enc <ETbb-Regular.pfb
+ETbb-Regular-lf-ly1--base ETbb-Regular "AutoEnc_ohc25e7nugkq5uftwleqtlzhic ReEncodeFont" <[etbb_ohc25e.enc <ETbb-Regular.pfb
+ETbb-Regular-lf-sc-ot1--base ETbb-Regular "AutoEnc_5cjnk55s6lighj2fknbv2zorpf ReEncodeFont" <[etbb_5cjnk5.enc <ETbb-Regular.pfb
+ETbb-Regular-lf-sc-t1--base ETbb-Regular "AutoEnc_2wngtzno6dnkbgy6u3wuotcora ReEncodeFont" <[etbb_2wngtz.enc <ETbb-Regular.pfb
+ETbb-Regular-lf-sc-ly1--base ETbb-Regular "AutoEnc_cuqhrji6wzmpdmxr5b7kf5n6ha ReEncodeFont" <[etbb_cuqhrj.enc <ETbb-Regular.pfb
+ETbb-Regular-lf-swash-ot1 ETbb-Regular "AutoEnc_wplashkp5h2u4lgwljah7kwuab ReEncodeFont" <[etbb_wplash.enc <ETbb-Regular.pfb
+ETbb-Regular-lf-swash-t1--base ETbb-Regular "AutoEnc_mgm6reivyglzs2cwtx35q2y4ye ReEncodeFont" <[etbb_mgm6re.enc <ETbb-Regular.pfb
+ETbb-Regular-lf-swash-ly1--base ETbb-Regular "AutoEnc_gtqfg2y4h5nuzq6u24ubertl3h ReEncodeFont" <[etbb_gtqfg2.enc <ETbb-Regular.pfb
+ETbb-Regular-lf-ts1--base ETbb-Regular "AutoEnc_chsevodrrrotdjwzaqukesefqe ReEncodeFont" <[etbb_chsevo.enc <ETbb-Regular.pfb
+ETbb-Regular-sup-ot1 ETbb-Regular "AutoEnc_dep6cdmobxdewjybmud7kefdcf ReEncodeFont" <[etbb_dep6cd.enc <ETbb-Regular.pfb
+ETbb-Regular-sup-t1--base ETbb-Regular "AutoEnc_sk3nrpgzyacs2cd4rfqahjbzdc ReEncodeFont" <[etbb_sk3nrp.enc <ETbb-Regular.pfb
+ETbb-Regular-sup-ly1--base ETbb-Regular "AutoEnc_7pzsmkr2zp4z2jzsqyz5xypura ReEncodeFont" <[etbb_7pzsmk.enc <ETbb-Regular.pfb
+Etbb1-Bold-dnom-t1--base ETbb-Bold "AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb1_w52zjg.enc <ETbb-Bold.pfb
 Etbb1-Bold-tlf-t1--base ETbb-Bold "AutoEnc1_pvrda3ayd24l2jz24a3yz6f4kd ReEncodeFont" <[etbb1_pvrda3.enc <ETbb-Bold.pfb
 Etbb1-Bold-tlf-sc-t1--base ETbb-Bold "AutoEnc1_hibu6umvrjtqrirvpvs25evi3c ReEncodeFont" <[etbb1_hibu6u.enc <ETbb-Bold.pfb
-Etbb1-Bold-lf-t1--base ETbb-Bold "AutoEnc1_eqc2ac2qcg4bxjlkwezu334h4f ReEncodeFont" <[etbb1_eqc2ac.enc <ETbb-Bold.pfb
-Etbb1-Bold-lf-sc-t1--base ETbb-Bold "AutoEnc1_x5rskwfdgrpeovvnp5dgzgax7e ReEncodeFont" <[etbb1_x5rskw.enc <ETbb-Bold.pfb
-Etbb1-Bold-dnom-t1--base ETbb-Bold "AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb1_w52zjg.enc <ETbb-Bold.pfb
-Etbb1-Bold-tosf-t1--base ETbb-Bold "AutoEnc1_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb1_3ccbvp.enc <ETbb-Bold.pfb
-Etbb1-Bold-tosf-sc-t1--base ETbb-Bold "AutoEnc1_5325we5aho44lxbyegll2vl3dc ReEncodeFont" <[etbb1_5325we.enc <ETbb-Bold.pfb
+Etbb1-Bold-tlf-swash-t1--base ETbb-Bold "AutoEnc1_yzieshsd44fbunydsrfnu5dloe ReEncodeFont" <[etbb1_yziesh.enc <ETbb-Bold.pfb
 Etbb1-Bold-osf-t1--base ETbb-Bold "AutoEnc1_hah5orya7ruvjmqzsfnwzilfbf ReEncodeFont" <[etbb1_hah5or.enc <ETbb-Bold.pfb
 Etbb1-Bold-osf-sc-t1--base ETbb-Bold "AutoEnc1_zxy3n5aiatzd3xjlhm2urzyfuc ReEncodeFont" <[etbb1_zxy3n5.enc <ETbb-Bold.pfb
+Etbb1-Bold-osf-swash-t1--base ETbb-Bold "AutoEnc1_xaqh3v7my6v7plsnnlq32jk5pb ReEncodeFont" <[etbb1_xaqh3v.enc <ETbb-Bold.pfb
+Etbb1-Bold-tosf-t1--base ETbb-Bold "AutoEnc1_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb1_3ccbvp.enc <ETbb-Bold.pfb
+Etbb1-Bold-tosf-sc-t1--base ETbb-Bold "AutoEnc1_5325we5aho44lxbyegll2vl3dc ReEncodeFont" <[etbb1_5325we.enc <ETbb-Bold.pfb
+Etbb1-Bold-tosf-swash-t1--base ETbb-Bold "AutoEnc1_vtabipmm4e5xag7gq2nwm3p6gc ReEncodeFont" <[etbb1_vtabip.enc <ETbb-Bold.pfb
+Etbb1-Bold-lf-t1--base ETbb-Bold "AutoEnc1_eqc2ac2qcg4bxjlkwezu334h4f ReEncodeFont" <[etbb1_eqc2ac.enc <ETbb-Bold.pfb
+Etbb1-Bold-lf-sc-t1--base ETbb-Bold "AutoEnc1_x5rskwfdgrpeovvnp5dgzgax7e ReEncodeFont" <[etbb1_x5rskw.enc <ETbb-Bold.pfb
+Etbb1-Bold-lf-swash-t1--base ETbb-Bold "AutoEnc1_mgm6reivyglzs2cwtx35q2y4ye ReEncodeFont" <[etbb1_mgm6re.enc <ETbb-Bold.pfb
+Etbb1-BoldItalic-dnom-t1--base ETbb-BoldItalic "AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb1_w52zjg.enc <ETbb-BoldItalic.pfb
 Etbb1-BoldItalic-tlf-t1--base ETbb-BoldItalic "AutoEnc1_pvrda3ayd24l2jz24a3yz6f4kd ReEncodeFont" <[etbb1_pvrda3.enc <ETbb-BoldItalic.pfb
 Etbb1-BoldItalic-tlf-sc-t1--base ETbb-BoldItalic "AutoEnc1_hibu6umvrjtqrirvpvs25evi3c ReEncodeFont" <[etbb1_hibu6u.enc <ETbb-BoldItalic.pfb
-Etbb1-BoldItalic-lf-t1--base ETbb-BoldItalic "AutoEnc1_eqc2ac2qcg4bxjlkwezu334h4f ReEncodeFont" <[etbb1_eqc2ac.enc <ETbb-BoldItalic.pfb
-Etbb1-BoldItalic-lf-sc-t1--base ETbb-BoldItalic "AutoEnc1_x5rskwfdgrpeovvnp5dgzgax7e ReEncodeFont" <[etbb1_x5rskw.enc <ETbb-BoldItalic.pfb
-Etbb1-BoldItalic-dnom-t1--base ETbb-BoldItalic "AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb1_w52zjg.enc <ETbb-BoldItalic.pfb
-Etbb1-BoldItalic-tosf-t1--base ETbb-BoldItalic "AutoEnc1_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb1_3ccbvp.enc <ETbb-BoldItalic.pfb
-Etbb1-BoldItalic-tosf-sc-t1--base ETbb-BoldItalic "AutoEnc1_5325we5aho44lxbyegll2vl3dc ReEncodeFont" <[etbb1_5325we.enc <ETbb-BoldItalic.pfb
+Etbb1-BoldItalic-tlf-swash-t1--base ETbb-BoldItalic "AutoEnc1_yzieshsd44fbunydsrfnu5dloe ReEncodeFont" <[etbb1_yziesh.enc <ETbb-BoldItalic.pfb
 Etbb1-BoldItalic-osf-t1--base ETbb-BoldItalic "AutoEnc1_hah5orya7ruvjmqzsfnwzilfbf ReEncodeFont" <[etbb1_hah5or.enc <ETbb-BoldItalic.pfb
 Etbb1-BoldItalic-osf-sc-t1--base ETbb-BoldItalic "AutoEnc1_zxy3n5aiatzd3xjlhm2urzyfuc ReEncodeFont" <[etbb1_zxy3n5.enc <ETbb-BoldItalic.pfb
+Etbb1-BoldItalic-osf-swash-t1--base ETbb-BoldItalic "AutoEnc1_xaqh3v7my6v7plsnnlq32jk5pb ReEncodeFont" <[etbb1_xaqh3v.enc <ETbb-BoldItalic.pfb
+Etbb1-BoldItalic-tosf-t1--base ETbb-BoldItalic "AutoEnc1_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb1_3ccbvp.enc <ETbb-BoldItalic.pfb
+Etbb1-BoldItalic-tosf-sc-t1--base ETbb-BoldItalic "AutoEnc1_5325we5aho44lxbyegll2vl3dc ReEncodeFont" <[etbb1_5325we.enc <ETbb-BoldItalic.pfb
+Etbb1-BoldItalic-tosf-swash-t1--base ETbb-BoldItalic "AutoEnc1_vtabipmm4e5xag7gq2nwm3p6gc ReEncodeFont" <[etbb1_vtabip.enc <ETbb-BoldItalic.pfb
+Etbb1-BoldItalic-lf-t1--base ETbb-BoldItalic "AutoEnc1_eqc2ac2qcg4bxjlkwezu334h4f ReEncodeFont" <[etbb1_eqc2ac.enc <ETbb-BoldItalic.pfb
+Etbb1-BoldItalic-lf-sc-t1--base ETbb-BoldItalic "AutoEnc1_x5rskwfdgrpeovvnp5dgzgax7e ReEncodeFont" <[etbb1_x5rskw.enc <ETbb-BoldItalic.pfb
+Etbb1-BoldItalic-lf-swash-t1--base ETbb-BoldItalic "AutoEnc1_mgm6reivyglzs2cwtx35q2y4ye ReEncodeFont" <[etbb1_mgm6re.enc <ETbb-BoldItalic.pfb
+Etbb1-Italic-dnom-t1--base ETbb-Italic "AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb1_w52zjg.enc <ETbb-Italic.pfb
 Etbb1-Italic-tlf-t1--base ETbb-Italic "AutoEnc1_pvrda3ayd24l2jz24a3yz6f4kd ReEncodeFont" <[etbb1_pvrda3.enc <ETbb-Italic.pfb
 Etbb1-Italic-tlf-sc-t1--base ETbb-Italic "AutoEnc1_77pqsh35tfbpgcie3v2crjtyef ReEncodeFont" <[etbb1_77pqsh.enc <ETbb-Italic.pfb
-Etbb1-Italic-lf-t1--base ETbb-Italic "AutoEnc1_eqc2ac2qcg4bxjlkwezu334h4f ReEncodeFont" <[etbb1_eqc2ac.enc <ETbb-Italic.pfb
-Etbb1-Italic-lf-sc-t1--base ETbb-Italic "AutoEnc1_2wngtzno6dnkbgy6u3wuotcora ReEncodeFont" <[etbb1_2wngtz.enc <ETbb-Italic.pfb
-Etbb1-Italic-dnom-t1--base ETbb-Italic "AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb1_w52zjg.enc <ETbb-Italic.pfb
-Etbb1-Italic-tosf-t1--base ETbb-Italic "AutoEnc1_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb1_3ccbvp.enc <ETbb-Italic.pfb
-Etbb1-Italic-tosf-sc-t1--base ETbb-Italic "AutoEnc1_rwec2ltafusdbpjxc5bs7fdg3b ReEncodeFont" <[etbb1_rwec2l.enc <ETbb-Italic.pfb
+Etbb1-Italic-tlf-swash-t1--base ETbb-Italic "AutoEnc1_yzieshsd44fbunydsrfnu5dloe ReEncodeFont" <[etbb1_yziesh.enc <ETbb-Italic.pfb
 Etbb1-Italic-osf-t1--base ETbb-Italic "AutoEnc1_hah5orya7ruvjmqzsfnwzilfbf ReEncodeFont" <[etbb1_hah5or.enc <ETbb-Italic.pfb
 Etbb1-Italic-osf-sc-t1--base ETbb-Italic "AutoEnc1_sp7p3ogzc33lxwuaxiyoy7i63e ReEncodeFont" <[etbb1_sp7p3o.enc <ETbb-Italic.pfb
+Etbb1-Italic-osf-swash-t1--base ETbb-Italic "AutoEnc1_xaqh3v7my6v7plsnnlq32jk5pb ReEncodeFont" <[etbb1_xaqh3v.enc <ETbb-Italic.pfb
+Etbb1-Italic-tosf-t1--base ETbb-Italic "AutoEnc1_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb1_3ccbvp.enc <ETbb-Italic.pfb
+Etbb1-Italic-tosf-sc-t1--base ETbb-Italic "AutoEnc1_rwec2ltafusdbpjxc5bs7fdg3b ReEncodeFont" <[etbb1_rwec2l.enc <ETbb-Italic.pfb
+Etbb1-Italic-tosf-swash-t1--base ETbb-Italic "AutoEnc1_vtabipmm4e5xag7gq2nwm3p6gc ReEncodeFont" <[etbb1_vtabip.enc <ETbb-Italic.pfb
+Etbb1-Italic-lf-t1--base ETbb-Italic "AutoEnc1_eqc2ac2qcg4bxjlkwezu334h4f ReEncodeFont" <[etbb1_eqc2ac.enc <ETbb-Italic.pfb
+Etbb1-Italic-lf-sc-t1--base ETbb-Italic "AutoEnc1_2wngtzno6dnkbgy6u3wuotcora ReEncodeFont" <[etbb1_2wngtz.enc <ETbb-Italic.pfb
+Etbb1-Italic-lf-swash-t1--base ETbb-Italic "AutoEnc1_mgm6reivyglzs2cwtx35q2y4ye ReEncodeFont" <[etbb1_mgm6re.enc <ETbb-Italic.pfb
+Etbb1-Regular-dnom-t1--base ETbb-Regular "AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb1_w52zjg.enc <ETbb-Regular.pfb
 Etbb1-Regular-tlf-t1--base ETbb-Regular "AutoEnc1_pvrda3ayd24l2jz24a3yz6f4kd ReEncodeFont" <[etbb1_pvrda3.enc <ETbb-Regular.pfb
 Etbb1-Regular-tlf-sc-t1--base ETbb-Regular "AutoEnc1_77pqsh35tfbpgcie3v2crjtyef ReEncodeFont" <[etbb1_77pqsh.enc <ETbb-Regular.pfb
-Etbb1-Regular-lf-t1--base ETbb-Regular "AutoEnc1_eqc2ac2qcg4bxjlkwezu334h4f ReEncodeFont" <[etbb1_eqc2ac.enc <ETbb-Regular.pfb
-Etbb1-Regular-lf-sc-t1--base ETbb-Regular "AutoEnc1_2wngtzno6dnkbgy6u3wuotcora ReEncodeFont" <[etbb1_2wngtz.enc <ETbb-Regular.pfb
-Etbb1-Regular-dnom-t1--base ETbb-Regular "AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb1_w52zjg.enc <ETbb-Regular.pfb
-Etbb1-Regular-tosf-t1--base ETbb-Regular "AutoEnc1_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb1_3ccbvp.enc <ETbb-Regular.pfb
-Etbb1-Regular-tosf-sc-t1--base ETbb-Regular "AutoEnc1_rwec2ltafusdbpjxc5bs7fdg3b ReEncodeFont" <[etbb1_rwec2l.enc <ETbb-Regular.pfb
+Etbb1-Regular-tlf-swash-t1--base ETbb-Regular "AutoEnc1_yzieshsd44fbunydsrfnu5dloe ReEncodeFont" <[etbb1_yziesh.enc <ETbb-Regular.pfb
 Etbb1-Regular-osf-t1--base ETbb-Regular "AutoEnc1_hah5orya7ruvjmqzsfnwzilfbf ReEncodeFont" <[etbb1_hah5or.enc <ETbb-Regular.pfb
 Etbb1-Regular-osf-sc-t1--base ETbb-Regular "AutoEnc1_sp7p3ogzc33lxwuaxiyoy7i63e ReEncodeFont" <[etbb1_sp7p3o.enc <ETbb-Regular.pfb
+Etbb1-Regular-osf-swash-t1--base ETbb-Regular "AutoEnc1_xaqh3v7my6v7plsnnlq32jk5pb ReEncodeFont" <[etbb1_xaqh3v.enc <ETbb-Regular.pfb
+Etbb1-Regular-tosf-t1--base ETbb-Regular "AutoEnc1_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb1_3ccbvp.enc <ETbb-Regular.pfb
+Etbb1-Regular-tosf-sc-t1--base ETbb-Regular "AutoEnc1_rwec2ltafusdbpjxc5bs7fdg3b ReEncodeFont" <[etbb1_rwec2l.enc <ETbb-Regular.pfb
+Etbb1-Regular-tosf-swash-t1--base ETbb-Regular "AutoEnc1_vtabipmm4e5xag7gq2nwm3p6gc ReEncodeFont" <[etbb1_vtabip.enc <ETbb-Regular.pfb
+Etbb1-Regular-lf-t1--base ETbb-Regular "AutoEnc1_eqc2ac2qcg4bxjlkwezu334h4f ReEncodeFont" <[etbb1_eqc2ac.enc <ETbb-Regular.pfb
+Etbb1-Regular-lf-sc-t1--base ETbb-Regular "AutoEnc1_2wngtzno6dnkbgy6u3wuotcora ReEncodeFont" <[etbb1_2wngtz.enc <ETbb-Regular.pfb
+Etbb1-Regular-lf-swash-t1--base ETbb-Regular "AutoEnc1_mgm6reivyglzs2cwtx35q2y4ye ReEncodeFont" <[etbb1_mgm6re.enc <ETbb-Regular.pfb
diff --git a/Master/texmf-dist/fonts/opentype/public/etbb/ETbb-Bold.otf b/Master/texmf-dist/fonts/opentype/public/etbb/ETbb-Bold.otf
index 1224ae088df..dbdb4e9ed25 100644
--- a/Master/texmf-dist/fonts/opentype/public/etbb/ETbb-Bold.otf
+++ b/Master/texmf-dist/fonts/opentype/public/etbb/ETbb-Bold.otf
diff --git a/Master/texmf-dist/fonts/opentype/public/etbb/ETbb-BoldItalic.otf b/Master/texmf-dist/fonts/opentype/public/etbb/ETbb-BoldItalic.otf
index 1c2c528b8bf..c907e580d11 100644
--- a/Master/texmf-dist/fonts/opentype/public/etbb/ETbb-BoldItalic.otf
+++ b/Master/texmf-dist/fonts/opentype/public/etbb/ETbb-BoldItalic.otf
diff --git a/Master/texmf-dist/fonts/opentype/public/etbb/ETbb-Italic.otf b/Master/texmf-dist/fonts/opentype/public/etbb/ETbb-Italic.otf
index 8f6da79a6c6..f13c94fb4b5 100644
--- a/Master/texmf-dist/fonts/opentype/public/etbb/ETbb-Italic.otf
+++ b/Master/texmf-dist/fonts/opentype/public/etbb/ETbb-Italic.otf
diff --git a/Master/texmf-dist/fonts/opentype/public/etbb/ETbb-Regular.otf b/Master/texmf-dist/fonts/opentype/public/etbb/ETbb-Regular.otf
index efaa735f9ed..46a33a8371d 100644
--- a/Master/texmf-dist/fonts/opentype/public/etbb/ETbb-Regular.otf
+++ b/Master/texmf-dist/fonts/opentype/public/etbb/ETbb-Regular.otf
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-swash-ly1--base.tfm
new file mode 100644
index 00000000000..af26643509c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-swash-ly1.tfm
new file mode 100644
index 00000000000..cfe762e0260
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-swash-ot1.tfm
new file mode 100644
index 00000000000..ce54c99de38
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-swash-t1--base.tfm
new file mode 100644
index 00000000000..3f75bc82459
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-swash-t1.tfm
new file mode 100644
index 00000000000..0e65a618867
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-ts1--base.tfm
index 6001e0593ea..93458377f2a 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-ts1.tfm
index 6fe7a3455e5..46b5f8830d8 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-swash-ly1--base.tfm
new file mode 100644
index 00000000000..0e3d6b6248b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-swash-ly1.tfm
new file mode 100644
index 00000000000..7c134cbd982
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-swash-ot1.tfm
new file mode 100644
index 00000000000..2780923843f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-swash-t1--base.tfm
new file mode 100644
index 00000000000..5f29caa54e7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-swash-t1.tfm
new file mode 100644
index 00000000000..e76dc08843d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-ts1--base.tfm
index 6001e0593ea..93458377f2a 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-ts1.tfm
index 6fe7a3455e5..46b5f8830d8 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-swash-ly1--base.tfm
new file mode 100644
index 00000000000..8578030ee20
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-swash-ly1.tfm
new file mode 100644
index 00000000000..8ffb759af35
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-swash-ot1.tfm
new file mode 100644
index 00000000000..72a758b5dbc
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-swash-t1--base.tfm
new file mode 100644
index 00000000000..19107b7e104
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-swash-t1.tfm
new file mode 100644
index 00000000000..f7560fa99ca
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-ts1--base.tfm
index 8a142f54ae9..6bfb65321e3 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-ts1.tfm
index 410b0d15753..e64d8272584 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-swash-ly1--base.tfm
new file mode 100644
index 00000000000..e37d81d423d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-swash-ly1.tfm
new file mode 100644
index 00000000000..08e0e10b8d0
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-swash-ot1.tfm
new file mode 100644
index 00000000000..84cae552280
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-swash-t1--base.tfm
new file mode 100644
index 00000000000..f5b61af4682
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-swash-t1.tfm
new file mode 100644
index 00000000000..da305345cbe
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-ts1--base.tfm
index 8a142f54ae9..6bfb65321e3 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-ts1.tfm
index 410b0d15753..e64d8272584 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-swash-ly1--base.tfm
new file mode 100644
index 00000000000..e09d4dfc2bd
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-swash-ly1.tfm
new file mode 100644
index 00000000000..5f5e1fce453
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-swash-ot1.tfm
new file mode 100644
index 00000000000..894bb24d60f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-swash-t1--base.tfm
new file mode 100644
index 00000000000..56d9fd7f9c7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-swash-t1.tfm
new file mode 100644
index 00000000000..e604288bf4f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-ts1--base.tfm
index 25a4e721a30..7b16ad81f18 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-ts1.tfm
index 21e43257834..b8977c91aad 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-swash-ly1--base.tfm
new file mode 100644
index 00000000000..94889e61033
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-swash-ly1.tfm
new file mode 100644
index 00000000000..24aec5641ac
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-swash-ot1.tfm
new file mode 100644
index 00000000000..1d042a90998
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-swash-t1--base.tfm
new file mode 100644
index 00000000000..4328ba13438
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-swash-t1.tfm
new file mode 100644
index 00000000000..25d31ed33a0
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-ts1--base.tfm
index 25a4e721a30..7b16ad81f18 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-ts1.tfm
index 21e43257834..b8977c91aad 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-swash-ly1--base.tfm
new file mode 100644
index 00000000000..0e7da27a0d1
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-swash-ly1.tfm
new file mode 100644
index 00000000000..31ae22d20ec
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-swash-ot1.tfm
new file mode 100644
index 00000000000..26d83358998
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-swash-t1--base.tfm
new file mode 100644
index 00000000000..83d6953fea5
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-swash-t1.tfm
new file mode 100644
index 00000000000..900e4b6f517
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-ts1--base.tfm
index 4eb8bd4a9c2..6ded3870e9f 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-ts1.tfm
index 006aabceb94..41360078311 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-swash-ly1--base.tfm
new file mode 100644
index 00000000000..49358725537
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-swash-ly1.tfm
new file mode 100644
index 00000000000..972236efeba
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-swash-ot1.tfm
new file mode 100644
index 00000000000..56bcf2f56e5
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-swash-t1--base.tfm
new file mode 100644
index 00000000000..a948527ee28
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-swash-t1.tfm
new file mode 100644
index 00000000000..036ad93eef0
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-ts1--base.tfm
index 4eb8bd4a9c2..6ded3870e9f 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-ts1.tfm
index 006aabceb94..41360078311 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-swash-ly1--base.tfm
new file mode 100644
index 00000000000..5b0b5b1f86f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-swash-ly1.tfm
new file mode 100644
index 00000000000..12976a4166d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-swash-ot1.tfm
new file mode 100644
index 00000000000..244d646ae15
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-swash-t1--base.tfm
new file mode 100644
index 00000000000..af1c848ed76
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-swash-t1.tfm
new file mode 100644
index 00000000000..848877c818b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-ts1--base.tfm
index 08ec8a11fbe..5491c16520c 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-ts1.tfm
index 058b5096ad8..7fa74f928d5 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-swash-ly1--base.tfm
new file mode 100644
index 00000000000..6f804c6e226
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-swash-ly1.tfm
new file mode 100644
index 00000000000..431c6c40953
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-swash-ot1.tfm
new file mode 100644
index 00000000000..0a9b894e838
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-swash-t1--base.tfm
new file mode 100644
index 00000000000..1d1320394f9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-swash-t1.tfm
new file mode 100644
index 00000000000..685bd0f06d4
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-ts1--base.tfm
index 08ec8a11fbe..5491c16520c 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-ts1.tfm
index 058b5096ad8..7fa74f928d5 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-swash-ly1--base.tfm
new file mode 100644
index 00000000000..50ea324928c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-swash-ly1.tfm
new file mode 100644
index 00000000000..e557bbc5f58
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-swash-ot1.tfm
new file mode 100644
index 00000000000..bfba718aeea
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-swash-t1--base.tfm
new file mode 100644
index 00000000000..318f58ad548
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-swash-t1.tfm
new file mode 100644
index 00000000000..e10b16fa6e3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-ts1--base.tfm
index e7c47bf2f52..f535630f56a 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-ts1.tfm
index 6d4cf542810..61a759b7a61 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-swash-ly1--base.tfm
new file mode 100644
index 00000000000..c4c7403a852
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-swash-ly1.tfm
new file mode 100644
index 00000000000..2bbc8528d38
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-swash-ot1.tfm
new file mode 100644
index 00000000000..71bc3aeb2f4
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-swash-t1--base.tfm
new file mode 100644
index 00000000000..6264cbaca1f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-swash-t1.tfm
new file mode 100644
index 00000000000..850cc4b7c82
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-ts1--base.tfm
index e7c47bf2f52..f535630f56a 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-ts1.tfm
index 6d4cf542810..61a759b7a61 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-swash-ly1--base.tfm
new file mode 100644
index 00000000000..f5b980666da
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-swash-ly1.tfm
new file mode 100644
index 00000000000..727081ae20d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-swash-ot1.tfm
new file mode 100644
index 00000000000..5b2defdbce9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-swash-t1--base.tfm
new file mode 100644
index 00000000000..25ee3be640f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-swash-t1.tfm
new file mode 100644
index 00000000000..b2b9342a762
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-ts1--base.tfm
index 012a84f0cfd..8bb26a3b289 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-ts1.tfm
index 22dcece20cd..dda6726f253 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-swash-ly1--base.tfm
new file mode 100644
index 00000000000..a2a4747f74f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-swash-ly1.tfm
new file mode 100644
index 00000000000..86cbe222032
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-swash-ot1.tfm
new file mode 100644
index 00000000000..947b7ad7d01
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-swash-t1--base.tfm
new file mode 100644
index 00000000000..5f3a5a748fe
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-swash-t1.tfm
new file mode 100644
index 00000000000..f6da0376d4f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-ts1--base.tfm
index 012a84f0cfd..8bb26a3b289 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-ts1.tfm
index 22dcece20cd..dda6726f253 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-swash-ly1--base.tfm
new file mode 100644
index 00000000000..a479e38392c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-swash-ly1.tfm
new file mode 100644
index 00000000000..0fe89e1f376
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-swash-ot1.tfm
new file mode 100644
index 00000000000..232171b4f49
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-swash-t1--base.tfm
new file mode 100644
index 00000000000..6d1c13a18e4
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-swash-t1.tfm
new file mode 100644
index 00000000000..07492b4e2a8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-ts1--base.tfm
index e88a86d95ce..8107e45556e 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-ts1.tfm
index 17626bfcfd4..640600bdc32 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-swash-ly1--base.tfm
new file mode 100644
index 00000000000..7d9ae9b88ac
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-swash-ly1.tfm
new file mode 100644
index 00000000000..009cc14d1e1
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-swash-ot1.tfm
new file mode 100644
index 00000000000..17301818856
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-swash-t1--base.tfm
new file mode 100644
index 00000000000..6a93cf25bf5
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-swash-t1.tfm
new file mode 100644
index 00000000000..59df47bb0aa
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-ts1--base.tfm
index e88a86d95ce..8107e45556e 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-ts1.tfm
index 17626bfcfd4..640600bdc32 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-swash-t1--base.tfm
new file mode 100644
index 00000000000..866cf623d30
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-swash-t1.tfm
new file mode 100644
index 00000000000..5e599217491
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-swash-t1--base.tfm
new file mode 100644
index 00000000000..be3d2645e9b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-swash-t1.tfm
new file mode 100644
index 00000000000..b0d46263c57
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-swash-t1--base.tfm
new file mode 100644
index 00000000000..591a6bf54c4
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-swash-t1.tfm
new file mode 100644
index 00000000000..ce1d6636557
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-swash-t1--base.tfm
new file mode 100644
index 00000000000..b821a786b4e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-swash-t1.tfm
new file mode 100644
index 00000000000..0288018fc01
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-swash-t1--base.tfm
new file mode 100644
index 00000000000..c8f70b50712
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-swash-t1.tfm
new file mode 100644
index 00000000000..96634983f39
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-swash-t1--base.tfm
new file mode 100644
index 00000000000..7937c47cb5c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-swash-t1.tfm
new file mode 100644
index 00000000000..d6050561cc7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-swash-t1--base.tfm
new file mode 100644
index 00000000000..c26891fda5c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-swash-t1.tfm
new file mode 100644
index 00000000000..b55ebcdfcb9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-swash-t1--base.tfm
new file mode 100644
index 00000000000..cf68ae0412c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-swash-t1.tfm
new file mode 100644
index 00000000000..7386a0159d2
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-swash-t1--base.tfm
new file mode 100644
index 00000000000..82fcfa88900
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-swash-t1.tfm
new file mode 100644
index 00000000000..729aa71e7c3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-swash-t1--base.tfm
new file mode 100644
index 00000000000..c24c9260b1d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-swash-t1.tfm
new file mode 100644
index 00000000000..649c80af72f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-swash-t1--base.tfm
new file mode 100644
index 00000000000..a902356baf1
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-swash-t1.tfm
new file mode 100644
index 00000000000..747561dcbd0
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-swash-t1--base.tfm
new file mode 100644
index 00000000000..4d5c6867e69
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-swash-t1.tfm
new file mode 100644
index 00000000000..e11022d4fd0
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-swash-t1--base.tfm
new file mode 100644
index 00000000000..715de18b26f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-swash-t1.tfm
new file mode 100644
index 00000000000..aec872d0f88
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-swash-t1--base.tfm
new file mode 100644
index 00000000000..22178850fe5
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-swash-t1.tfm
new file mode 100644
index 00000000000..97c93c4f9ba
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-swash-t1--base.tfm
new file mode 100644
index 00000000000..8fab63c8a62
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-swash-t1.tfm
new file mode 100644
index 00000000000..7fbbd7c8c36
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-swash-t1--base.tfm
new file mode 100644
index 00000000000..222eb049d71
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-swash-t1.tfm
new file mode 100644
index 00000000000..94a78ba27be
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/type1/public/etbb/ETbb-Bold.pfb b/Master/texmf-dist/fonts/type1/public/etbb/ETbb-Bold.pfb
index 41b2e588a27..5b531d8e64e 100644
--- a/Master/texmf-dist/fonts/type1/public/etbb/ETbb-Bold.pfb
+++ b/Master/texmf-dist/fonts/type1/public/etbb/ETbb-Bold.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/etbb/ETbb-BoldItalic.pfb b/Master/texmf-dist/fonts/type1/public/etbb/ETbb-BoldItalic.pfb
index 759f7cccff0..9cef4fafef5 100644
--- a/Master/texmf-dist/fonts/type1/public/etbb/ETbb-BoldItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/etbb/ETbb-BoldItalic.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/etbb/ETbb-Italic.pfb b/Master/texmf-dist/fonts/type1/public/etbb/ETbb-Italic.pfb
index fa63cb73cdb..c322ba35db5 100644
--- a/Master/texmf-dist/fonts/type1/public/etbb/ETbb-Italic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/etbb/ETbb-Italic.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/etbb/ETbb-Regular.pfb b/Master/texmf-dist/fonts/type1/public/etbb/ETbb-Regular.pfb
index ef04fee5035..d6380220605 100644
--- a/Master/texmf-dist/fonts/type1/public/etbb/ETbb-Regular.pfb
+++ b/Master/texmf-dist/fonts/type1/public/etbb/ETbb-Regular.pfb
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-swash-ly1.vf
new file mode 100644
index 00000000000..63ff7d0518b
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-swash-t1.vf
new file mode 100644
index 00000000000..ce5232025a9
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-ts1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-ts1.vf
index a284c25e629..37b303c75de 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-swash-ly1.vf
new file mode 100644
index 00000000000..6e77c08e3e9
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-swash-t1.vf
new file mode 100644
index 00000000000..7b977e47cf4
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-ts1.vf
index 2c77fcc3862..4493b946906 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-swash-ly1.vf
new file mode 100644
index 00000000000..e3f0aa7f52a
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-swash-t1.vf
new file mode 100644
index 00000000000..13b859c4edd
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-ts1.vf
index 3ac0d55b0cc..70eaf33b74c 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-swash-ly1.vf
new file mode 100644
index 00000000000..eeb2989aa62
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-swash-t1.vf
new file mode 100644
index 00000000000..4233b43ea46
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-ts1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-ts1.vf
index 62d2eee6554..71d28df3b0a 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-swash-ly1.vf
new file mode 100644
index 00000000000..284d8f165d1
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-swash-t1.vf
new file mode 100644
index 00000000000..2b20ebeb320
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-ts1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-ts1.vf
index 64d98604c4e..4af70356626 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-swash-ly1.vf
new file mode 100644
index 00000000000..7758f56ada0
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-swash-t1.vf
new file mode 100644
index 00000000000..067bf9e007f
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-ts1.vf
index 9688def1c6a..27f97702fc1 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-swash-ly1.vf
new file mode 100644
index 00000000000..fc9c224ee29
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-swash-t1.vf
new file mode 100644
index 00000000000..4adaa1444dd
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-ts1.vf
index c7b8d15d58b..8bd25cd770b 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-swash-ly1.vf
new file mode 100644
index 00000000000..242983c9eab
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-swash-t1.vf
new file mode 100644
index 00000000000..ceb60c15260
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-ts1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-ts1.vf
index 6de8eb445de..a4df3f8c3d1 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-swash-ly1.vf
new file mode 100644
index 00000000000..661ffabe745
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-swash-t1.vf
new file mode 100644
index 00000000000..b309e6bce55
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-ts1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-ts1.vf
index 80486d0c656..7f33f2d3bd9 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-swash-ly1.vf
new file mode 100644
index 00000000000..ad3905824aa
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-swash-t1.vf
new file mode 100644
index 00000000000..251c2cac55b
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-ts1.vf
index 441bae6e767..7c45d62c7fb 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-swash-ly1.vf
new file mode 100644
index 00000000000..9f785f25bdd
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-swash-t1.vf
new file mode 100644
index 00000000000..9037eefdd16
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-ts1.vf
index 6c17beabe99..ceba3b9aca3 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-swash-ly1.vf
new file mode 100644
index 00000000000..dcd05cc830f
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-swash-t1.vf
new file mode 100644
index 00000000000..3871cf0008e
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-ts1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-ts1.vf
index 449e6c04616..6b70cd9526c 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-swash-ly1.vf
new file mode 100644
index 00000000000..ab221db4280
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-swash-t1.vf
new file mode 100644
index 00000000000..00a0a544bda
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-ts1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-ts1.vf
index b41c573a15d..05501754a8f 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-swash-ly1.vf
new file mode 100644
index 00000000000..6c56ae40964
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-swash-t1.vf
new file mode 100644
index 00000000000..52ad47af09d
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-ts1.vf
index 4e81a3b42b1..9e451f940c3 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-swash-ly1.vf
new file mode 100644
index 00000000000..829bc60c7b9
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-swash-t1.vf
new file mode 100644
index 00000000000..2d99d9ff49d
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-ts1.vf
index 1f23c4035e4..6e4f7a85dff 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-swash-ly1.vf
new file mode 100644
index 00000000000..203bea60228
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-swash-t1.vf
new file mode 100644
index 00000000000..1e570412406
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-ts1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-ts1.vf
index acfdb44848a..73c5defecde 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-lf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-lf-swash-t1.vf
new file mode 100644
index 00000000000..57deb9d3af1
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-lf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-osf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-osf-swash-t1.vf
new file mode 100644
index 00000000000..454299b7a7d
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-osf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tlf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tlf-swash-t1.vf
new file mode 100644
index 00000000000..23f5e671961
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tlf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tosf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tosf-swash-t1.vf
new file mode 100644
index 00000000000..9127f7e62cb
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tosf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-lf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-lf-swash-t1.vf
new file mode 100644
index 00000000000..4d24b794869
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-lf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-osf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-osf-swash-t1.vf
new file mode 100644
index 00000000000..3eb11931a50
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-osf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tlf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tlf-swash-t1.vf
new file mode 100644
index 00000000000..f71c7927c6a
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tlf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tosf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tosf-swash-t1.vf
new file mode 100644
index 00000000000..fc502c2e571
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tosf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-lf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-lf-swash-t1.vf
new file mode 100644
index 00000000000..48f245f5a9a
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-lf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-osf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-osf-swash-t1.vf
new file mode 100644
index 00000000000..cf1d9ead0b1
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-osf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tlf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tlf-swash-t1.vf
new file mode 100644
index 00000000000..7a169eaa417
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tlf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tosf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tosf-swash-t1.vf
new file mode 100644
index 00000000000..25ee7aab3ac
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tosf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-lf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-lf-swash-t1.vf
new file mode 100644
index 00000000000..29ecea302b4
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-lf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-osf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-osf-swash-t1.vf
new file mode 100644
index 00000000000..acd97d5b592
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-osf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tlf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tlf-swash-t1.vf
new file mode 100644
index 00000000000..51b82c432e8
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tlf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tosf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tosf-swash-t1.vf
new file mode 100644
index 00000000000..22ed9cbc6bf
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tosf-swash-t1.vf
diff --git a/Master/texmf-dist/tex/latex/etbb/ETbb.sty b/Master/texmf-dist/tex/latex/etbb/ETbb.sty
index 476ee84a82b..bcdc8844094 100644
--- a/Master/texmf-dist/tex/latex/etbb/ETbb.sty
+++ b/Master/texmf-dist/tex/latex/etbb/ETbb.sty
@@ -1,11 +1,11 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.04}
-\def\filedate{2020/06/27}
+\def\fileversion{1.05}
+\def\filedate{2020/07/01}
 \ProvidesPackage{ETbb}
     [\filedate\space v\fileversion.  Style file for ETbb.]
 
-\RequirePackage[T1,LY1]{fontenc}
+\RequirePackage[LY1,T1]{fontenc}
 \RequirePackage[full]{textcomp}
 \RequirePackage{ifetex}
 \ifetex\RequirePackage{etoolbox}\fi %etoolbox loads etex.sty
@@ -13,23 +13,35 @@
 \IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
 \IfFileExists{fontaxes.sty}{
     \RequirePackage{fontaxes}
-    \fa@naming@exception{figures}{{superior}{proportional}}{Sup}
+    \DeclareRobustCommand\swshape{\not@math@alphabet\swshape\relax
+        \fontprimaryshape\itdefault\fontsecondaryshape\swdefault\selectfont}
+    \fa@naming@exception{shape}{{n}{sw}}{nw}
+    \fa@naming@exception{shape}{{it}{sw}}{sw}\fa@naming@exception{figures}{{superior}{proportional}}{Sup}
     \fa@naming@exception{figures}{{superior}{tabular}}{Sup}
-    \def\sufigures{\@nomath\sufigures
-        \fontfigurestyle{superior}\selectfont}
-    \DeclareTextFontCommand{\textsu}{\sufigures}
-    \let\textsuperior\textsu
-
     \fa@naming@exception{figures}{{inferior}{proportional}}{Inf}
     \fa@naming@exception{figures}{{inferior}{tabular}}{Inf}
-    \def\infigures{\@nomath\infigures
+    \def\supfigures{\@nomath\supfigures
+        \fontfigurestyle{superior}\selectfont}
+    \let\sufigures\supfigures
+    \DeclareTextFontCommand{\textsup}{\supfigures}
+    \let\textsu\textsup
+    \let\textsuperior\textsup
+    \def\inffigures{\@nomath\inffigures
         \fontfigurestyle{inferior}\selectfont}
-    \DeclareTextFontCommand{\textin}{\infigures}
-    \let\textinferior\textin
-%    \providecommand*{\textfrac}[3][\ETbb@raisefrac]{%
-%    \raise ##1 \hbox{\textsu{##2}\kern \ETbb@foresolidus \textfractionsolidus\kern \ETbb@aftsolidus \textin{##3}}}
+    \let\infigures\inffigures
+    \DeclareTextFontCommand{\textinf}{\inffigures}
+    \let\textin\textinf
+    \let\textinferior\textinf
+    \fa@naming@exception{figures}{{denominators}{proportional}}{Dnom}
+    \fa@naming@exception{figures}{{denominators}{tabular}}{Dnom}
+    \def\denomfigures{\@nomath\denomfigures
+        \fontfigurestyle{denominators}\selectfont}
+    \let\defigures\denomfigures
+    \DeclareTextFontCommand{\textdenom}{\denomfigures}
+    \let\textde\textdenom
+    \let\textdenominator\textdenom
+
 }{}
-\def\textde#1{\leavevmode\raise .112em \hbox{\textin{#1}}} % aligned with baseline
 \newcommand{\textfrac}[3][]{% like \textfrac[1]{7}{8}
   \mbox{%
     \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
@@ -62,16 +74,11 @@
   }%
 }
 
-\IfFileExists{xkeyval.sty}{
-    \newcommand*{\ETbb@scale}{1}
-    \RequirePackage{xkeyval}
-    \DeclareOptionX{scale}{\renewcommand*{\ETbb@scale}{##1}}
-    \DeclareOptionX{scaled}{\renewcommand*{\ETbb@scale}{##1}}
-}{
-    \let\DeclareOptionX\DeclareOption
-    \let\ExecuteOptionsX\ExecuteOptions
-    \let\ProcessOptionsX\ProcessOptions
-}
+\newcommand*{\ETbb@scale}{1}
+\RequirePackage{xkeyval}
+\DeclareOptionX{scale}{\renewcommand*{\ETbb@scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\ETbb@scale}{#1}}
+
 \let\orig@footnote=\thefootnote
 \let\orig@makefnmark=\@makefnmark
 %\def\bfseries@rm{b}
@@ -80,6 +87,7 @@
 \@onlypreamble\useosf
 \def\useproportional{\edef\ETbb@figurealign{}}
 \@onlypreamble\useproportional
+\def\ETbb@@swashQ{}
 \newif\if@ETbb@sharpS
 \newif\if@ETbb@sups
 \newif\if@ETbb@scosf
@@ -101,6 +109,7 @@
 \DeclareOptionX{proportional}{\useproportional}
 \DeclareOptionX{p}{\useproportional}
 \DeclareOptionX{sharpS}{\@ETbb@sharpStrue}
+\DeclareOptionX{swashQ}{\edef\ETbb@@swashQ{-swash}}
 \DeclareOptionX{mainfont}{
     \renewcommand{\familydefault}{\rmdefault}
 }
@@ -153,6 +162,9 @@
 {\fontfamily{ETbb-\ETbb@figurealign OsF}\fontshape{sc}\selectfont #1}%
 }\fi
 
+\newcommand{\Qswash}{{\fontencoding{TS1}\fontfamily{ETbb-LF}\selectfont \char59 }}
+\newcommand{\Qnoswash}{{\fontencoding{TS1}\fontfamily{ETbb-LF}\selectfont \char58 }}
+
 %\renewcommand*{\familydefault}{\rmdefault}
 \if@ETbb@sups %
  \ifdefined\sufigures
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Dnom.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Dnom.fd
index 347d6ba3ad2..4924d3a55a0 100644
--- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Dnom.fd
+++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Dnom.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{LY1ETbb-Dnom.fd}
-    [2020/06/27 (autoinst)  Font definitions for LY1/ETbb-Dnom.]
+    [2020/07/01 (autoinst)  Font definitions for LY1/ETbb-Dnom.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,14 @@
 
 %   ----  bold  ----
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-dnom-ly1
-}{}
-
 \DeclareFontShape{LY1}{ETbb-Dnom}{bold}{n}{
       <-> \ETbb@@scale ETbb-Bold-dnom-ly1
 }{}
 
+\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-dnom-ly1
+}{}
+
 \DeclareFontShape{LY1}{ETbb-Dnom}{bold}{sl}{
       <-> ssub * ETbb-Dnom/bold/it
 }{}
@@ -55,16 +55,16 @@
 
 %   m --> regular
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{m}{it}{
-      <-> alias * ETbb-Dnom/regular/it
+\DeclareFontShape{LY1}{ETbb-Dnom}{m}{n}{
+      <-> alias * ETbb-Dnom/regular/n
 }{}
 
 \DeclareFontShape{LY1}{ETbb-Dnom}{m}{sl}{
       <-> alias * ETbb-Dnom/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{m}{n}{
-      <-> alias * ETbb-Dnom/regular/n
+\DeclareFontShape{LY1}{ETbb-Dnom}{m}{it}{
+      <-> alias * ETbb-Dnom/regular/it
 }{}
 
 
@@ -82,14 +82,14 @@
       <-> alias * ETbb-Dnom/bold/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{bx}{n}{
-      <-> ssub * ETbb-Dnom/b/n
-}{}
-
 \DeclareFontShape{LY1}{ETbb-Dnom}{bx}{it}{
       <-> ssub * ETbb-Dnom/b/it
 }{}
 
+\DeclareFontShape{LY1}{ETbb-Dnom}{bx}{n}{
+      <-> ssub * ETbb-Dnom/b/n
+}{}
+
 \DeclareFontShape{LY1}{ETbb-Dnom}{bx}{sl}{
       <-> ssub * ETbb-Dnom/b/sl
 }{}
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd
index 7cd45deb396..e2c933c86df 100644
--- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd
+++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{LY1ETbb-Inf.fd}
-    [2020/06/27 (autoinst)  Font definitions for LY1/ETbb-Inf.]
+    [2020/07/01 (autoinst)  Font definitions for LY1/ETbb-Inf.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{LY1}{ETbb-Inf}{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{LY1}{ETbb-Inf}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-inf-ly1
+\DeclareFontShape{LY1}{ETbb-Inf}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-inf-ly1
+\DeclareFontShape{LY1}{ETbb-Inf}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{bold}{sl}{
-      <-> ssub * ETbb-Inf/bold/it
+\DeclareFontShape{LY1}{ETbb-Inf}{regular}{sl}{
+      <-> ssub * ETbb-Inf/regular/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{ETbb-Inf}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-inf-ly1
+\DeclareFontShape{LY1}{ETbb-Inf}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-inf-ly1
+\DeclareFontShape{LY1}{ETbb-Inf}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{regular}{sl}{
-      <-> ssub * ETbb-Inf/regular/it
+\DeclareFontShape{LY1}{ETbb-Inf}{bold}{sl}{
+      <-> ssub * ETbb-Inf/bold/it
 }{}
 
 %
@@ -55,10 +55,6 @@
 
 %   m --> regular
 
-\DeclareFontShape{LY1}{ETbb-Inf}{m}{sl}{
-      <-> alias * ETbb-Inf/regular/sl
-}{}
-
 \DeclareFontShape{LY1}{ETbb-Inf}{m}{it}{
       <-> alias * ETbb-Inf/regular/it
 }{}
@@ -67,6 +63,10 @@
       <-> alias * ETbb-Inf/regular/n
 }{}
 
+\DeclareFontShape{LY1}{ETbb-Inf}{m}{sl}{
+      <-> alias * ETbb-Inf/regular/sl
+}{}
+
 
 %   b --> bold
 
@@ -74,12 +74,16 @@
       <-> alias * ETbb-Inf/bold/it
 }{}
 
+\DeclareFontShape{LY1}{ETbb-Inf}{b}{n}{
+      <-> alias * ETbb-Inf/bold/n
+}{}
+
 \DeclareFontShape{LY1}{ETbb-Inf}{b}{sl}{
       <-> alias * ETbb-Inf/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{b}{n}{
-      <-> alias * ETbb-Inf/bold/n
+\DeclareFontShape{LY1}{ETbb-Inf}{bx}{n}{
+      <-> ssub * ETbb-Inf/b/n
 }{}
 
 \DeclareFontShape{LY1}{ETbb-Inf}{bx}{sl}{
@@ -90,8 +94,4 @@
       <-> ssub * ETbb-Inf/b/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{bx}{n}{
-      <-> ssub * ETbb-Inf/b/n
-}{}
-
 \endinput
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
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
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd
index e34bcb15cc6..ba3f657a21e 100644
--- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd
+++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{LY1ETbb-Sup.fd}
-    [2020/06/27 (autoinst)  Font definitions for LY1/ETbb-Sup.]
+    [2020/07/01 (autoinst)  Font definitions for LY1/ETbb-Sup.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -37,14 +37,14 @@
 
 %   ----  bold  ----
 
-\DeclareFontShape{LY1}{ETbb-Sup}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-sup-ly1
-}{}
-
 \DeclareFontShape{LY1}{ETbb-Sup}{bold}{it}{
       <-> \ETbb@@scale ETbb-BoldItalic-sup-ly1
 }{}
 
+\DeclareFontShape{LY1}{ETbb-Sup}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-sup-ly1
+}{}
+
 \DeclareFontShape{LY1}{ETbb-Sup}{bold}{sl}{
       <-> ssub * ETbb-Sup/bold/it
 }{}
@@ -55,6 +55,10 @@
 
 %   m --> regular
 
+\DeclareFontShape{LY1}{ETbb-Sup}{m}{sl}{
+      <-> alias * ETbb-Sup/regular/sl
+}{}
+
 \DeclareFontShape{LY1}{ETbb-Sup}{m}{n}{
       <-> alias * ETbb-Sup/regular/n
 }{}
@@ -63,17 +67,9 @@
       <-> alias * ETbb-Sup/regular/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Sup}{m}{sl}{
-      <-> alias * ETbb-Sup/regular/sl
-}{}
-
 
 %   b --> bold
 
-\DeclareFontShape{LY1}{ETbb-Sup}{b}{it}{
-      <-> alias * ETbb-Sup/bold/it
-}{}
-
 \DeclareFontShape{LY1}{ETbb-Sup}{b}{sl}{
       <-> alias * ETbb-Sup/bold/sl
 }{}
@@ -82,6 +78,14 @@
       <-> alias * ETbb-Sup/bold/n
 }{}
 
+\DeclareFontShape{LY1}{ETbb-Sup}{b}{it}{
+      <-> alias * ETbb-Sup/bold/it
+}{}
+
+\DeclareFontShape{LY1}{ETbb-Sup}{bx}{it}{
+      <-> ssub * ETbb-Sup/b/it
+}{}
+
 \DeclareFontShape{LY1}{ETbb-Sup}{bx}{n}{
       <-> ssub * ETbb-Sup/b/n
 }{}
@@ -90,8 +94,4 @@
       <-> ssub * ETbb-Sup/b/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Sup}{bx}{it}{
-      <-> ssub * ETbb-Sup/b/it
-}{}
-
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TLF.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TLF.fd
index fdd06138789..74aa90041e9 100644
--- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TLF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TLF.fd
@@ -1,7 +1,10 @@
-%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{LY1ETbb-TLF.fd}
-    [2020/06/27 (autoinst)  Font definitions for LY1/ETbb-TLF.]
+    [2020/02/15  Font definitions for LY1/ETbb-TLF.]
+
+\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
@@ -20,57 +30,65 @@
 \DeclareFontFamily{LY1}{ETbb-TLF}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{ETbb-TLF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-tlf-ly1
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{nw}{
+      <-> \ETbb@@scale ETbb-Bold-tlf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-tlf-ly1
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{sw}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tlf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb-Regular-tlf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tlf\ETbb@@swashQ-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb-Italic-tlf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{n}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-tlf\ETbb@@swashQ-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{regular}{scsl}{
-      <-> ssub * ETbb-TLF/regular/scit
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{regular}{sl}{
-      <-> ssub * ETbb-TLF/regular/it
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tlf-sc-ly1
 }{}
 
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{scsl}{
+      <-> ssub * ETbb-TLF/bold/scit
+}{}
 
-%   ----  bold  ----
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{sl}{
+      <-> ssub * ETbb-TLF/bold/it
+}{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-tlf-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{ETbb-TLF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bold}{sc}{
-      <-> \ETbb@@scale ETbb-Bold-tlf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-TLF}{regular}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{ETbb-TLF}{regular}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tlf\ETbb@@swashQ-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-TLF}{regular}{n}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tlf\ETbb@@swashQ-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bold}{scsl}{
-      <-> ssub * ETbb-TLF/bold/scit
+\DeclareFontShape{LY1}{ETbb-TLF}{regular}{scsl}{
+      <-> ssub * ETbb-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bold}{sl}{
-      <-> ssub * ETbb-TLF/bold/it
+\DeclareFontShape{LY1}{ETbb-TLF}{regular}{sl}{
+      <-> ssub * ETbb-TLF/regular/it
 }{}
 
 %
@@ -83,6 +101,14 @@
       <-> alias * ETbb-TLF/regular/sl
 }{}
 
+\DeclareFontShape{LY1}{ETbb-TLF}{m}{nw}{
+      <-> alias * ETbb-TLF/regular/nw
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TLF}{m}{sc}{
+      <-> alias * ETbb-TLF/regular/sc
+}{}
+
 \DeclareFontShape{LY1}{ETbb-TLF}{m}{it}{
       <-> alias * ETbb-TLF/regular/it
 }{}
@@ -91,10 +117,6 @@
       <-> alias * ETbb-TLF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{m}{sc}{
-      <-> alias * ETbb-TLF/regular/sc
-}{}
-
 \DeclareFontShape{LY1}{ETbb-TLF}{m}{scsl}{
       <-> alias * ETbb-TLF/regular/scsl
 }{}
@@ -103,9 +125,21 @@
       <-> alias * ETbb-TLF/regular/scit
 }{}
 
+\DeclareFontShape{LY1}{ETbb-TLF}{m}{sl}{
+      <-> alias * ETbb-TLF/regular/sl
+}{}
+
 
 %   b --> bold
 
+\DeclareFontShape{LY1}{ETbb-TLF}{b}{sw}{
+      <-> alias * ETbb-TLF/bold/sw
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TLF}{b}{nw}{
+      <-> alias * ETbb-TLF/bold/nw
+}{}
+
 \DeclareFontShape{LY1}{ETbb-TLF}{b}{scsl}{
       <-> alias * ETbb-TLF/bold/scsl
 }{}
@@ -114,6 +148,10 @@
       <-> alias * ETbb-TLF/bold/scit
 }{}
 
+\DeclareFontShape{LY1}{ETbb-TLF}{b}{it}{
+      <-> alias * ETbb-TLF/bold/it
+}{}
+
 \DeclareFontShape{LY1}{ETbb-TLF}{b}{n}{
       <-> alias * ETbb-TLF/bold/n
 }{}
@@ -126,16 +164,16 @@
       <-> alias * ETbb-TLF/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{b}{it}{
-      <-> alias * ETbb-TLF/bold/it
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{sl}{
+      <-> ssub * ETbb-TLF/b/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bx}{it}{
-      <-> ssub * ETbb-TLF/b/it
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{scit}{
+      <-> ssub * ETbb-TLF/b/scit
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bx}{sl}{
-      <-> ssub * ETbb-TLF/b/sl
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{scsl}{
+      <-> ssub * ETbb-TLF/b/scsl
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TLF}{bx}{n}{
@@ -146,12 +184,16 @@
       <-> ssub * ETbb-TLF/b/sc
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bx}{scit}{
-      <-> ssub * ETbb-TLF/b/scit
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{it}{
+      <-> ssub * ETbb-TLF/b/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bx}{scsl}{
-      <-> ssub * ETbb-TLF/b/scsl
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{nw}{
+      <-> ssub * ETbb-TLF/b/nw
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{sw}{
+      <-> ssub * ETbb-TLF/b/sw
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TOsF.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TOsF.fd
index 5f5bc6b363a..4cb083d4c3c 100644
--- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/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
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Dnom.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Dnom.fd
index bf1444e85de..5638d234eca 100644
--- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Dnom.fd
+++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Dnom.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{OT1ETbb-Dnom.fd}
-    [2020/06/27 (autoinst)  Font definitions for OT1/ETbb-Dnom.]
+    [2020/07/01 (autoinst)  Font definitions for OT1/ETbb-Dnom.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,14 @@
 
 %   ----  regular  ----
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-dnom-ot1
-}{}
-
 \DeclareFontShape{OT1}{ETbb-Dnom}{regular}{n}{
       <-> \ETbb@@scale ETbb-Regular-dnom-ot1
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-dnom-ot1
+}{}
+
 \DeclareFontShape{OT1}{ETbb-Dnom}{regular}{sl}{
       <-> ssub * ETbb-Dnom/regular/it
 }{}
@@ -55,14 +55,14 @@
 
 %   m --> regular
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{m}{sl}{
-      <-> alias * ETbb-Dnom/regular/sl
-}{}
-
 \DeclareFontShape{OT1}{ETbb-Dnom}{m}{it}{
       <-> alias * ETbb-Dnom/regular/it
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Dnom}{m}{sl}{
+      <-> alias * ETbb-Dnom/regular/sl
+}{}
+
 \DeclareFontShape{OT1}{ETbb-Dnom}{m}{n}{
       <-> alias * ETbb-Dnom/regular/n
 }{}
@@ -70,14 +70,14 @@
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{b}{n}{
-      <-> alias * ETbb-Dnom/bold/n
-}{}
-
 \DeclareFontShape{OT1}{ETbb-Dnom}{b}{it}{
       <-> alias * ETbb-Dnom/bold/it
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Dnom}{b}{n}{
+      <-> alias * ETbb-Dnom/bold/n
+}{}
+
 \DeclareFontShape{OT1}{ETbb-Dnom}{b}{sl}{
       <-> alias * ETbb-Dnom/bold/sl
 }{}
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd
index c023c37a8a7..d521370a34a 100644
--- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd
+++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{OT1ETbb-Inf.fd}
-    [2020/06/27 (autoinst)  Font definitions for OT1/ETbb-Inf.]
+    [2020/07/01 (autoinst)  Font definitions for OT1/ETbb-Inf.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{OT1}{ETbb-Inf}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{ETbb-Inf}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-inf-ot1
+\DeclareFontShape{OT1}{ETbb-Inf}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-inf-ot1
+\DeclareFontShape{OT1}{ETbb-Inf}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{regular}{sl}{
-      <-> ssub * ETbb-Inf/regular/it
+\DeclareFontShape{OT1}{ETbb-Inf}{bold}{sl}{
+      <-> ssub * ETbb-Inf/bold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{ETbb-Inf}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-inf-ot1
+\DeclareFontShape{OT1}{ETbb-Inf}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-inf-ot1
+\DeclareFontShape{OT1}{ETbb-Inf}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{bold}{sl}{
-      <-> ssub * ETbb-Inf/bold/it
+\DeclareFontShape{OT1}{ETbb-Inf}{regular}{sl}{
+      <-> ssub * ETbb-Inf/regular/it
 }{}
 
 %
@@ -55,10 +55,6 @@
 
 %   m --> regular
 
-\DeclareFontShape{OT1}{ETbb-Inf}{m}{it}{
-      <-> alias * ETbb-Inf/regular/it
-}{}
-
 \DeclareFontShape{OT1}{ETbb-Inf}{m}{sl}{
       <-> alias * ETbb-Inf/regular/sl
 }{}
@@ -67,12 +63,12 @@
       <-> alias * ETbb-Inf/regular/n
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Inf}{m}{it}{
+      <-> alias * ETbb-Inf/regular/it
+}{}
 
-%   b --> bold
 
-\DeclareFontShape{OT1}{ETbb-Inf}{b}{sl}{
-      <-> alias * ETbb-Inf/bold/sl
-}{}
+%   b --> bold
 
 \DeclareFontShape{OT1}{ETbb-Inf}{b}{it}{
       <-> alias * ETbb-Inf/bold/it
@@ -82,14 +78,18 @@
       <-> alias * ETbb-Inf/bold/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{bx}{sl}{
-      <-> ssub * ETbb-Inf/b/sl
+\DeclareFontShape{OT1}{ETbb-Inf}{b}{sl}{
+      <-> alias * ETbb-Inf/bold/sl
 }{}
 
 \DeclareFontShape{OT1}{ETbb-Inf}{bx}{it}{
       <-> ssub * ETbb-Inf/b/it
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Inf}{bx}{sl}{
+      <-> ssub * ETbb-Inf/b/sl
+}{}
+
 \DeclareFontShape{OT1}{ETbb-Inf}{bx}{n}{
       <-> ssub * ETbb-Inf/b/n
 }{}
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-LF.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-LF.fd
index f252b0f0df8..828ee869d7a 100644
--- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-LF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/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
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-OsF.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-OsF.fd
index 4f93a3385b8..a055e457030 100644
--- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-OsF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-OsF.fd
@@ -1,7 +1,9 @@
-%% Generated by autoinst on 2020/06/27
-%%
 \ProvidesFile{OT1ETbb-OsF.fd}
-    [2020/06/27 (autoinst)  Font definitions for OT1/ETbb-OsF.]
+    [2020/02/15  Font definitions for OT1/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{OT1}{ETbb-OsF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb-BoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{nw}{
+      <-> \ETbb@@scale ETbb-Bold-osf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{bold}{sc}{
-      <-> \ETbb@@scale ETbb-Bold-osf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{sw}{
+      <-> \ETbb@@scale ETbb-BoldItalic-osf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-osf\ETbb@@swashQ-ot1
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-osf-ot1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-osf\ETbb@@swashQ-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-osf-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-osf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{bold}{scsl}{
@@ -50,19 +67,19 @@
 %   ----  regular  ----
 
 \DeclareFontShape{OT1}{ETbb-OsF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb-Italic-osf-sc-ot1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-osf-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{regular}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb-Regular-osf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{regular}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-osf\ETbb@@swashQ-ot1
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-osf-ot1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-osf\ETbb@@swashQ-ot1
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{regular}{scsl}{
@@ -79,24 +96,32 @@
 
 %   m --> regular
 
-\DeclareFontShape{OT1}{ETbb-OsF}{m}{scit}{
-      <-> alias * ETbb-OsF/regular/scit
+\DeclareFontShape{OT1}{ETbb-OsF}{m}{sl}{
+      <-> alias * ETbb-OsF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{m}{scsl}{
-      <-> alias * ETbb-OsF/regular/scsl
+\DeclareFontShape{OT1}{ETbb-OsF}{m}{nw}{
+      <-> alias * ETbb-OsF/regular/nw
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{m}{sc}{
       <-> alias * ETbb-OsF/regular/sc
 }{}
 
+\DeclareFontShape{OT1}{ETbb-OsF}{m}{it}{
+      <-> alias * ETbb-OsF/regular/it
+}{}
+
 \DeclareFontShape{OT1}{ETbb-OsF}{m}{n}{
       <-> alias * ETbb-OsF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{m}{it}{
-      <-> alias * ETbb-OsF/regular/it
+\DeclareFontShape{OT1}{ETbb-OsF}{m}{scsl}{
+      <-> alias * ETbb-OsF/regular/scsl
+}{}
+
+\DeclareFontShape{OT1}{ETbb-OsF}{m}{scit}{
+      <-> alias * ETbb-OsF/regular/scit
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{m}{sl}{
@@ -106,28 +131,40 @@
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{sl}{
-      <-> alias * ETbb-OsF/bold/sl
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{sw}{
+      <-> alias * ETbb-OsF/bold/sw
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{it}{
-      <-> alias * ETbb-OsF/bold/it
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{nw}{
+      <-> alias * ETbb-OsF/bold/nw
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{sc}{
-      <-> alias * ETbb-OsF/bold/sc
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{scsl}{
+      <-> alias * ETbb-OsF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{scit}{
+      <-> alias * ETbb-OsF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{it}{
+      <-> alias * ETbb-OsF/bold/it
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{b}{n}{
       <-> alias * ETbb-OsF/bold/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{scsl}{
-      <-> alias * ETbb-OsF/bold/scsl
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{sc}{
+      <-> alias * ETbb-OsF/bold/sc
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{scit}{
-      <-> alias * ETbb-OsF/bold/scit
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{sl}{
+      <-> alias * ETbb-OsF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{ETbb-OsF}{bx}{sl}{
+      <-> ssub * ETbb-OsF/b/sl
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{bx}{scit}{
@@ -138,20 +175,24 @@
       <-> ssub * ETbb-OsF/b/scsl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{bx}{it}{
-      <-> ssub * ETbb-OsF/b/it
-}{}
-
-\DeclareFontShape{OT1}{ETbb-OsF}{bx}{sl}{
-      <-> ssub * ETbb-OsF/b/sl
+\DeclareFontShape{OT1}{ETbb-OsF}{bx}{n}{
+      <-> ssub * ETbb-OsF/b/n
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{bx}{sc}{
       <-> ssub * ETbb-OsF/b/sc
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{bx}{n}{
-      <-> ssub * ETbb-OsF/b/n
+\DeclareFontShape{OT1}{ETbb-OsF}{bx}{it}{
+      <-> ssub * ETbb-OsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{ETbb-OsF}{bx}{nw}{
+      <-> ssub * ETbb-OsF/b/nw
+}{}
+
+\DeclareFontShape{OT1}{ETbb-OsF}{bx}{sw}{
+      <-> ssub * ETbb-OsF/b/sw
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd
index 2912386bf4a..f3e90c21429 100644
--- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd
+++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{OT1ETbb-Sup.fd}
-    [2020/06/27 (autoinst)  Font definitions for OT1/ETbb-Sup.]
+    [2020/07/01 (autoinst)  Font definitions for OT1/ETbb-Sup.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{OT1}{ETbb-Sup}{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{ETbb-Sup}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-sup-ot1
+\DeclareFontShape{OT1}{ETbb-Sup}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-sup-ot1
+\DeclareFontShape{OT1}{ETbb-Sup}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{bold}{sl}{
-      <-> ssub * ETbb-Sup/bold/it
+\DeclareFontShape{OT1}{ETbb-Sup}{regular}{sl}{
+      <-> ssub * ETbb-Sup/regular/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{ETbb-Sup}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-sup-ot1
+\DeclareFontShape{OT1}{ETbb-Sup}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-sup-ot1
+\DeclareFontShape{OT1}{ETbb-Sup}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{regular}{sl}{
-      <-> ssub * ETbb-Sup/regular/it
+\DeclareFontShape{OT1}{ETbb-Sup}{bold}{sl}{
+      <-> ssub * ETbb-Sup/bold/it
 }{}
 
 %
@@ -55,6 +55,10 @@
 
 %   m --> regular
 
+\DeclareFontShape{OT1}{ETbb-Sup}{m}{n}{
+      <-> alias * ETbb-Sup/regular/n
+}{}
+
 \DeclareFontShape{OT1}{ETbb-Sup}{m}{sl}{
       <-> alias * ETbb-Sup/regular/sl
 }{}
@@ -63,35 +67,31 @@
       <-> alias * ETbb-Sup/regular/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{m}{n}{
-      <-> alias * ETbb-Sup/regular/n
-}{}
-
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{ETbb-Sup}{b}{n}{
-      <-> alias * ETbb-Sup/bold/n
-}{}
-
 \DeclareFontShape{OT1}{ETbb-Sup}{b}{it}{
       <-> alias * ETbb-Sup/bold/it
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Sup}{b}{n}{
+      <-> alias * ETbb-Sup/bold/n
+}{}
+
 \DeclareFontShape{OT1}{ETbb-Sup}{b}{sl}{
       <-> alias * ETbb-Sup/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{bx}{it}{
-      <-> ssub * ETbb-Sup/b/it
+\DeclareFontShape{OT1}{ETbb-Sup}{bx}{n}{
+      <-> ssub * ETbb-Sup/b/n
 }{}
 
 \DeclareFontShape{OT1}{ETbb-Sup}{bx}{sl}{
       <-> ssub * ETbb-Sup/b/sl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{bx}{n}{
-      <-> ssub * ETbb-Sup/b/n
+\DeclareFontShape{OT1}{ETbb-Sup}{bx}{it}{
+      <-> ssub * ETbb-Sup/b/it
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TLF.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TLF.fd
index 5e7e0ec31bc..be483413707 100644
--- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TLF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TLF.fd
@@ -1,7 +1,10 @@
-%% Generated by autoinst on 2020/06/27
 %%
 \ProvidesFile{OT1ETbb-TLF.fd}
-    [2020/06/27 (autoinst)  Font definitions for OT1/ETbb-TLF.]
+    [2020/02/15  Font definitions for OT1/ETbb-TLF.]
+
+\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
@@ -20,57 +30,65 @@
 \DeclareFontFamily{OT1}{ETbb-TLF}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{ETbb-TLF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb-Regular-tlf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{nw}{
+      <-> \ETbb@@scale ETbb-Bold-tlf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-tlf-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{sw}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tlf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-tlf-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tlf\ETbb@@swashQ-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb-Italic-tlf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{n}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-tlf\ETbb@@swashQ-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{regular}{scsl}{
-      <-> ssub * ETbb-TLF/regular/scit
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{regular}{sl}{
-      <-> ssub * ETbb-TLF/regular/it
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tlf-sc-ot1
 }{}
 
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{scsl}{
+      <-> ssub * ETbb-TLF/bold/scit
+}{}
 
-%   ----  bold  ----
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{sl}{
+      <-> ssub * ETbb-TLF/bold/it
+}{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{sc}{
-      <-> \ETbb@@scale ETbb-Bold-tlf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-tlf-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tlf\ETbb@@swashQ-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{n}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tlf\ETbb@@swashQ-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{scsl}{
-      <-> ssub * ETbb-TLF/bold/scit
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{scsl}{
+      <-> ssub * ETbb-TLF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{sl}{
-      <-> ssub * ETbb-TLF/bold/it
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{sl}{
+      <-> ssub * ETbb-TLF/regular/it
 }{}
 
 %
@@ -79,33 +97,49 @@
 
 %   m --> regular
 
-\DeclareFontShape{OT1}{ETbb-TLF}{m}{scit}{
-      <-> alias * ETbb-TLF/regular/scit
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{sl}{
+      <-> alias * ETbb-TLF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{m}{scsl}{
-      <-> alias * ETbb-TLF/regular/scsl
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{nw}{
+      <-> alias * ETbb-TLF/regular/nw
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{sc}{
+      <-> alias * ETbb-TLF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TLF}{m}{it}{
       <-> alias * ETbb-TLF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{m}{sl}{
-      <-> alias * ETbb-TLF/regular/sl
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{n}{
+      <-> alias * ETbb-TLF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{m}{sc}{
-      <-> alias * ETbb-TLF/regular/sc
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{scsl}{
+      <-> alias * ETbb-TLF/regular/scsl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{m}{n}{
-      <-> alias * ETbb-TLF/regular/n
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{scit}{
+      <-> alias * ETbb-TLF/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{sl}{
+      <-> alias * ETbb-TLF/regular/sl
 }{}
 
 
 %   b --> bold
 
+\DeclareFontShape{OT1}{ETbb-TLF}{b}{sw}{
+      <-> alias * ETbb-TLF/bold/sw
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TLF}{b}{nw}{
+      <-> alias * ETbb-TLF/bold/nw
+}{}
+
 \DeclareFontShape{OT1}{ETbb-TLF}{b}{scsl}{
       <-> alias * ETbb-TLF/bold/scsl
 }{}
@@ -114,20 +148,24 @@
       <-> alias * ETbb-TLF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{b}{sl}{
-      <-> alias * ETbb-TLF/bold/sl
-}{}
-
 \DeclareFontShape{OT1}{ETbb-TLF}{b}{it}{
       <-> alias * ETbb-TLF/bold/it
 }{}
 
+\DeclareFontShape{OT1}{ETbb-TLF}{b}{n}{
+      <-> alias * ETbb-TLF/bold/n
+}{}
+
 \DeclareFontShape{OT1}{ETbb-TLF}{b}{sc}{
       <-> alias * ETbb-TLF/bold/sc
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{b}{n}{
-      <-> alias * ETbb-TLF/bold/n
+\DeclareFontShape{OT1}{ETbb-TLF}{b}{sl}{
+      <-> alias * ETbb-TLF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TLF}{bx}{sl}{
+      <-> ssub * ETbb-TLF/b/sl
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TLF}{bx}{scit}{
@@ -150,8 +188,12 @@
       <-> ssub * ETbb-TLF/b/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bx}{sl}{
-      <-> ssub * ETbb-TLF/b/sl
+\DeclareFontShape{OT1}{ETbb-TLF}{bx}{nw}{
+      <-> ssub * ETbb-TLF/b/nw
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TLF}{bx}{sw}{
+      <-> ssub * ETbb-TLF/b/sw
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TOsF.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TOsF.fd
index 8b47e6b142e..2008624f51b 100644
--- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/06/30
 %%
 \ProvidesFile{OT1ETbb-TOsF.fd}
-    [2020/06/27 (autoinst)  Font definitions for OT1/ETbb-TOsF.]
+    [2020/06/30 (autoinst)  Font definitions for OT1/ETbb-TOsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,57 +20,73 @@
 \DeclareFontFamily{OT1}{ETbb-TOsF}{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-tosf-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{sc}{
+      <-> \ETbb@@scale ETbb-Regular-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{sc}{
-      <-> \ETbb@@scale ETbb-Bold-tosf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb-Italic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{sw}{
+      <-> \ETbb@@scale ETbb-Italic-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{nw}{
+      <-> \ETbb@@scale ETbb-Regular-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scsl}{
-      <-> ssub * ETbb-TOsF/bold/scit
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{sl}{
-      <-> ssub * ETbb-TOsF/bold/it
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-tosf-ot1
 }{}
 
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{scsl}{
+      <-> ssub * ETbb-TOsF/regular/scit
+}{}
 
-%   ----  regular  ----
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{sl}{
+      <-> ssub * ETbb-TOsF/regular/it
+}{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-tosf-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb-Regular-tosf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{sw}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-tosf-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb-Italic-tosf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{nw}{
+      <-> \ETbb@@scale ETbb-Bold-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{scsl}{
-      <-> ssub * ETbb-TOsF/regular/scit
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{sl}{
-      <-> ssub * ETbb-TOsF/regular/it
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{sc}{
+      <-> \ETbb@@scale ETbb-Bold-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scsl}{
+      <-> ssub * ETbb-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{sl}{
+      <-> ssub * ETbb-TOsF/bold/it
 }{}
 
 %
@@ -79,33 +95,57 @@
 
 %   m --> regular
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{m}{it}{
-      <-> alias * ETbb-TOsF/regular/it
+\DeclareFontShape{OT1}{ETbb-TOsF}{m}{sc}{
+      <-> alias * ETbb-TOsF/regular/sc
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{m}{sl}{
-      <-> alias * ETbb-TOsF/regular/sl
+\DeclareFontShape{OT1}{ETbb-TOsF}{m}{nw}{
+      <-> alias * ETbb-TOsF/regular/nw
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{m}{sc}{
-      <-> alias * ETbb-TOsF/regular/sc
+\DeclareFontShape{OT1}{ETbb-TOsF}{m}{it}{
+      <-> alias * ETbb-TOsF/regular/it
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TOsF}{m}{n}{
       <-> alias * ETbb-TOsF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{m}{scit}{
-      <-> alias * ETbb-TOsF/regular/scit
+\DeclareFontShape{OT1}{ETbb-TOsF}{m}{sw}{
+      <-> alias * ETbb-TOsF/regular/sw
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TOsF}{m}{sl}{
+      <-> alias * ETbb-TOsF/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TOsF}{m}{scsl}{
       <-> alias * ETbb-TOsF/regular/scsl
 }{}
 
+\DeclareFontShape{OT1}{ETbb-TOsF}{m}{scit}{
+      <-> alias * ETbb-TOsF/regular/scit
+}{}
+
 
 %   b --> bold
 
+\DeclareFontShape{OT1}{ETbb-TOsF}{b}{nw}{
+      <-> alias * ETbb-TOsF/bold/nw
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TOsF}{b}{n}{
+      <-> alias * ETbb-TOsF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TOsF}{b}{it}{
+      <-> alias * ETbb-TOsF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TOsF}{b}{sw}{
+      <-> alias * ETbb-TOsF/bold/sw
+}{}
+
 \DeclareFontShape{OT1}{ETbb-TOsF}{b}{scsl}{
       <-> alias * ETbb-TOsF/bold/scsl
 }{}
@@ -114,38 +154,30 @@
       <-> alias * ETbb-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{b}{n}{
-      <-> alias * ETbb-TOsF/bold/n
+\DeclareFontShape{OT1}{ETbb-TOsF}{b}{sl}{
+      <-> alias * ETbb-TOsF/bold/sl
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TOsF}{b}{sc}{
       <-> alias * ETbb-TOsF/bold/sc
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{b}{sl}{
-      <-> alias * ETbb-TOsF/bold/sl
-}{}
-
-\DeclareFontShape{OT1}{ETbb-TOsF}{b}{it}{
-      <-> alias * ETbb-TOsF/bold/it
+\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{n}{
+      <-> ssub * ETbb-TOsF/b/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{sc}{
-      <-> ssub * ETbb-TOsF/b/sc
+\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{nw}{
+      <-> ssub * ETbb-TOsF/b/nw
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{n}{
-      <-> ssub * ETbb-TOsF/b/n
+\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{sw}{
+      <-> ssub * ETbb-TOsF/b/sw
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TOsF}{bx}{it}{
       <-> ssub * ETbb-TOsF/b/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{sl}{
-      <-> ssub * ETbb-TOsF/b/sl
-}{}
-
 \DeclareFontShape{OT1}{ETbb-TOsF}{bx}{scit}{
       <-> ssub * ETbb-TOsF/b/scit
 }{}
@@ -154,4 +186,12 @@
       <-> ssub * ETbb-TOsF/b/scsl
 }{}
 
+\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{sl}{
+      <-> ssub * ETbb-TOsF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{sc}{
+      <-> ssub * ETbb-TOsF/b/sc
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Dnom.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Dnom.fd
index a0a2bb28576..d3c5e759422 100644
--- a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Dnom.fd
+++ b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Dnom.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{T1ETbb-Dnom.fd}
-    [2020/06/27 (autoinst)  Font definitions for T1/ETbb-Dnom.]
+    [2020/07/01 (autoinst)  Font definitions for T1/ETbb-Dnom.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,14 @@
 
 %   ----  bold  ----
 
-\DeclareFontShape{T1}{ETbb-Dnom}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-dnom-t1
-}{}
-
 \DeclareFontShape{T1}{ETbb-Dnom}{bold}{n}{
       <-> \ETbb@@scale ETbb-Bold-dnom-t1
 }{}
 
+\DeclareFontShape{T1}{ETbb-Dnom}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-dnom-t1
+}{}
+
 \DeclareFontShape{T1}{ETbb-Dnom}{bold}{sl}{
       <-> ssub * ETbb-Dnom/bold/it
 }{}
@@ -55,14 +55,14 @@
 
 %   m --> regular
 
-\DeclareFontShape{T1}{ETbb-Dnom}{m}{n}{
-      <-> alias * ETbb-Dnom/regular/n
-}{}
-
 \DeclareFontShape{T1}{ETbb-Dnom}{m}{sl}{
       <-> alias * ETbb-Dnom/regular/sl
 }{}
 
+\DeclareFontShape{T1}{ETbb-Dnom}{m}{n}{
+      <-> alias * ETbb-Dnom/regular/n
+}{}
+
 \DeclareFontShape{T1}{ETbb-Dnom}{m}{it}{
       <-> alias * ETbb-Dnom/regular/it
 }{}
@@ -70,18 +70,22 @@
 
 %   b --> bold
 
-\DeclareFontShape{T1}{ETbb-Dnom}{b}{n}{
-      <-> alias * ETbb-Dnom/bold/n
-}{}
-
 \DeclareFontShape{T1}{ETbb-Dnom}{b}{sl}{
       <-> alias * ETbb-Dnom/bold/sl
 }{}
 
+\DeclareFontShape{T1}{ETbb-Dnom}{b}{n}{
+      <-> alias * ETbb-Dnom/bold/n
+}{}
+
 \DeclareFontShape{T1}{ETbb-Dnom}{b}{it}{
       <-> alias * ETbb-Dnom/bold/it
 }{}
 
+\DeclareFontShape{T1}{ETbb-Dnom}{bx}{sl}{
+      <-> ssub * ETbb-Dnom/b/sl
+}{}
+
 \DeclareFontShape{T1}{ETbb-Dnom}{bx}{n}{
       <-> ssub * ETbb-Dnom/b/n
 }{}
@@ -90,8 +94,4 @@
       <-> ssub * ETbb-Dnom/b/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Dnom}{bx}{sl}{
-      <-> ssub * ETbb-Dnom/b/sl
-}{}
-
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd
index 73722b110a6..a207ba97ea7 100644
--- a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd
+++ b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{T1ETbb-Inf.fd}
-    [2020/06/27 (autoinst)  Font definitions for T1/ETbb-Inf.]
+    [2020/07/01 (autoinst)  Font definitions for T1/ETbb-Inf.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{T1}{ETbb-Inf}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{T1}{ETbb-Inf}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-inf-t1
+\DeclareFontShape{T1}{ETbb-Inf}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-inf-t1
+\DeclareFontShape{T1}{ETbb-Inf}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-inf-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{regular}{sl}{
-      <-> ssub * ETbb-Inf/regular/it
+\DeclareFontShape{T1}{ETbb-Inf}{bold}{sl}{
+      <-> ssub * ETbb-Inf/bold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{T1}{ETbb-Inf}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-inf-t1
+\DeclareFontShape{T1}{ETbb-Inf}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-inf-t1
+\DeclareFontShape{T1}{ETbb-Inf}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-inf-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{bold}{sl}{
-      <-> ssub * ETbb-Inf/bold/it
+\DeclareFontShape{T1}{ETbb-Inf}{regular}{sl}{
+      <-> ssub * ETbb-Inf/regular/it
 }{}
 
 %
@@ -55,6 +55,10 @@
 
 %   m --> regular
 
+\DeclareFontShape{T1}{ETbb-Inf}{m}{sl}{
+      <-> alias * ETbb-Inf/regular/sl
+}{}
+
 \DeclareFontShape{T1}{ETbb-Inf}{m}{n}{
       <-> alias * ETbb-Inf/regular/n
 }{}
@@ -63,13 +67,13 @@
       <-> alias * ETbb-Inf/regular/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{m}{sl}{
-      <-> alias * ETbb-Inf/regular/sl
-}{}
-
 
 %   b --> bold
 
+\DeclareFontShape{T1}{ETbb-Inf}{b}{n}{
+      <-> alias * ETbb-Inf/bold/n
+}{}
+
 \DeclareFontShape{T1}{ETbb-Inf}{b}{sl}{
       <-> alias * ETbb-Inf/bold/sl
 }{}
@@ -78,18 +82,14 @@
       <-> alias * ETbb-Inf/bold/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{b}{n}{
-      <-> alias * ETbb-Inf/bold/n
+\DeclareFontShape{T1}{ETbb-Inf}{bx}{it}{
+      <-> ssub * ETbb-Inf/b/it
 }{}
 
 \DeclareFontShape{T1}{ETbb-Inf}{bx}{sl}{
       <-> ssub * ETbb-Inf/b/sl
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{bx}{it}{
-      <-> ssub * ETbb-Inf/b/it
-}{}
-
 \DeclareFontShape{T1}{ETbb-Inf}{bx}{n}{
       <-> ssub * ETbb-Inf/b/n
 }{}
diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-LF.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-LF.fd
index cb71b2c4b3a..682624e3f70 100644
--- a/Master/texmf-dist/tex/latex/etbb/T1ETbb-LF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/T1ETbb-LF.fd
@@ -3,6 +3,10 @@
 \ProvidesFile{T1ETbb-LF.fd}
     [2020/02/15 (autoinst)  Font definitions for T1/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}
 \gdef\@font@aliasinfo#1{%
@@ -29,8 +33,16 @@
 
 %   ----  bold  ----
 
+\DeclareFontShape{T1}{ETbb-LF}{bold}{nw}{
+      <-> \ETbb@@scale ETbb-Bold-lf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{ETbb-LF}{bold}{sw}{
+      <-> \ETbb@@scale ETbb-BoldItalic-lf-swash-t1
+}{}
+
 \DeclareFontShape{T1}{ETbb-LF}{bold}{it}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-lf-t1
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-lf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-LF}{bold}{scit}{
@@ -38,7 +50,7 @@
 }{}
 
 \DeclareFontShape{T1}{ETbb-LF}{bold}{n}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-lf-t1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-lf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-LF}{bold}{sc}{
@@ -56,8 +68,16 @@
 
 %   ----  regular  ----
 
+\DeclareFontShape{T1}{ETbb-LF}{regular}{nw}{
+      <-> \ETbb@@scale ETbb-Regular-lf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{ETbb-LF}{regular}{sw}{
+      <-> \ETbb@@scale ETbb-Italic-lf-swash-t1
+}{}
+
 \DeclareFontShape{T1}{ETbb-LF}{regular}{it}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-lf-t1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-lf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-LF}{regular}{sc}{
@@ -69,7 +89,7 @@
 }{}
 
 \DeclareFontShape{T1}{ETbb-LF}{regular}{n}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-lf-t1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-lf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-LF}{regular}{scsl}{
@@ -113,6 +133,14 @@
 
 %   b --> bold
 
+\DeclareFontShape{T1}{ETbb-LF}{b}{sw}{
+      <-> alias * ETbb-LF/bold/sw
+}{}
+
+\DeclareFontShape{T1}{ETbb-LF}{b}{nw}{
+      <-> alias * ETbb-LF/bold/nw
+}{}
+
 \DeclareFontShape{T1}{ETbb-LF}{b}{it}{
       <-> alias * ETbb-LF/bold/it
 }{}
@@ -161,4 +189,12 @@
       <-> ssub * ETbb-LF/b/sc
 }{}
 
+\DeclareFontShape{T1}{ETbb-LF}{bx}{nw}{
+      <-> ssub * ETbb-LF/b/nw
+}{}
+
+\DeclareFontShape{T1}{ETbb-LF}{bx}{sw}{
+      <-> ssub * ETbb-LF/b/sw
+}{}
+
 \endinput
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
diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd
index 90b8b2bbd4d..378a6ad038a 100644
--- a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd
+++ b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{T1ETbb-Sup.fd}
-    [2020/06/27 (autoinst)  Font definitions for T1/ETbb-Sup.]
+    [2020/07/01 (autoinst)  Font definitions for T1/ETbb-Sup.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -37,14 +37,14 @@
 
 %   ----  bold  ----
 
-\DeclareFontShape{T1}{ETbb-Sup}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-sup-t1
-}{}
-
 \DeclareFontShape{T1}{ETbb-Sup}{bold}{it}{
       <-> \ETbb@@scale ETbb-BoldItalic-sup-t1
 }{}
 
+\DeclareFontShape{T1}{ETbb-Sup}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-sup-t1
+}{}
+
 \DeclareFontShape{T1}{ETbb-Sup}{bold}{sl}{
       <-> ssub * ETbb-Sup/bold/it
 }{}
@@ -55,6 +55,10 @@
 
 %   m --> regular
 
+\DeclareFontShape{T1}{ETbb-Sup}{m}{n}{
+      <-> alias * ETbb-Sup/regular/n
+}{}
+
 \DeclareFontShape{T1}{ETbb-Sup}{m}{sl}{
       <-> alias * ETbb-Sup/regular/sl
 }{}
@@ -63,33 +67,29 @@
       <-> alias * ETbb-Sup/regular/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Sup}{m}{n}{
-      <-> alias * ETbb-Sup/regular/n
-}{}
-
 
 %   b --> bold
 
-\DeclareFontShape{T1}{ETbb-Sup}{b}{n}{
-      <-> alias * ETbb-Sup/bold/n
+\DeclareFontShape{T1}{ETbb-Sup}{b}{it}{
+      <-> alias * ETbb-Sup/bold/it
 }{}
 
 \DeclareFontShape{T1}{ETbb-Sup}{b}{sl}{
       <-> alias * ETbb-Sup/bold/sl
 }{}
 
-\DeclareFontShape{T1}{ETbb-Sup}{b}{it}{
-      <-> alias * ETbb-Sup/bold/it
-}{}
-
-\DeclareFontShape{T1}{ETbb-Sup}{bx}{n}{
-      <-> ssub * ETbb-Sup/b/n
+\DeclareFontShape{T1}{ETbb-Sup}{b}{n}{
+      <-> alias * ETbb-Sup/bold/n
 }{}
 
 \DeclareFontShape{T1}{ETbb-Sup}{bx}{sl}{
       <-> ssub * ETbb-Sup/b/sl
 }{}
 
+\DeclareFontShape{T1}{ETbb-Sup}{bx}{n}{
+      <-> ssub * ETbb-Sup/b/n
+}{}
+
 \DeclareFontShape{T1}{ETbb-Sup}{bx}{it}{
       <-> ssub * ETbb-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-TLF.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-TLF.fd
index f33f58df88d..12e0a438e0b 100644
--- a/Master/texmf-dist/tex/latex/etbb/T1ETbb-TLF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/T1ETbb-TLF.fd
@@ -2,6 +2,10 @@
 \ProvidesFile{T1ETbb-TLF.fd}
     [2020/02/15  Font definitions for T1/ETbb-TLF.]
 
+\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}
 \gdef\@font@aliasinfo#1{%
@@ -28,12 +32,20 @@
 
 %   ----  bold  ----
 
+\DeclareFontShape{T1}{ETbb-TLF}{bold}{nw}{
+      <-> \ETbb@@scale ETbb-Bold-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{ETbb-TLF}{bold}{sw}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tlf-swash-t1
+}{}
+
 \DeclareFontShape{T1}{ETbb-TLF}{bold}{it}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tlf-t1
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tlf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-TLF}{bold}{n}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-tlf-t1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-tlf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-TLF}{bold}{sc}{
@@ -64,11 +76,11 @@
 }{}
 
 \DeclareFontShape{T1}{ETbb-TLF}{regular}{it}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tlf-t1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tlf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-TLF}{regular}{n}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tlf-t1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tlf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-TLF}{regular}{scsl}{
@@ -85,6 +97,14 @@
 
 %   m --> regular
 
+\DeclareFontShape{T1}{ETbb-TLF}{m}{sl}{
+      <-> alias * ETbb-TLF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{ETbb-TLF}{m}{nw}{
+      <-> alias * ETbb-TLF/regular/nw
+}{}
+
 \DeclareFontShape{T1}{ETbb-TLF}{m}{sc}{
       <-> alias * ETbb-TLF/regular/sc
 }{}
@@ -112,6 +132,14 @@
 
 %   b --> bold
 
+\DeclareFontShape{T1}{ETbb-TLF}{b}{sw}{
+      <-> alias * ETbb-TLF/bold/sw
+}{}
+
+\DeclareFontShape{T1}{ETbb-TLF}{b}{nw}{
+      <-> alias * ETbb-TLF/bold/nw
+}{}
+
 \DeclareFontShape{T1}{ETbb-TLF}{b}{scsl}{
       <-> alias * ETbb-TLF/bold/scsl
 }{}
@@ -160,4 +188,12 @@
       <-> ssub * ETbb-TLF/b/it
 }{}
 
+\DeclareFontShape{T1}{ETbb-TLF}{bx}{nw}{
+      <-> ssub * ETbb-TLF/b/nw
+}{}
+
+\DeclareFontShape{T1}{ETbb-TLF}{bx}{sw}{
+      <-> ssub * ETbb-TLF/b/sw
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-TOsF.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-TOsF.fd
index 50db178876b..d10195d4690 100644
--- a/Master/texmf-dist/tex/latex/etbb/T1ETbb-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/T1ETbb-TOsF.fd
@@ -1,7 +1,10 @@
-%% Generated by autoinst on 2020/02/15
 %%
 \ProvidesFile{T1ETbb-TOsF.fd}
-    [2020/02/15 (autoinst)  Font definitions for T1/ETbb-TOsF.]
+    [2020/02/15  Font definitions for T1/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}
@@ -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
@@ -29,20 +32,28 @@
 
 %   ----  bold  ----
 
-\DeclareFontShape{T1}{ETbb-TOsF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{ETbb-TOsF}{bold}{nw}{
+      <-> \ETbb@@scale ETbb-Bold-tosf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{ETbb-TOsF}{bold}{sw}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tosf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{ETbb-TOsF}{bold}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tosf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-TOsF}{bold}{n}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-tosf-t1
+      <-> \ETbb@@scale ETbb\ETbb@@S-Bold-tosf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-TOsF}{bold}{sc}{
       <-> \ETbb@@scale ETbb\ETbb@@S-Bold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{bold}{it}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tosf-t1
+\DeclareFontShape{T1}{ETbb-TOsF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-BoldItalic-tosf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-TOsF}{bold}{scsl}{
@@ -56,20 +67,20 @@
 
 %   ----  regular  ----
 
-\DeclareFontShape{T1}{ETbb-TOsF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tosf-sc-t1
+\DeclareFontShape{T1}{ETbb-TOsF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{regular}{n}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tosf-t1
+\DeclareFontShape{T1}{ETbb-TOsF}{regular}{sc}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tosf-sc-t1
+\DeclareFontShape{T1}{ETbb-TOsF}{regular}{it}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tosf\ETbb@@swashQ-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb\ETbb@@S-Italic-tosf-t1
+\DeclareFontShape{T1}{ETbb-TOsF}{regular}{n}{
+      <-> \ETbb@@scale ETbb\ETbb@@S-Regular-tosf\ETbb@@swashQ-t1
 }{}
 
 \DeclareFontShape{T1}{ETbb-TOsF}{regular}{scsl}{
@@ -86,18 +97,30 @@
 
 %   m --> regular
 
-\DeclareFontShape{T1}{ETbb-TOsF}{m}{it}{
-      <-> alias * ETbb-TOsF/regular/it
+\DeclareFontShape{T1}{ETbb-TOsF}{m}{sl}{
+      <-> alias * ETbb-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{m}{scsl}{
-      <-> alias * ETbb-TOsF/regular/scsl
+\DeclareFontShape{T1}{ETbb-TOsF}{m}{nw}{
+      <-> alias * ETbb-TOsF/regular/nw
+}{}
+
+\DeclareFontShape{T1}{ETbb-TOsF}{m}{sc}{
+      <-> alias * ETbb-TOsF/regular/sc
+}{}
+
+\DeclareFontShape{T1}{ETbb-TOsF}{m}{it}{
+      <-> alias * ETbb-TOsF/regular/it
 }{}
 
 \DeclareFontShape{T1}{ETbb-TOsF}{m}{n}{
       <-> alias * ETbb-TOsF/regular/n
 }{}
 
+\DeclareFontShape{T1}{ETbb-TOsF}{m}{scsl}{
+      <-> alias * ETbb-TOsF/regular/scsl
+}{}
+
 \DeclareFontShape{T1}{ETbb-TOsF}{m}{scit}{
       <-> alias * ETbb-TOsF/regular/scit
 }{}
@@ -106,59 +129,71 @@
       <-> alias * ETbb-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{m}{sc}{
-      <-> alias * ETbb-TOsF/regular/sc
-}{}
-
 
 %   b --> bold
 
-\DeclareFontShape{T1}{ETbb-TOsF}{b}{scsl}{
-      <-> alias * ETbb-TOsF/bold/scsl
+\DeclareFontShape{T1}{ETbb-TOsF}{b}{sw}{
+      <-> alias * ETbb-TOsF/bold/sw
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{b}{it}{
-      <-> alias * ETbb-TOsF/bold/it
+\DeclareFontShape{T1}{ETbb-TOsF}{b}{nw}{
+      <-> alias * ETbb-TOsF/bold/nw
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{b}{sc}{
-      <-> alias * ETbb-TOsF/bold/sc
+\DeclareFontShape{T1}{ETbb-TOsF}{b}{scsl}{
+      <-> alias * ETbb-TOsF/bold/scsl
 }{}
 
 \DeclareFontShape{T1}{ETbb-TOsF}{b}{scit}{
       <-> alias * ETbb-TOsF/bold/scit
 }{}
 
+\DeclareFontShape{T1}{ETbb-TOsF}{b}{it}{
+      <-> alias * ETbb-TOsF/bold/it
+}{}
+
 \DeclareFontShape{T1}{ETbb-TOsF}{b}{n}{
       <-> alias * ETbb-TOsF/bold/n
 }{}
 
+\DeclareFontShape{T1}{ETbb-TOsF}{b}{sc}{
+      <-> alias * ETbb-TOsF/bold/sc
+}{}
+
 \DeclareFontShape{T1}{ETbb-TOsF}{b}{sl}{
       <-> alias * ETbb-TOsF/bold/sl
 }{}
 
+\DeclareFontShape{T1}{ETbb-TOsF}{bx}{sl}{
+      <-> ssub * ETbb-TOsF/b/sl
+}{}
+
+\DeclareFontShape{T1}{ETbb-TOsF}{bx}{scit}{
+      <-> ssub * ETbb-TOsF/b/scit
+}{}
+
 \DeclareFontShape{T1}{ETbb-TOsF}{bx}{scsl}{
       <-> ssub * ETbb-TOsF/b/scsl
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{bx}{it}{
-      <-> ssub * ETbb-TOsF/b/it
+\DeclareFontShape{T1}{ETbb-TOsF}{bx}{n}{
+      <-> ssub * ETbb-TOsF/b/n
 }{}
 
 \DeclareFontShape{T1}{ETbb-TOsF}{bx}{sc}{
       <-> ssub * ETbb-TOsF/b/sc
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{bx}{sl}{
-      <-> ssub * ETbb-TOsF/b/sl
+\DeclareFontShape{T1}{ETbb-TOsF}{bx}{it}{
+      <-> ssub * ETbb-TOsF/b/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{bx}{scit}{
-      <-> ssub * ETbb-TOsF/b/scit
+\DeclareFontShape{T1}{ETbb-TOsF}{bx}{nw}{
+      <-> ssub * ETbb-TOsF/b/nw
 }{}
 
-\DeclareFontShape{T1}{ETbb-TOsF}{bx}{n}{
-      <-> ssub * ETbb-TOsF/b/n
+\DeclareFontShape{T1}{ETbb-TOsF}{bx}{sw}{
+      <-> ssub * ETbb-TOsF/b/sw
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd
index 8f2c4b38d90..ad3ef7c562e 100644
--- a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{TS1ETbb-LF.fd}
-    [2020/06/27 (autoinst)  Font definitions for TS1/ETbb-LF.]
+    [2020/07/01 (autoinst)  Font definitions for TS1/ETbb-LF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{TS1}{ETbb-LF}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{TS1}{ETbb-LF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-lf-ts1
+\DeclareFontShape{TS1}{ETbb-LF}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-lf-ts1
+\DeclareFontShape{TS1}{ETbb-LF}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{regular}{sl}{
-      <-> ssub * ETbb-LF/regular/it
+\DeclareFontShape{TS1}{ETbb-LF}{bold}{sl}{
+      <-> ssub * ETbb-LF/bold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{TS1}{ETbb-LF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-lf-ts1
+\DeclareFontShape{TS1}{ETbb-LF}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-lf-ts1
+\DeclareFontShape{TS1}{ETbb-LF}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{bold}{sl}{
-      <-> ssub * ETbb-LF/bold/it
+\DeclareFontShape{TS1}{ETbb-LF}{regular}{sl}{
+      <-> ssub * ETbb-LF/regular/it
 }{}
 
 %
@@ -70,10 +70,6 @@
 
 %   b --> bold
 
-\DeclareFontShape{TS1}{ETbb-LF}{b}{it}{
-      <-> alias * ETbb-LF/bold/it
-}{}
-
 \DeclareFontShape{TS1}{ETbb-LF}{b}{sl}{
       <-> alias * ETbb-LF/bold/sl
 }{}
@@ -82,6 +78,14 @@
       <-> alias * ETbb-LF/bold/n
 }{}
 
+\DeclareFontShape{TS1}{ETbb-LF}{b}{it}{
+      <-> alias * ETbb-LF/bold/it
+}{}
+
+\DeclareFontShape{TS1}{ETbb-LF}{bx}{it}{
+      <-> ssub * ETbb-LF/b/it
+}{}
+
 \DeclareFontShape{TS1}{ETbb-LF}{bx}{n}{
       <-> ssub * ETbb-LF/b/n
 }{}
@@ -90,8 +94,4 @@
       <-> ssub * ETbb-LF/b/sl
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{bx}{it}{
-      <-> ssub * ETbb-LF/b/it
-}{}
-
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd
index cd8067c7d0e..85e7778cbe9 100644
--- a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{TS1ETbb-OsF.fd}
-    [2020/06/27 (autoinst)  Font definitions for TS1/ETbb-OsF.]
+    [2020/07/01 (autoinst)  Font definitions for TS1/ETbb-OsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -37,14 +37,14 @@
 
 %   ----  regular  ----
 
-\DeclareFontShape{TS1}{ETbb-OsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-osf-ts1
-}{}
-
 \DeclareFontShape{TS1}{ETbb-OsF}{regular}{n}{
       <-> \ETbb@@scale ETbb-Regular-osf-ts1
 }{}
 
+\DeclareFontShape{TS1}{ETbb-OsF}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-osf-ts1
+}{}
+
 \DeclareFontShape{TS1}{ETbb-OsF}{regular}{sl}{
       <-> ssub * ETbb-OsF/regular/it
 }{}
@@ -55,16 +55,16 @@
 
 %   m --> regular
 
-\DeclareFontShape{TS1}{ETbb-OsF}{m}{n}{
-      <-> alias * ETbb-OsF/regular/n
+\DeclareFontShape{TS1}{ETbb-OsF}{m}{it}{
+      <-> alias * ETbb-OsF/regular/it
 }{}
 
 \DeclareFontShape{TS1}{ETbb-OsF}{m}{sl}{
       <-> alias * ETbb-OsF/regular/sl
 }{}
 
-\DeclareFontShape{TS1}{ETbb-OsF}{m}{it}{
-      <-> alias * ETbb-OsF/regular/it
+\DeclareFontShape{TS1}{ETbb-OsF}{m}{n}{
+      <-> alias * ETbb-OsF/regular/n
 }{}
 
 
diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd
index 3a5605c12ff..b0dc0d1af47 100644
--- a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{TS1ETbb-TLF.fd}
-    [2020/06/27 (autoinst)  Font definitions for TS1/ETbb-TLF.]
+    [2020/07/01 (autoinst)  Font definitions for TS1/ETbb-TLF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -55,14 +55,14 @@
 
 %   m --> regular
 
-\DeclareFontShape{TS1}{ETbb-TLF}{m}{n}{
-      <-> alias * ETbb-TLF/regular/n
-}{}
-
 \DeclareFontShape{TS1}{ETbb-TLF}{m}{it}{
       <-> alias * ETbb-TLF/regular/it
 }{}
 
+\DeclareFontShape{TS1}{ETbb-TLF}{m}{n}{
+      <-> alias * ETbb-TLF/regular/n
+}{}
+
 \DeclareFontShape{TS1}{ETbb-TLF}{m}{sl}{
       <-> alias * ETbb-TLF/regular/sl
 }{}
@@ -86,12 +86,12 @@
       <-> ssub * ETbb-TLF/b/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TLF}{bx}{sl}{
-      <-> ssub * ETbb-TLF/b/sl
-}{}
-
 \DeclareFontShape{TS1}{ETbb-TLF}{bx}{n}{
       <-> ssub * ETbb-TLF/b/n
 }{}
 
+\DeclareFontShape{TS1}{ETbb-TLF}{bx}{sl}{
+      <-> ssub * ETbb-TLF/b/sl
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd
index 690053d29e4..818b85f53ed 100644
--- a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/06/27
+%% Generated by autoinst on 2020/07/01
 %%
 \ProvidesFile{TS1ETbb-TOsF.fd}
-    [2020/06/27 (autoinst)  Font definitions for TS1/ETbb-TOsF.]
+    [2020/07/01 (autoinst)  Font definitions for TS1/ETbb-TOsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{TS1}{ETbb-TOsF}{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-tosf-ts1
+\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{sl}{
-      <-> ssub * ETbb-TOsF/bold/it
+\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{sl}{
+      <-> ssub * ETbb-TOsF/regular/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-tosf-ts1
+\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-tosf-ts1
+\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{sl}{
-      <-> ssub * ETbb-TOsF/regular/it
+\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{sl}{
+      <-> ssub * ETbb-TOsF/bold/it
 }{}
 
 %
@@ -55,21 +55,25 @@
 
 %   m --> regular
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{m}{n}{
-      <-> alias * ETbb-TOsF/regular/n
+\DeclareFontShape{TS1}{ETbb-TOsF}{m}{it}{
+      <-> alias * ETbb-TOsF/regular/it
 }{}
 
 \DeclareFontShape{TS1}{ETbb-TOsF}{m}{sl}{
       <-> alias * ETbb-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{m}{it}{
-      <-> alias * ETbb-TOsF/regular/it
+\DeclareFontShape{TS1}{ETbb-TOsF}{m}{n}{
+      <-> alias * ETbb-TOsF/regular/n
 }{}
 
 
 %   b --> bold
 
+\DeclareFontShape{TS1}{ETbb-TOsF}{b}{n}{
+      <-> alias * ETbb-TOsF/bold/n
+}{}
+
 \DeclareFontShape{TS1}{ETbb-TOsF}{b}{sl}{
       <-> alias * ETbb-TOsF/bold/sl
 }{}
@@ -78,18 +82,14 @@
       <-> alias * ETbb-TOsF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{b}{n}{
-      <-> alias * ETbb-TOsF/bold/n
+\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{it}{
+      <-> ssub * ETbb-TOsF/b/it
 }{}
 
 \DeclareFontShape{TS1}{ETbb-TOsF}{bx}{sl}{
       <-> ssub * ETbb-TOsF/b/sl
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{it}{
-      <-> ssub * ETbb-TOsF/b/it
-}{}
-
 \DeclareFontShape{TS1}{ETbb-TOsF}{bx}{n}{
       <-> ssub * ETbb-TOsF/b/n
 }{}
author	Karl Berry <karl@freefriends.org>	2020-07-02 21:43:35 +0000
committer	Karl Berry <karl@freefriends.org>	2020-07-02 21:43:35 +0000
commit	fed87c2d746629366811de126bfa863e301ec049 (patch)
tree	775c95006d348cb3e81a021b69ace909e027850c
parent	63baeff02fd19f54fcfdf472f9b29d79bd58674a (diff)