etbb (19dec21)

git-svn-id: svn://tug.org/texlive/trunk@61346 c570f23f-e606-0410-a88d-b1316a301751

632 files changed, 1328 insertions, 1568 deletions

diff --git a/Master/texmf-dist/doc/fonts/etbb/README b/Master/texmf-dist/doc/fonts/etbb/README
index c6285b1d53f..8c1571ad8a6 100644
--- a/Master/texmf-dist/doc/fonts/etbb/README
+++ b/Master/texmf-dist/doc/fonts/etbb/README
@@ -3,7 +3,12 @@ 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.053 2021-09-02
+Current version: 1.054 2021-12-18
+
+Changes in version 1.054
+Version 1.053 seems to have corrupted the kerning tables. 
+This version restores the kerning tables to their values in version
+1.051.
 
 Changes in version 1.053
 Modified a number of settings in the otf files in order that the otf fonts work as expected in Windows 10. (Thanks Espen Solheim.)
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 ae9b5c6f8cc..4d0a1968158 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: Tue Jun 30 20:58:23 2020
+Comment Generated by FontForge 20201107
+Comment Creation Date: Sat Dec 18 18:10:39 2021
 FontName ETbb-Bold
 FullName ET Bembo Bold
 FamilyName ETbb
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 f7641cf0a21..76c9cfba4b5 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: Tue Jun 30 20:57:47 2020
+Comment Generated by FontForge 20201107
+Comment Creation Date: Sat Dec 18 18:11:00 2021
 FontName ETbb-BoldItalic
 FullName ET Bembo Bold Italic
 FamilyName ETbb
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 b63dd551ff1..e003c6384b4 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: Tue Jun 30 20:58:01 2020
+Comment Generated by FontForge 20201107
+Comment Creation Date: Sat Dec 18 18:10:50 2021
 FontName ETbb-Italic
 FullName ET Bembo Italic
 FamilyName ETbb
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 8f4b2afae1e..83e732191d9 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: Tue Jun 30 20:58:09 2020
+Comment Generated by FontForge 20201107
+Comment Creation Date: Sat Dec 18 18:10:22 2021
 FontName ETbb-Regular
 FullName ET Bembo Regular
 FamilyName ETbb
@@ -8,7 +8,7 @@ Weight Regular
 Notice (ETBembo designed for Edward Tufte / Graphics Press Copyright (c) 2002 Dmitry Krasny / Deka Design)
 Comment ETBook Copyright (c) 2015 Dmitry Krasny, Bonnie Scranton, Edward Tufte.
 Comment XETBook Copyright (c) 2019 Daniel Benjamin Miller
-Comment ETbb Copyright (c) 2020 Michael Sharpe
+Comment ETbb Copyright (c) 2020-2021 Michael Sharpe
 ItalicAngle 0
 IsFixedPitch false
 UnderlinePosition -261
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_vtabip.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_4h6gms.enc
index 2664807efce..7677c2886d7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_vtabip.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_4h6gms.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_vtabipmm4e5xag7gq2nwm3p6gc
-% Encoding created by otftotfm on Wed Jul  1 20:56:15 2020
+%%AutoEnc1_4h6gmskd3mmlebycwa2rvw3mfh
+% Encoding created by otftotfm on Sat Dec 18 18:24:33 2021
 % Command line follows encoding
-/AutoEnc_vtabipmm4e5xag7gq2nwm3p6gc [
+/AutoEnc1_4h6gmskd3mmlebycwa2rvw3mfh [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,20 +45,20 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %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
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hah5or.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_55s5uq.enc
index c3c154736e9..1a2ff8cd1fb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hah5or.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_55s5uq.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_hah5orya7ruvjmqzsfnwzilfbf
-% Encoding created by otftotfm on Wed Jul  1 20:56:11 2020
+%%AutoEnc1_55s5uqo65pdpku3cr7xsyxg5of
+% Encoding created by otftotfm on Sat Dec 18 18:24:28 2021
 % Command line follows encoding
-/AutoEnc_hah5orya7ruvjmqzsfnwzilfbf [
+/AutoEnc1_55s5uqo65pdpku3cr7xsyxg5of [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,20 +45,20 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %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
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=onum --feature=pnum --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_x5rskw.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_6b4rhp.enc
index ae12e6cb7f7..1e5ed828e42 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_x5rskw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_6b4rhp.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_x5rskwfdgrpeovvnp5dgzgax7e
-% Encoding created by otftotfm on Wed Jul  1 20:56:17 2020
+%%AutoEnc1_6b4rhpsa6pxda3dbpecbcbe4hh
+% Encoding created by otftotfm on Sat Dec 18 18:24:21 2021
 % Command line follows encoding
-/AutoEnc1_x5rskwfdgrpeovvnp5dgzgax7e [
+/AutoEnc1_6b4rhpsa6pxda3dbpecbcbe4hh [
 %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
+  /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -45,22 +45,24 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %E0
   /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
   /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
 %F0
   /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
-  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /uni1E9E.c2sc
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Bold.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Bold.otf
 % ETbb-Bold-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_sp7p3o.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_6bb767.enc
index 0085c04b31e..6dd653754db 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_sp7p3o.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_6bb767.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_sp7p3ogzc33lxwuaxiyoy7i63e
-% Encoding created by otftotfm on Wed Jul  1 20:56:37 2020
+%%AutoEnc1_6bb767vgyf6bkkruaompchxqgf
+% Encoding created by otftotfm on Sat Dec 18 18:24:59 2021
 % Command line follows encoding
-/AutoEnc1_sp7p3ogzc33lxwuaxiyoy7i63e [
+/AutoEnc1_6bb767vgyf6bkkruaompchxqgf [
 %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
+  /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -45,22 +45,24 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %E0
   /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
   /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
 %F0
   /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
-  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /uni1E9E.c2sc
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Italic.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Italic.otf
 % ETbb-Italic-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rwec2l.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_cp6bsz.enc
index ab8987bfd05..deecef4e5f5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rwec2l.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_cp6bsz.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_rwec2ltafusdbpjxc5bs7fdg3b
-% Encoding created by otftotfm on Wed Jul  1 20:56:40 2020
+%%AutoEnc1_cp6bsz5iopjtxmf6p55nagrmkh
+% Encoding created by otftotfm on Sat Dec 18 18:25:03 2021
 % Command line follows encoding
-/AutoEnc_rwec2ltafusdbpjxc5bs7fdg3b [
+/AutoEnc1_cp6bsz5iopjtxmf6p55nagrmkh [
 %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
+  /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -45,22 +45,24 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %E0
   /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
   /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
 %F0
   /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
-  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /germandbls.sc.ss02
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Italic.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Italic.otf
 % ETbb-Italic-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yziesh.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_frt5zk.enc
index d984e30427f..d298eae353c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yziesh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_frt5zk.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_yzieshsd44fbunydsrfnu5dloe
-% Encoding created by otftotfm on Wed Jul  1 20:56:10 2020
+%%AutoEnc1_frt5zk5mf5bi5r6kaiwbsdwm4h
+% Encoding created by otftotfm on Sat Dec 18 18:24:26 2021
 % Command line follows encoding
-/AutoEnc_yzieshsd44fbunydsrfnu5dloe [
+/AutoEnc1_frt5zk5mf5bi5r6kaiwbsdwm4h [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,20 +45,20 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %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
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_zxy3n5.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_gcyiic.enc
index aef2d878cb8..c6afd329149 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_zxy3n5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_gcyiic.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_zxy3n5aiatzd3xjlhm2urzyfuc
-% Encoding created by otftotfm on Wed Jul  1 20:56:12 2020
+%%AutoEnc1_gcyiicz4csxvfbjtqre3wkk2ma
+% Encoding created by otftotfm on Sat Dec 18 18:24:29 2021
 % Command line follows encoding
-/AutoEnc1_zxy3n5aiatzd3xjlhm2urzyfuc [
+/AutoEnc1_gcyiicz4csxvfbjtqre3wkk2ma [
 %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
+  /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -45,22 +45,24 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %E0
   /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
   /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
 %F0
   /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
-  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /uni1E9E.c2sc
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Bold.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Bold.otf
 % ETbb-Bold-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_mgm6re.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_gojfsq.enc
index aa0585978cf..41863fe16ec 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_mgm6re.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_gojfsq.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_mgm6reivyglzs2cwtx35q2y4ye
-% Encoding created by otftotfm on Wed Jul  1 20:56:18 2020
+%%AutoEnc1_gojfsqpn6o4h6lbxak4mkqz2pf
+% Encoding created by otftotfm on Sat Dec 18 18:24:22 2021
 % Command line follows encoding
-/AutoEnc_mgm6reivyglzs2cwtx35q2y4ye [
+/AutoEnc1_gojfsqpn6o4h6lbxak4mkqz2pf [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,20 +45,20 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %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
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_pvrda3.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hbqmiu.enc
index 4194f703d1b..481c8139274 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_pvrda3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hbqmiu.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_pvrda3ayd24l2jz24a3yz6f4kd
-% Encoding created by otftotfm on Wed Jul  1 20:56:09 2020
+%%AutoEnc1_hbqmiufivrhezoy6gtopfrghab
+% Encoding created by otftotfm on Sat Dec 18 18:24:24 2021
 % Command line follows encoding
-/AutoEnc_pvrda3ayd24l2jz24a3yz6f4kd [
+/AutoEnc1_hbqmiufivrhezoy6gtopfrghab [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,20 +45,20 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %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
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=lnum --feature=tnum --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xaqh3v.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_ifuncr.enc
index f5b738c9b68..d8d901d35be 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xaqh3v.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_ifuncr.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_xaqh3v7my6v7plsnnlq32jk5pb
-% Encoding created by otftotfm on Wed Jul  1 20:56:12 2020
+%%AutoEnc1_ifuncrfewwm74pymebmifdmupa
+% Encoding created by otftotfm on Sat Dec 18 18:24:29 2021
 % Command line follows encoding
-/AutoEnc_xaqh3v7my6v7plsnnlq32jk5pb [
+/AutoEnc1_ifuncrfewwm74pymebmifdmupa [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,20 +45,20 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %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
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hibu6u.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_n6yk3i.enc
index ce0354e808b..68bf20af2e2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hibu6u.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_n6yk3i.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_hibu6umvrjtqrirvpvs25evi3c
-% Encoding created by otftotfm on Wed Jul  1 20:56:09 2020
+%%AutoEnc1_n6yk3iegd2fawdz5k6sldx7ioc
+% Encoding created by otftotfm on Sat Dec 18 18:24:25 2021
 % Command line follows encoding
-/AutoEnc_hibu6umvrjtqrirvpvs25evi3c [
+/AutoEnc1_n6yk3iegd2fawdz5k6sldx7ioc [
 %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
+  /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -45,22 +45,24 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %E0
   /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
   /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
 %F0
   /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
-  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /germandbls.sc.ss02
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Bold.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Bold.otf
 % ETbb-Bold-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3ccbvp.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_nvr6ig.enc
index 20a176f82d5..f21c188974d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3ccbvp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_nvr6ig.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_3ccbvpb2mahh6euinpg3u7qqze
-% Encoding created by otftotfm on Wed Jul  1 20:56:14 2020
+%%AutoEnc1_nvr6ig6btf4vcx43seyfwfdddf
+% Encoding created by otftotfm on Sat Dec 18 18:24:31 2021
 % Command line follows encoding
-/AutoEnc_3ccbvpb2mahh6euinpg3u7qqze [
+/AutoEnc1_nvr6ig6btf4vcx43seyfwfdddf [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,20 +45,20 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %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
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=onum --feature=tnum --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_w52zjg.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_rluk7r.enc
index 762b48cd124..845abef870e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_w52zjg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_rluk7r.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh
-% Encoding created by otftotfm on Wed Jul  1 20:56:08 2020
+%%AutoEnc1_rluk7ruzo437pfvfnnh45fsnde
+% Encoding created by otftotfm on Sat Dec 18 18:24:34 2021
 % Command line follows encoding
-/AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh [
+/AutoEnc1_rluk7ruzo437pfvfnnh45fsnde [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,19 +45,19 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %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
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dnom
 % --ligkern=* {KL} * ETbb-Bold.otf ETbb-Bold-dnom-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_5325we.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_u2xzqd.enc
index 74c7cba4e42..e49d206b696 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_5325we.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_u2xzqd.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_5325we5aho44lxbyegll2vl3dc
-% Encoding created by otftotfm on Wed Jul  1 20:56:15 2020
+%%AutoEnc1_u2xzqdhpypappkhgw7cwbtqsxe
+% Encoding created by otftotfm on Sat Dec 18 18:24:32 2021
 % Command line follows encoding
-/AutoEnc1_5325we5aho44lxbyegll2vl3dc [
+/AutoEnc1_u2xzqdhpypappkhgw7cwbtqsxe [
 %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
+  /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -45,22 +45,24 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %E0
   /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
   /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
 %F0
   /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
-  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /uni1E9E.c2sc
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Bold.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Bold.otf
 % ETbb-Bold-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_77pqsh.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_ue3xcj.enc
index e937ab5a8e7..1d84cd6dba2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_77pqsh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_ue3xcj.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_77pqsh35tfbpgcie3v2crjtyef
-% Encoding created by otftotfm on Wed Jul  1 20:56:34 2020
+%%AutoEnc1_ue3xcj3ucrhmky4gvnr7atygla
+% Encoding created by otftotfm on Sat Dec 18 18:24:55 2021
 % Command line follows encoding
-/AutoEnc1_77pqsh35tfbpgcie3v2crjtyef [
+/AutoEnc1_ue3xcj3ucrhmky4gvnr7atygla [
 %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
+  /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -45,22 +45,24 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %E0
   /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
   /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
 %F0
   /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
-  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /uni1E9E.c2sc
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Italic.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Italic.otf
 % ETbb-Italic-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_eqc2ac.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_ujerr7.enc
index f91c518474d..45b30297f57 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_eqc2ac.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_ujerr7.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_eqc2ac2qcg4bxjlkwezu334h4f
-% Encoding created by otftotfm on Wed Jul  1 20:56:16 2020
+%%AutoEnc1_ujerr7xbnnjkudzzzotq7l2mrg
+% Encoding created by otftotfm on Sat Dec 18 18:24:20 2021
 % Command line follows encoding
-/AutoEnc_eqc2ac2qcg4bxjlkwezu334h4f [
+/AutoEnc1_ujerr7xbnnjkudzzzotq7l2mrg [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,20 +45,20 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %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
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_2wngtz.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_vbmlbb.enc
index a4fdf521864..76aa297377c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_2wngtz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_vbmlbb.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_2wngtzno6dnkbgy6u3wuotcora
-% Encoding created by otftotfm on Wed Jul  1 20:56:43 2020
+%%AutoEnc1_vbmlbbxz7tbehbzj5lbnuze2zg
+% Encoding created by otftotfm on Sat Dec 18 18:24:52 2021
 % Command line follows encoding
-/AutoEnc_2wngtzno6dnkbgy6u3wuotcora [
+/AutoEnc1_vbmlbbxz7tbehbzj5lbnuze2zg [
 %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
+  /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -45,22 +45,24 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %E0
   /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
   /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
 %F0
   /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
-  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /germandbls.sc.ss02
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Italic.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Italic.otf
 % ETbb-Italic-lf-sc-t1'
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 27bdfc87c82..8ee56d0c8a7 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 Wed Jul  1 20:56:23 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:43 2021
 % Command line follows encoding
 /AutoEnc_242knmbltpk57lyn3w752okimf [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=pnum --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
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 399a28cb31f..39b2034feff 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 Wed Jul  1 20:56:11 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:28 2021
 % Command line follows encoding
 /AutoEnc_33mftda5zpj2atc2k5o52aguyh [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=pnum --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_behrx3.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3bao6x.enc
index 8b1aff3eba6..1779fd2fdf9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_behrx3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3bao6x.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_behrx3e73zcxs6ypih5z3jwzfc
-% Encoding created by otftotfm on Wed Jul  1 20:56:52 2020
+%%AutoEnc_3bao6xeqlfbwoz74bra6iev3fc
+% Encoding created by otftotfm on Sat Dec 18 18:25:13 2021
 % Command line follows encoding
-/AutoEnc_behrx3e73zcxs6ypih5z3jwzfc [
+/AutoEnc_3bao6xeqlfbwoz74bra6iev3fc [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,19 +45,19 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %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
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=sinf
 % --ligkern=* {KL} * ETbb-Regular.otf ETbb-Regular-inf-t1'
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 e643c6f2bd2..8b0ef17a50d 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 Wed Jul  1 20:56:11 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:27 2021
 % Command line follows encoding
 /AutoEnc_3li7dqpy2izcpma72gvve2muqf [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
 % --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
 % --ligkern=ff i =: ffi --ligkern=ff l =: ffl ETbb-Bold.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dcps7k.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3pnwav.enc
index 21714c5302c..b79cb013a45 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dcps7k.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3pnwav.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_dcps7kztgw3wzbkeqywcdknetd
-% Encoding created by otftotfm on Wed Jul  1 20:56:11 2020
+%%AutoEnc_3pnwavz3hg7d6qd5gas2dqmv6h
+% Encoding created by otftotfm on Sat Dec 18 18:24:28 2021
 % Command line follows encoding
-/AutoEnc_dcps7kztgw3wzbkeqywcdknetd [
+/AutoEnc_3pnwavz3hg7d6qd5gas2dqmv6h [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,8 +58,10 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
 % --feature=pnum --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl
 % --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --unicoding=germandbls =: SSsmall ETbb-Bold.otf ETbb-Bold-osf-sc-ot1'
+% --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall --unicoding=fi
+% =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =: FLsmall
+% --unicoding=ffl =: FFLsmall ETbb-Bold.otf ETbb-Bold-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ko4aue.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3rdlap.enc
index 87cf0427a00..7274b7db67c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ko4aue.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3rdlap.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ko4auenlxbrvzhbacuekbifdwd
-% Encoding created by otftotfm on Wed Jul  1 20:56:42 2020
+%%AutoEnc_3rdlaplsvqg4x5d4ogftbp3u5b
+% Encoding created by otftotfm on Sat Dec 18 18:24:52 2021
 % Command line follows encoding
-/AutoEnc_ko4auenlxbrvzhbacuekbifdwd [
+/AutoEnc_3rdlaplsvqg4x5d4ogftbp3u5b [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,8 +58,10 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
 % --feature=pnum --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl
 % --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --unicoding=germandbls =: SSsmall ETbb-Italic.otf ETbb-Italic-lf-sc-ot1'
+% --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall --unicoding=fi
+% =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =: FLsmall
+% --unicoding=ffl =: FFLsmall ETbb-Italic.otf ETbb-Italic-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_vtabip.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4h6gms.enc
index c9850c56e4a..c861c38820f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_vtabip.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4h6gms.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_vtabipmm4e5xag7gq2nwm3p6gc
-% Encoding created by otftotfm on Wed Jul  1 20:56:15 2020
+%%AutoEnc_4h6gmskd3mmlebycwa2rvw3mfh
+% Encoding created by otftotfm on Sat Dec 18 18:24:33 2021
 % Command line follows encoding
-/AutoEnc1_vtabipmm4e5xag7gq2nwm3p6gc [
+/AutoEnc_4h6gmskd3mmlebycwa2rvw3mfh [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,20 +45,20 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %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
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4hpi45.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4hpi45.enc
index 158486f27e1..c9173f11e25 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4hpi45.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4hpi45.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_4hpi45xua3rf7rmnl54bpggxkg
-% Encoding created by otftotfm on Wed Jul  1 20:56:31 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:38 2021
 % Command line follows encoding
 /AutoEnc_4hpi45xua3rf7rmnl54bpggxkg [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4qfaj2.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4qfaj2.enc
index 250aee14616..c2d4f5dbfd7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4qfaj2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4qfaj2.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_4qfaj2fkf6gpmcsvmpnfqrb6ib
-% Encoding created by otftotfm on Wed Jul  1 20:56:54 2020
+% Encoding created by otftotfm on Sat Dec 18 18:25:20 2021
 % Command line follows encoding
 /AutoEnc_4qfaj2fkf6gpmcsvmpnfqrb6ib [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
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 07f972d8dda..c1fb1eebb09 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 Wed Jul  1 20:56:52 2020
+% Encoding created by otftotfm on Sat Dec 18 18:25:14 2021
 % Command line follows encoding
 /AutoEnc_4sxvu4thduhlpavew6yzmuysdd [
 %00
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sinf --ligkern=*
 % {KL} * ETbb-Regular.otf ETbb-Regular-inf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4x2qhb.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4x2qhb.enc
deleted file mode 100644
index 3b321182a95..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_4x2qhb.enc
+++ /dev/null
@@ -1,63 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_4x2qhbzfqbq2uyy7krhzfopuua
-% Encoding created by otftotfm on Wed Jul  1 20:56:23 2020
-% Command line follows encoding
-/AutoEnc_4x2qhbzfqbq2uyy7krhzfopuua [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /exclam /asterisk
-%10
-  /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
-%20
-  /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
-  /.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 /Q /Q.swsh /.notdef /minus /.notdef /.notdef
-%40
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%50
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%60
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%70
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /.notdef
-%80
-  /breve /caron /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
-  /bullet /.notdef /.notdef /cent /.notdef /.notdef /.notdef /.notdef
-%90
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
-  /.notdef /.notdef /.notdef /numero /.notdef /.notdef /.notdef /.notdef
-%A0
-  /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
-  /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
-%B0
-  /degree /plusminus /two.superior /three.superior /.notdef /mu /paragraph /periodcentered
-  /.notdef /one.superior /ordmasculine /.notdef /onequarter /onehalf /threequarters /Euro
-%C0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.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 /divide /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --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 COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=tnum ETbb-BoldItalic.otf ETbb-BoldItalic-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hah5or.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_55s5uq.enc
index 799f90bcd36..a74c529aac6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hah5or.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_55s5uq.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_hah5orya7ruvjmqzsfnwzilfbf
-% Encoding created by otftotfm on Wed Jul  1 20:56:11 2020
+%%AutoEnc_55s5uqo65pdpku3cr7xsyxg5of
+% Encoding created by otftotfm on Sat Dec 18 18:24:28 2021
 % Command line follows encoding
-/AutoEnc1_hah5orya7ruvjmqzsfnwzilfbf [
+/AutoEnc_55s5uqo65pdpku3cr7xsyxg5of [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,20 +45,20 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %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
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=onum --feature=pnum --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_kuig7z.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5hqhd4.enc
index b7ef91e9568..fb9cb6fd4b8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_kuig7z.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5hqhd4.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_kuig7zeiv5iolg6nn736gdpm7h
-% Encoding created by otftotfm on Wed Jul  1 20:56:09 2020
+%%AutoEnc_5hqhd4mz7tebzmdeshgwzm7htg
+% Encoding created by otftotfm on Sat Dec 18 18:24:25 2021
 % Command line follows encoding
-/AutoEnc_kuig7zeiv5iolg6nn736gdpm7h [
+/AutoEnc_5hqhd4mz7tebzmdeshgwzm7htg [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,9 +58,11 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Bold.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Bold.otf
 % ETbb-Bold-tlf-sc-ly1'
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 5adac8d5b7c..2fc7810be87 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 Wed Jul  1 20:56:42 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:51 2021
 % Command line follows encoding
 /AutoEnc_5iolltwrolq7y3af3zfxbxwjhg [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cpdyi3.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5ll7zh.enc
index 5cfd1ac62f5..0dc936ba963 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cpdyi3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5ll7zh.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_cpdyi3iny2nijyt7gl7sena5id
-% Encoding created by otftotfm on Wed Jul  1 20:56:15 2020
+%%AutoEnc_5ll7zhwvujbykp4klqbuo6xcpa
+% Encoding created by otftotfm on Sat Dec 18 18:24:32 2021
 % Command line follows encoding
-/AutoEnc_cpdyi3iny2nijyt7gl7sena5id [
+/AutoEnc_5ll7zhwvujbykp4klqbuo6xcpa [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,9 +58,11 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Bold.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Bold.otf
 % ETbb-Bold-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_kkjcws.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_65swoa.enc
index 63840be4edc..98cf29c3ea1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_kkjcws.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_65swoa.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_kkjcwsqdbeecfyy7hgz5besbsh
-% Encoding created by otftotfm on Wed Jul  1 20:56:38 2020
+%%AutoEnc_65swoaksouobshgplr6wc46zbe
+% Encoding created by otftotfm on Sat Dec 18 18:24:54 2021
 % Command line follows encoding
-/AutoEnc_kkjcwsqdbeecfyy7hgz5besbsh [
+/AutoEnc_65swoaksouobshgplr6wc46zbe [
 %00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /exclam /asterisk
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
 %10
   /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
@@ -14,8 +14,8 @@
   /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
   /.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 /Q /Q.swsh /.notdef /minus /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
 %40
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -27,10 +27,10 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %70
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %80
-  /breve /caron /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
-  /bullet /.notdef /.notdef /cent /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
+  /bullet /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
   /.notdef /.notdef /.notdef /numero /.notdef /.notdef /.notdef /.notdef
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=pnum ETbb-Italic.otf ETbb-Italic-osf-ts1'
+% --feature=pnum ETbb-Italic.otf ETbb-Italic-lf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_x5rskw.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_6b4rhp.enc
index ffd6526395b..7cca40ee970 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_x5rskw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_6b4rhp.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_x5rskwfdgrpeovvnp5dgzgax7e
-% Encoding created by otftotfm on Wed Jul  1 20:56:17 2020
+%%AutoEnc_6b4rhpsa6pxda3dbpecbcbe4hh
+% Encoding created by otftotfm on Sat Dec 18 18:24:21 2021
 % Command line follows encoding
-/AutoEnc_x5rskwfdgrpeovvnp5dgzgax7e [
+/AutoEnc_6b4rhpsa6pxda3dbpecbcbe4hh [
 %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
+  /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -45,22 +45,24 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %E0
   /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
   /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
 %F0
   /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
-  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /germandbls.sc.ss02
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Bold.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Bold.otf
 % ETbb-Bold-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sp7p3o.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_6bb767.enc
index d0125eede28..3ad37d75483 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sp7p3o.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_6bb767.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_sp7p3ogzc33lxwuaxiyoy7i63e
-% Encoding created by otftotfm on Wed Jul  1 20:56:37 2020
+%%AutoEnc_6bb767vgyf6bkkruaompchxqgf
+% Encoding created by otftotfm on Sat Dec 18 18:24:59 2021
 % Command line follows encoding
-/AutoEnc_sp7p3ogzc33lxwuaxiyoy7i63e [
+/AutoEnc_6bb767vgyf6bkkruaompchxqgf [
 %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
+  /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -45,22 +45,24 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %E0
   /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
   /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
 %F0
   /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
-  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /germandbls.sc.ss02
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Italic.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Italic.otf
 % ETbb-Italic-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_chsevo.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_6z6nrw.enc
index d43499e8f6a..1a53c1afcb6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_chsevo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_6z6nrw.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_chsevodrrrotdjwzaqukesefqe
-% Encoding created by otftotfm on Wed Jul  1 20:56:51 2020
+%%AutoEnc_6z6nrwwfi372xivperdacs5nkc
+% Encoding created by otftotfm on Sat Dec 18 18:25:09 2021
 % Command line follows encoding
-/AutoEnc_chsevodrrrotdjwzaqukesefqe [
+/AutoEnc_6z6nrwwfi372xivperdacs5nkc [
 %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
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /.notdef /.notdef
 %10
   /.notdef /.notdef /quotedblbase /.notdef /.notdef /twelveudash /threequartersemdash /.notdef
   /arrowleft /arrowright /tieaccentlowercase /tieaccentcapital /newtieaccentlowercase /newtieaccentcapital /.notdef /.notdef
@@ -14,8 +14,8 @@
   /blank /.notdef /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
   /.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 /Q /Q.swsh /uni27E8 /minus /uni27E9 /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /uni27E8 /minus /uni27E9 /.notdef
 %40
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /Omegainv /.notdef /bigcircle
@@ -27,12 +27,12 @@
   /.notdef /.notdef /.notdef /.notdef /leaf /married /.notdef /.notdef
 %70
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /hyphendbl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /tildelow /hyphendblchar
 %80
-  /breve /caron /.notdef /.notdef /dagger /daggerdbl /bardbl /perthousand
-  /bullet /centigrade /dollaroldstyle /cent.oldstyle /florin /colonmonetary /won /naira
+  /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /bardbl /perthousand
+  /bullet /centigrade /dollaroldstyle /.notdef /florin /colonmonetary /won /naira
 %90
-  /guarani /peso /lira /prescription /uni203D /uni2E18 /dong /trademark
+  /guarani /peso /lira /.notdef /uni203D /uni2E18 /dong /trademark
   /pertenthousand /pilcrow /baht /numero /discount /estimated /openbullet /servicemark
 %A0
   /quillbracketleft /quillbracketright /cent /sterling /currency /yen /brokenbar /section
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=pnum ETbb-Regular.otf ETbb-Regular-osf-ts1'
+% --feature=pnum ETbb-Regular.otf ETbb-Regular-lf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_22apno.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_7dlbn4.enc
index 4c4c02df22c..8b545304bca 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_22apno.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_7dlbn4.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_22apnozoce6wprtbuf6ihvsd5b
-% Encoding created by otftotfm on Wed Jul  1 20:56:54 2020
+%%AutoEnc_7dlbn4dwkeu5h7cbv2vzasjpuf
+% Encoding created by otftotfm on Sat Dec 18 18:25:19 2021
 % Command line follows encoding
-/AutoEnc_22apnozoce6wprtbuf6ihvsd5b [
+/AutoEnc_7dlbn4dwkeu5h7cbv2vzasjpuf [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,9 +58,11 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Regular.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Regular.otf
 % ETbb-Regular-tosf-sc-ly1'
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 04ed1e24121..811055669c6 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 Wed Jul  1 20:56:58 2020
+% Encoding created by otftotfm on Sat Dec 18 18:25:06 2021
 % Command line follows encoding
 /AutoEnc_7pzsmkr2zp4z2jzsqyz5xypura [
 %00
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sups --ligkern=*
 % {KL} * ETbb-Regular.otf ETbb-Regular-sup-ly1'
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 d46e640e1ad..fcb5f917dab 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 Wed Jul  1 20:56:32 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:35 2021
 % Command line follows encoding
 /AutoEnc_7t4ywj5n7dfcy72ielrltqzb7a [
 %00
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sups --ligkern=*
 % {KL} * ETbb-BoldItalic.otf ETbb-BoldItalic-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lchj55.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_7tqudy.enc
index d9afcebecee..739c5225932 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lchj55.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_7tqudy.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_lchj55yasnnqx5ykwctrzateoh
-% Encoding created by otftotfm on Wed Jul  1 20:56:47 2020
+%%AutoEnc_7tqudygnbzgjmkxijlp2ftxcbc
+% Encoding created by otftotfm on Sat Dec 18 18:25:12 2021
 % Command line follows encoding
-/AutoEnc_lchj55yasnnqx5ykwctrzateoh [
+/AutoEnc_7tqudygnbzgjmkxijlp2ftxcbc [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,9 +58,11 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Regular.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Regular.otf
 % ETbb-Regular-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cuqhrj.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_7uz5xh.enc
index f793b23fb89..e62287118ad 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cuqhrj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_7uz5xh.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_cuqhrji6wzmpdmxr5b7kf5n6ha
-% Encoding created by otftotfm on Wed Jul  1 20:56:57 2020
+%%AutoEnc_7uz5xhzp5ouhs2ck6ma6xzvyvd
+% Encoding created by otftotfm on Sat Dec 18 18:25:08 2021
 % Command line follows encoding
-/AutoEnc_cuqhrji6wzmpdmxr5b7kf5n6ha [
+/AutoEnc_7uz5xhzp5ouhs2ck6ma6xzvyvd [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,9 +58,11 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Regular.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Regular.otf
 % ETbb-Regular-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_s2dnn6.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_7vqeic.enc
index 6662edd6811..8e6416f0f1b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_s2dnn6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_7vqeic.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_s2dnn6rj7tbunhbchxk63iytpd
-% Encoding created by otftotfm on Wed Jul  1 20:56:32 2020
+%%AutoEnc_7vqeicxaixdn6xbz3lrlbtoqhg
+% Encoding created by otftotfm on Sat Dec 18 18:24:35 2021
 % Command line follows encoding
-/AutoEnc_s2dnn6rj7tbunhbchxk63iytpd [
+/AutoEnc_7vqeicxaixdn6xbz3lrlbtoqhg [
 %00
   /grave.superior /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,19 +45,19 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %E0
   /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
   /egrave.superior /eacute.superior /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
 %F0
   /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
-  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls.ss02
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=sups
 % --ligkern=* {KL} * ETbb-BoldItalic.otf ETbb-BoldItalic-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_whnzkz.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_agksat.enc
index ec6d13e48d5..ab77814e835 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_whnzkz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_agksat.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_whnzkzr322c66cgq4nlbs67x7d
-% Encoding created by otftotfm on Wed Jul  1 20:56:40 2020
+%%AutoEnc_agksatcf7xec4mnvs5v6hcdxae
+% Encoding created by otftotfm on Sat Dec 18 18:25:02 2021
 % Command line follows encoding
-/AutoEnc_whnzkzr322c66cgq4nlbs67x7d [
+/AutoEnc_agksatcf7xec4mnvs5v6hcdxae [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,8 +58,10 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
 % --feature=smcp --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
 % --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --unicoding=germandbls =: SSsmall ETbb-Italic.otf ETbb-Italic-tosf-sc-ot1'
+% --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall --unicoding=fi
+% =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =: FLsmall
+% --unicoding=ffl =: FFLsmall ETbb-Italic.otf ETbb-Italic-tosf-sc-ot1'
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 f8b2cd9844b..c824844e17d 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 Wed Jul  1 20:56:19 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:20 2021
 % Command line follows encoding
 /AutoEnc_atf2m5uqgbwoyyy5ueppslzajb [
 %00
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sups --ligkern=*
 % {KL} * ETbb-Bold.otf ETbb-Bold-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ay4ati.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ay4ati.enc
index 2564329e52e..e0dfe6f5bcc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ay4ati.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ay4ati.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ay4atisik7ffogqasevzhgjvtc
-% Encoding created by otftotfm on Wed Jul  1 20:56:12 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:29 2021
 % Command line follows encoding
 /AutoEnc_ay4atisik7ffogqasevzhgjvtc [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_imedjx.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_boj3jd.enc
index 60f652363d1..f5532755aa5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_imedjx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_boj3jd.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_imedjxssqsfkutdv3rq6n6nujc
-% Encoding created by otftotfm on Wed Jul  1 20:56:27 2020
+%%AutoEnc_boj3jd46imhlttx4pucalv5dud
+% Encoding created by otftotfm on Sat Dec 18 18:24:47 2021
 % Command line follows encoding
-/AutoEnc_imedjxssqsfkutdv3rq6n6nujc [
+/AutoEnc_boj3jd46imhlttx4pucalv5dud [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,9 +58,11 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% ETbb-BoldItalic.otf ETbb-BoldItalic-tosf-sc-ly1'
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-BoldItalic.otf
+% ETbb-BoldItalic-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sz3fgd.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_brounl.enc
index 1e72f7fd4cb..89e65283fad 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sz3fgd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_brounl.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_sz3fgdxm5o6umjwa4dgutu666f
-% Encoding created by otftotfm on Wed Jul  1 20:56:12 2020
+%%AutoEnc_brounlscz4abnslwmf4hmgz7mb
+% Encoding created by otftotfm on Sat Dec 18 18:24:29 2021
 % Command line follows encoding
-/AutoEnc_sz3fgdxm5o6umjwa4dgutu666f [
+/AutoEnc_brounlscz4abnslwmf4hmgz7mb [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,9 +58,11 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Bold.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Bold.otf
 % ETbb-Bold-osf-sc-ly1'
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 43b61354624..5f1015b51c1 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 Wed Jul  1 20:56:13 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:27 2021
 % Command line follows encoding
 /AutoEnc_cluc7m4ium2bcpwlcwz2h6yxsd [
 %00
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=sinf --ligkern=* {KL} * ETbb-Bold.otf
 % ETbb-Bold-inf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_rwec2l.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cp6bsz.enc
index 8a9f062b7b3..0580470cb8e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_rwec2l.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cp6bsz.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_rwec2ltafusdbpjxc5bs7fdg3b
-% Encoding created by otftotfm on Wed Jul  1 20:56:40 2020
+%%AutoEnc_cp6bsz5iopjtxmf6p55nagrmkh
+% Encoding created by otftotfm on Sat Dec 18 18:25:03 2021
 % Command line follows encoding
-/AutoEnc1_rwec2ltafusdbpjxc5bs7fdg3b [
+/AutoEnc_cp6bsz5iopjtxmf6p55nagrmkh [
 %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
+  /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -45,22 +45,24 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %E0
   /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
   /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
 %F0
   /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
-  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /uni1E9E.c2sc
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Italic.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Italic.otf
 % ETbb-Italic-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cpb6sd.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cpb6sd.enc
index 7e825a0f7a9..706cc28baab 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cpb6sd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cpb6sd.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_cpb6sdrmtmjdkd4dvmojrwtfyb
-% Encoding created by otftotfm on Wed Jul  1 20:56:15 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:32 2021
 % Command line follows encoding
 /AutoEnc_cpb6sdrmtmjdkd4dvmojrwtfyb [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cq6xx2.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cq6xx2.enc
index 011075026bf..f2c643900c4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cq6xx2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cq6xx2.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_cq6xx2fn5plzdjapa525zg3uad
-% Encoding created by otftotfm on Wed Jul  1 20:56:25 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:45 2021
 % Command line follows encoding
 /AutoEnc_cq6xx2fn5plzdjapa525zg3uad [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cxbogn.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cxbogn.enc
index 292378787c8..7f77ea86662 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cxbogn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cxbogn.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_cxbognvjc6orz6vd7e4qkufizg
-% Encoding created by otftotfm on Wed Jul  1 20:56:35 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:57 2021
 % Command line follows encoding
 /AutoEnc_cxbognvjc6orz6vd7e4qkufizg [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_z6brcn.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cyp5f5.enc
index c1b58762c24..376ac58a133 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_z6brcn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cyp5f5.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_z6brcnoe5prjyyjcyzrsnkxmxe
-% Encoding created by otftotfm on Wed Jul  1 20:56:34 2020
+%%AutoEnc_cyp5f54p4q6zxw5lofrrfueuud
+% Encoding created by otftotfm on Sat Dec 18 18:24:56 2021
 % Command line follows encoding
-/AutoEnc_z6brcnoe5prjyyjcyzrsnkxmxe [
+/AutoEnc_cyp5f54p4q6zxw5lofrrfueuud [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,9 +58,11 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Italic.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Italic.otf
 % ETbb-Italic-tlf-sc-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 abc51f8f27c..9d55e826918 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 Wed Jul  1 20:56:27 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:46 2021
 % Command line follows encoding
 /AutoEnc_cyyszv3tgoadb7habjipfqte7b [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=tnum --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
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 3a4287d7630..a3067bcac22 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 Wed Jul  1 20:56:58 2020
+% Encoding created by otftotfm on Sat Dec 18 18:25:05 2021
 % Command line follows encoding
 /AutoEnc_dep6cdmobxdewjybmud7kefdcf [
 %00
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=sups --ligkern=* {KL} *
 % ETbb-Regular.otf ETbb-Regular-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_na6tk5.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dv2xfw.enc
index f0cdcdc3e96..0319529ddca 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_na6tk5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dv2xfw.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_na6tk5osakq2zemkf5qfxhpzie
-% Encoding created by otftotfm on Wed Jul  1 20:56:53 2020
+%%AutoEnc_dv2xfwwuyxa3wtigrdvdpedgag
+% Encoding created by otftotfm on Sat Dec 18 18:25:19 2021
 % Command line follows encoding
-/AutoEnc_na6tk5osakq2zemkf5qfxhpzie [
+/AutoEnc_dv2xfwwuyxa3wtigrdvdpedgag [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /Omega /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,9 +58,10 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
 % --feature=smcp --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
 % --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --unicoding=germandbls =: SSsmall ETbb-Regular.otf
-% ETbb-Regular-tosf-sc-ot1'
+% --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall --unicoding=fi
+% =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =: FLsmall
+% --unicoding=ffl =: FFLsmall ETbb-Regular.otf ETbb-Regular-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3jmjat.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dz2nen.enc
index ecda1af4fc2..6c604a1c047 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3jmjat.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dz2nen.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_3jmjatxposyckyyeodfflfb4zf
-% Encoding created by otftotfm on Wed Jul  1 20:56:34 2020
+%%AutoEnc_dz2nenk67xbt7khdbdbcfb6m7a
+% Encoding created by otftotfm on Sat Dec 18 18:24:55 2021
 % Command line follows encoding
-/AutoEnc_3jmjatxposyckyyeodfflfb4zf [
+/AutoEnc_dz2nenk67xbt7khdbdbcfb6m7a [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,8 +58,10 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
 % --feature=smcp --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
 % --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --unicoding=germandbls =: SSsmall ETbb-Italic.otf ETbb-Italic-tlf-sc-ot1'
+% --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall --unicoding=fi
+% =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =: FLsmall
+% --unicoding=ffl =: FFLsmall ETbb-Italic.otf ETbb-Italic-tlf-sc-ot1'
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 a88ebd19ea9..b5b4e59a890 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 Wed Jul  1 20:56:46 2020
+% Encoding created by otftotfm on Sat Dec 18 18:25:10 2021
 % Command line follows encoding
 /AutoEnc_e3m4fzaal3fm6lwih762ck4hoh [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
 % --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
 % --ligkern=ff i =: ffi --ligkern=ff l =: ffl ETbb-Regular.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f7n52p.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_e7zo2o.enc
index 6ad1804c141..2325557ead7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f7n52p.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_e7zo2o.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_f7n52pgkdu3b46yojqf7dkhspc
-% Encoding created by otftotfm on Wed Jul  1 20:56:43 2020
+%%AutoEnc_e7zo2oi7r3xrhfqd6ly5q2jezg
+% Encoding created by otftotfm on Sat Dec 18 18:24:52 2021
 % Command line follows encoding
-/AutoEnc_f7n52pgkdu3b46yojqf7dkhspc [
+/AutoEnc_e7zo2oi7r3xrhfqd6ly5q2jezg [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,9 +58,11 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Italic.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Italic.otf
 % ETbb-Italic-lf-sc-ly1'
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 a64296cbbc2..aa7ceb88623 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 Wed Jul  1 20:56:31 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:34 2021
 % Command line follows encoding
 /AutoEnc_ea2dgh24m4p3kft426m6vb5nre [
 %00
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=sups --ligkern=* {KL} *
 % ETbb-BoldItalic.otf ETbb-BoldItalic-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yzujze.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ehl4wc.enc
index 8d3dc54bf20..67a63e88ed5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yzujze.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ehl4wc.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_yzujze46wjghaaaz6ede3o5zpg
-% Encoding created by otftotfm on Wed Jul  1 20:56:50 2020
+%%AutoEnc_ehl4wcmvklaee5zon2l2w6x6qe
+% Encoding created by otftotfm on Sat Dec 18 18:25:16 2021
 % Command line follows encoding
-/AutoEnc_yzujze46wjghaaaz6ede3o5zpg [
+/AutoEnc_ehl4wcmvklaee5zon2l2w6x6qe [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,9 +58,11 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Regular.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Regular.otf
 % ETbb-Regular-osf-sc-ly1'
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 b4ed6be0632..e6c9b3b3728 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 Wed Jul  1 20:56:09 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:24 2021
 % Command line follows encoding
 /AutoEnc_elsw3hdxi5xivsxqghfqivctad [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=tnum --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f55msl.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f55msl.enc
index 570e6ebc4e7..82c09183db9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f55msl.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f55msl.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_f55mslfj4hkccrqglfkn6satdb
-% Encoding created by otftotfm on Wed Jul  1 20:56:44 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:53 2021
 % Command line follows encoding
 /AutoEnc_f55mslfj4hkccrqglfkn6satdb [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f7rui7.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f7rui7.enc
deleted file mode 100644
index 981d00e10fc..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f7rui7.enc
+++ /dev/null
@@ -1,63 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_f7rui7qr5yqayibtf4z2zsyhec
-% Encoding created by otftotfm on Wed Jul  1 20:56:10 2020
-% Command line follows encoding
-/AutoEnc_f7rui7qr5yqayibtf4z2zsyhec [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /exclam /asterisk
-%10
-  /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
-%20
-  /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
-  /.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 /Q /Q.swsh /.notdef /minus /.notdef /.notdef
-%40
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /bigcircle
-%50
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%60
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%70
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /.notdef
-%80
-  /breve /caron /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
-  /bullet /.notdef /.notdef /cent /florin /.notdef /.notdef /.notdef
-%90
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
-  /.notdef /.notdef /.notdef /numero /.notdef /.notdef /.notdef /.notdef
-%A0
-  /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
-  /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
-%B0
-  /degree /plusminus /twosuperior /threesuperior /.notdef /mu /paragraph /periodcentered
-  /.notdef /onesuperior /ordmasculine /.notdef /onequarter /onehalf /threequarters /Euro
-%C0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.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 /divide /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --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 COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=tnum ETbb-Bold.otf ETbb-Bold-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fpvlkw.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fpvlkw.enc
index 19c6cc0b2c3..b352153aeaa 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fpvlkw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fpvlkw.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_fpvlkwpxsrxluug5fok7c7hwmg
-% Encoding created by otftotfm on Wed Jul  1 20:56:10 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:26 2021
 % Command line follows encoding
 /AutoEnc_fpvlkwpxsrxluug5fok7c7hwmg [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_yziesh.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_frt5zk.enc
index 3e27d1da583..a1de609fb68 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_yziesh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_frt5zk.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_yzieshsd44fbunydsrfnu5dloe
-% Encoding created by otftotfm on Wed Jul  1 20:56:10 2020
+%%AutoEnc_frt5zk5mf5bi5r6kaiwbsdwm4h
+% Encoding created by otftotfm on Sat Dec 18 18:24:26 2021
 % Command line follows encoding
-/AutoEnc1_yzieshsd44fbunydsrfnu5dloe [
+/AutoEnc_frt5zk5mf5bi5r6kaiwbsdwm4h [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,20 +45,20 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %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
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
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 5fc8b047c8b..57acfe0dd14 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 Wed Jul  1 20:56:52 2020
+% Encoding created by otftotfm on Sat Dec 18 18:25:13 2021
 % Command line follows encoding
 /AutoEnc_ftphfyliafmvcwfqlg66apswmh [
 %00
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=sinf --ligkern=* {KL} *
 % ETbb-Regular.otf ETbb-Regular-inf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fwcdph.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fwcdph.enc
index b3525b4567d..0e61c1db979 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fwcdph.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fwcdph.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_fwcdpht2mk2iigledipz2k5mxb
-% Encoding created by otftotfm on Wed Jul  1 20:56:38 2020
+% Encoding created by otftotfm on Sat Dec 18 18:25:01 2021
 % Command line follows encoding
 /AutoEnc_fwcdpht2mk2iigledipz2k5mxb [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_zxy3n5.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gcyiic.enc
index cdb11eecc69..109794fffef 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_zxy3n5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gcyiic.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_zxy3n5aiatzd3xjlhm2urzyfuc
-% Encoding created by otftotfm on Wed Jul  1 20:56:12 2020
+%%AutoEnc_gcyiicz4csxvfbjtqre3wkk2ma
+% Encoding created by otftotfm on Sat Dec 18 18:24:29 2021
 % Command line follows encoding
-/AutoEnc_zxy3n5aiatzd3xjlhm2urzyfuc [
+/AutoEnc_gcyiicz4csxvfbjtqre3wkk2ma [
 %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
+  /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -45,22 +45,24 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %E0
   /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
   /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
 %F0
   /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
-  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /germandbls.sc.ss02
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Bold.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Bold.otf
 % ETbb-Bold-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5cjnk5.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ghqdpy.enc
index 3b2a1f04c75..9b56253fced 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5cjnk5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ghqdpy.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_5cjnk55s6lighj2fknbv2zorpf
-% Encoding created by otftotfm on Wed Jul  1 20:56:56 2020
+%%AutoEnc_ghqdpy3yxw3upgthc3bzm4vtqe
+% Encoding created by otftotfm on Sat Dec 18 18:25:07 2021
 % Command line follows encoding
-/AutoEnc_5cjnk55s6lighj2fknbv2zorpf [
+/AutoEnc_ghqdpy3yxw3upgthc3bzm4vtqe [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /Omega /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,8 +58,10 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
 % --feature=pnum --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl
 % --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --unicoding=germandbls =: SSsmall ETbb-Regular.otf ETbb-Regular-lf-sc-ot1'
+% --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall --unicoding=fi
+% =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =: FLsmall
+% --unicoding=ffl =: FFLsmall ETbb-Regular.otf ETbb-Regular-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_mgm6re.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gojfsq.enc
index 46724349810..a52afbcafe0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_mgm6re.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gojfsq.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_mgm6reivyglzs2cwtx35q2y4ye
-% Encoding created by otftotfm on Wed Jul  1 20:56:18 2020
+%%AutoEnc_gojfsqpn6o4h6lbxak4mkqz2pf
+% Encoding created by otftotfm on Sat Dec 18 18:24:22 2021
 % Command line follows encoding
-/AutoEnc1_mgm6reivyglzs2cwtx35q2y4ye [
+/AutoEnc_gojfsqpn6o4h6lbxak4mkqz2pf [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,20 +45,20 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %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
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gtqfg2.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gtqfg2.enc
index 23d81247716..bf4691b7fe7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gtqfg2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gtqfg2.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_gtqfg2y4h5nuzq6u24ubertl3h
-% Encoding created by otftotfm on Wed Jul  1 20:56:18 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:23 2021
 % Command line follows encoding
 /AutoEnc_gtqfg2y4h5nuzq6u24ubertl3h [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
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 2c9b747c4ac..f464d8e5344 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 Wed Jul  1 20:56:08 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:33 2021
 % Command line follows encoding
 /AutoEnc_h4dyumvfz6ek2rcxjxry72wymd [
 %00
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=dnom --ligkern=* {KL} * ETbb-Bold.otf
 % ETbb-Bold-dnom-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_pvrda3.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hbqmiu.enc
index a6f39089f15..1069d3b396b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_pvrda3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hbqmiu.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_pvrda3ayd24l2jz24a3yz6f4kd
-% Encoding created by otftotfm on Wed Jul  1 20:56:09 2020
+%%AutoEnc_hbqmiufivrhezoy6gtopfrghab
+% Encoding created by otftotfm on Sat Dec 18 18:24:24 2021
 % Command line follows encoding
-/AutoEnc1_pvrda3ayd24l2jz24a3yz6f4kd [
+/AutoEnc_hbqmiufivrhezoy6gtopfrghab [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,20 +45,20 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %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
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=lnum --feature=tnum --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hcre2c.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hcre2c.enc
deleted file mode 100644
index 3f83a5f08ef..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hcre2c.enc
+++ /dev/null
@@ -1,63 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_hcre2coaukgjtmccse7rcteipa
-% Encoding created by otftotfm on Wed Jul  1 20:56:35 2020
-% Command line follows encoding
-/AutoEnc_hcre2coaukgjtmccse7rcteipa [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /exclam /asterisk
-%10
-  /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
-%20
-  /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
-  /.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 /Q /Q.swsh /.notdef /minus /.notdef /.notdef
-%40
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%50
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%60
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%70
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /.notdef
-%80
-  /breve /caron /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
-  /bullet /.notdef /.notdef /cent /.notdef /.notdef /.notdef /.notdef
-%90
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
-  /.notdef /.notdef /.notdef /numero /.notdef /.notdef /.notdef /.notdef
-%A0
-  /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
-  /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
-%B0
-  /degree /plusminus /twosuperior /threesuperior /.notdef /mu /paragraph /periodcentered
-  /.notdef /onesuperior /ordmasculine /.notdef /onequarter /onehalf /threequarters /Euro
-%C0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.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 /divide /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --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 COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=tnum ETbb-Italic.otf ETbb-Italic-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_qmwyqz.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hdnox5.enc
index e96cf34173a..6c0e2f8b19f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_qmwyqz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hdnox5.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_qmwyqz2zii3wt5czsrhsmdlqle
-% Encoding created by otftotfm on Wed Jul  1 20:56:40 2020
+%%AutoEnc_hdnox5ov25qala2bkiojjms64c
+% Encoding created by otftotfm on Sat Dec 18 18:25:03 2021
 % Command line follows encoding
-/AutoEnc_qmwyqz2zii3wt5czsrhsmdlqle [
+/AutoEnc_hdnox5ov25qala2bkiojjms64c [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,9 +58,11 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Italic.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Italic.otf
 % ETbb-Italic-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xdptht.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hn62ay.enc
index 453098e92e8..cdb663294f0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xdptht.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hn62ay.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_xdpthtxgnuplprpqhazm34unne
-% Encoding created by otftotfm on Wed Jul  1 20:56:25 2020
+%%AutoEnc_hn62aykleptmvhydkg3euih6fg
+% Encoding created by otftotfm on Sat Dec 18 18:24:38 2021
 % Command line follows encoding
-/AutoEnc_xdpthtxgnuplprpqhazm34unne [
+/AutoEnc_hn62aykleptmvhydkg3euih6fg [
 %00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /exclam /asterisk
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
 %10
   /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
@@ -14,8 +14,8 @@
   /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
   /.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 /Q /Q.swsh /.notdef /minus /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
 %40
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -27,10 +27,10 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %70
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %80
-  /breve /caron /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
-  /bullet /.notdef /.notdef /cent /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
+  /bullet /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
   /.notdef /.notdef /.notdef /numero /.notdef /.notdef /.notdef /.notdef
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=pnum ETbb-BoldItalic.otf ETbb-BoldItalic-osf-ts1'
+% --feature=pnum ETbb-BoldItalic.otf ETbb-BoldItalic-lf-ts1'
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 1266ff3315c..493ecb92bf1 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 Wed Jul  1 20:56:33 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:54 2021
 % Command line follows encoding
 /AutoEnc_i5ezvitppcazvehmki6u25ne3h [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=tnum --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_un2f5f.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_icp3zk.enc
index 81edc8cf189..b0bc50bd864 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_un2f5f.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_icp3zk.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_un2f5ft3vrvcnpf2fv5j434njb
-% Encoding created by otftotfm on Wed Jul  1 20:56:14 2020
+%%AutoEnc_icp3zkdjqefmy7aeihz6ksfvph
+% Encoding created by otftotfm on Sat Dec 18 18:24:31 2021
 % Command line follows encoding
-/AutoEnc_un2f5ft3vrvcnpf2fv5j434njb [
+/AutoEnc_icp3zkdjqefmy7aeihz6ksfvph [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,8 +58,10 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
 % --feature=smcp --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
 % --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --unicoding=germandbls =: SSsmall ETbb-Bold.otf ETbb-Bold-tosf-sc-ot1'
+% --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall --unicoding=fi
+% =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =: FLsmall
+% --unicoding=ffl =: FFLsmall ETbb-Bold.otf ETbb-Bold-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_xaqh3v.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ifuncr.enc
index 952f4d4f122..1900936ea93 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_xaqh3v.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ifuncr.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_xaqh3v7my6v7plsnnlq32jk5pb
-% Encoding created by otftotfm on Wed Jul  1 20:56:12 2020
+%%AutoEnc_ifuncrfewwm74pymebmifdmupa
+% Encoding created by otftotfm on Sat Dec 18 18:24:29 2021
 % Command line follows encoding
-/AutoEnc1_xaqh3v7my6v7plsnnlq32jk5pb [
+/AutoEnc_ifuncrfewwm74pymebmifdmupa [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,20 +45,20 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %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
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
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 c8d0badfe3a..54721c9dc9b 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 Wed Jul  1 20:56:08 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:23 2021
 % Command line follows encoding
 /AutoEnc_ihmnlry5rdqsk57rbbszezzogb [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
 % --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
 % --ligkern=ff i =: ffi --ligkern=ff l =: ffl ETbb-Bold.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_6tax72.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_j4gzyc.enc
index aa7642701d6..59f89c3eac4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_6tax72.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_j4gzyc.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_6tax72yid4piwl3l7e6mpqevrf
-% Encoding created by otftotfm on Wed Jul  1 20:56:24 2020
+%%AutoEnc_j4gzycykvaqv5pnwloczfvlbha
+% Encoding created by otftotfm on Sat Dec 18 18:24:44 2021
 % Command line follows encoding
-/AutoEnc_6tax72yid4piwl3l7e6mpqevrf [
+/AutoEnc_j4gzycykvaqv5pnwloczfvlbha [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,9 +58,11 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% ETbb-BoldItalic.otf ETbb-BoldItalic-osf-sc-ly1'
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-BoldItalic.otf
+% ETbb-BoldItalic-osf-sc-ly1'
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 0c0d4d967fc..cda28ee50be 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 Wed Jul  1 20:56:29 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:36 2021
 % Command line follows encoding
 /AutoEnc_j7myehdyrz6gorvvepmwcnbthh [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_c6gjhm.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_jejpug.enc
index a63d1393ad4..632973f34b9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_c6gjhm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_jejpug.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_c6gjhmb3ta3czdt7nhimutsk5c
-% Encoding created by otftotfm on Wed Jul  1 20:56:17 2020
+%%AutoEnc_jejpugv4fkdzohdbifitcnkxjb
+% Encoding created by otftotfm on Sat Dec 18 18:24:22 2021
 % Command line follows encoding
-/AutoEnc_c6gjhmb3ta3czdt7nhimutsk5c [
+/AutoEnc_jejpugv4fkdzohdbifitcnkxjb [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,9 +58,11 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Bold.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Bold.otf
 % ETbb-Bold-lf-sc-ly1'
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 a35462f0521..e547dba7ffc 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 Wed Jul  1 20:56:26 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:42 2021
 % Command line follows encoding
 /AutoEnc_kvzzr3edrncu7vt2awvffb64cc [
 %00
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sinf --ligkern=*
 % {KL} * ETbb-BoldItalic.otf ETbb-BoldItalic-inf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gkmjhd.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ladhhj.enc
index 3b8dc1ee644..56700feb2e2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gkmjhd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ladhhj.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_gkmjhd3seclagiouwe46zxr2nh
-% Encoding created by otftotfm on Wed Jul  1 20:56:22 2020
+%%AutoEnc_ladhhj66shqsq2lfu2ukqmc2fg
+% Encoding created by otftotfm on Sat Dec 18 18:24:40 2021
 % Command line follows encoding
-/AutoEnc_gkmjhd3seclagiouwe46zxr2nh [
+/AutoEnc_ladhhj66shqsq2lfu2ukqmc2fg [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,9 +58,11 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% ETbb-BoldItalic.otf ETbb-BoldItalic-tlf-sc-ly1'
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-BoldItalic.otf
+% ETbb-BoldItalic-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yhvmm4.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_le3wsu.enc
index 9833c443391..0156ad4c961 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yhvmm4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_le3wsu.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_yhvmm4p7ob5occ6mmnesxbgljh
-% Encoding created by otftotfm on Wed Jul  1 20:56:50 2020
+%%AutoEnc_le3wsuk34kmoex4bzg5ny6m6ph
+% Encoding created by otftotfm on Sat Dec 18 18:24:59 2021
 % Command line follows encoding
-/AutoEnc_yhvmm4p7ob5occ6mmnesxbgljh [
+/AutoEnc_le3wsuk34kmoex4bzg5ny6m6ph [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /Omega /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,9 +58,10 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
 % --feature=pnum --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl
 % --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --unicoding=germandbls =: SSsmall ETbb-Regular.otf
-% ETbb-Regular-osf-sc-ot1'
+% --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall --unicoding=fi
+% =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =: FLsmall
+% --unicoding=ffl =: FFLsmall ETbb-Italic.otf ETbb-Italic-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lfrz6w.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lfrz6w.enc
deleted file mode 100644
index 67d211f0ffc..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lfrz6w.enc
+++ /dev/null
@@ -1,63 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_lfrz6wrssnt2zjyix45pqgahrd
-% Encoding created by otftotfm on Wed Jul  1 20:56:48 2020
-% Command line follows encoding
-/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
-%10
-  /.notdef /.notdef /quotedblbase /.notdef /.notdef /twelveudash /threequartersemdash /.notdef
-  /arrowleft /arrowright /tieaccentlowercase /tieaccentcapital /newtieaccentlowercase /newtieaccentcapital /.notdef /.notdef
-%20
-  /blank /.notdef /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
-  /.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 /Q /Q.swsh /uni27E8 /minus /uni27E9 /.notdef
-%40
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /Omegainv /.notdef /bigcircle
-%50
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega
-  /.notdef /.notdef /.notdef /openbracketleft /.notdef /openbracketright /arrowup /arrowdown
-%60
-  /asciigrave /.notdef /born /divorced /died /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /leaf /married /.notdef /.notdef
-%70
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /hyphendbl
-%80
-  /breve /caron /.notdef /.notdef /dagger /daggerdbl /bardbl /perthousand
-  /bullet /centigrade /dollaroldstyle /cent.oldstyle /florin /colonmonetary /won /naira
-%90
-  /guarani /peso /lira /prescription /uni203D /uni2E18 /dong /trademark
-  /pertenthousand /pilcrow /baht /numero /discount /estimated /openbullet /servicemark
-%A0
-  /quillbracketleft /quillbracketright /cent /sterling /currency /yen /brokenbar /section
-  /asciidieresis /copyright /ordfeminine /copyleft /logicalnot /circledP /registered /asciimacron
-%B0
-  /degree /plusminus /twosuperior /threesuperior /asciiacute /mu /paragraph /periodcentered
-  /referencemark /onesuperior /ordmasculine /radical /onequarter /onehalf /threequarters /Euro
-%C0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.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 /divide /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --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 COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=tnum ETbb-Regular.otf ETbb-Regular-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lolxkk.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lolxkk.enc
index 175fbf4962e..4b723fa4558 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lolxkk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lolxkk.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_lolxkkcm4a3fwq36qi7tvqprqd
-% Encoding created by otftotfm on Wed Jul  1 20:56:18 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:22 2021
 % Command line follows encoding
 /AutoEnc_lolxkkcm4a3fwq36qi7tvqprqd [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
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 e2fbc71e6d1..62b11f13fe0 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 Wed Jul  1 20:56:36 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:59 2021
 % Command line follows encoding
 /AutoEnc_m5kdwta2ya4v2cpfk2w7yaatjb [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=pnum --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gtayjy.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_m74he6.enc
index 718a8554e6d..b441f6ad117 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gtayjy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_m74he6.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_gtayjyqjbvkxwi76vvo5bz5rsh
-% Encoding created by otftotfm on Wed Jul  1 20:56:17 2020
+%%AutoEnc_m74he64fxnid2mvcvujjgk3jfc
+% Encoding created by otftotfm on Sat Dec 18 18:24:21 2021
 % Command line follows encoding
-/AutoEnc_gtayjyqjbvkxwi76vvo5bz5rsh [
+/AutoEnc_m74he64fxnid2mvcvujjgk3jfc [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,8 +58,10 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
 % --feature=pnum --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl
 % --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --unicoding=germandbls =: SSsmall ETbb-Bold.otf ETbb-Bold-lf-sc-ot1'
+% --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall --unicoding=fi
+% =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =: FLsmall
+% --unicoding=ffl =: FFLsmall ETbb-Bold.otf ETbb-Bold-lf-sc-ot1'
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 7e661d1e227..08b362067e0 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 Wed Jul  1 20:56:08 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:34 2021
 % Command line follows encoding
 /AutoEnc_mpvq56haezsrrjg72prw5fumwf [
 %00
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dnom --ligkern=*
 % {KL} * ETbb-Bold.otf ETbb-Bold-dnom-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sk3nrp.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_muumxe.enc
index cf229bbeb1a..2702b39fa8c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sk3nrp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_muumxe.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_sk3nrpgzyacs2cd4rfqahjbzdc
-% Encoding created by otftotfm on Wed Jul  1 20:56:58 2020
+%%AutoEnc_muumxeoou2fakmyg63u2ohpivb
+% Encoding created by otftotfm on Sat Dec 18 18:25:06 2021
 % Command line follows encoding
-/AutoEnc_sk3nrpgzyacs2cd4rfqahjbzdc [
+/AutoEnc_muumxeoou2fakmyg63u2ohpivb [
 %00
   /grave.superior /acute.superior /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,19 +45,19 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %E0
   /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
   /egrave.superior /eacute.superior /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
 %F0
   /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
-  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls.ss02
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=sups
 % --ligkern=* {KL} * ETbb-Regular.otf ETbb-Regular-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dz2qg3.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_n5h2ym.enc
index 60be80b686c..e6b55c06ff9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dz2qg3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_n5h2ym.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_dz2qg3d3q3x6zjjkul4syetglf
-% Encoding created by otftotfm on Wed Jul  1 20:56:36 2020
+%%AutoEnc_n5h2ymzshpvgw4adqdcmaf3b4g
+% Encoding created by otftotfm on Sat Dec 18 18:25:15 2021
 % Command line follows encoding
-/AutoEnc_dz2qg3d3q3x6zjjkul4syetglf [
+/AutoEnc_n5h2ymzshpvgw4adqdcmaf3b4g [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,8 +58,10 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
 % --feature=pnum --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl
 % --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --unicoding=germandbls =: SSsmall ETbb-Italic.otf ETbb-Italic-osf-sc-ot1'
+% --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall --unicoding=fi
+% =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =: FLsmall
+% --unicoding=ffl =: FFLsmall ETbb-Regular.otf ETbb-Regular-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hibu6u.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_n6yk3i.enc
index e0c0f95bc8e..b9f70e8b1d7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hibu6u.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_n6yk3i.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_hibu6umvrjtqrirvpvs25evi3c
-% Encoding created by otftotfm on Wed Jul  1 20:56:09 2020
+%%AutoEnc_n6yk3iegd2fawdz5k6sldx7ioc
+% Encoding created by otftotfm on Sat Dec 18 18:24:25 2021
 % Command line follows encoding
-/AutoEnc1_hibu6umvrjtqrirvpvs25evi3c [
+/AutoEnc_n6yk3iegd2fawdz5k6sldx7ioc [
 %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
+  /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -45,22 +45,24 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %E0
   /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
   /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
 %F0
   /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
-  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /uni1E9E.c2sc
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Bold.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Bold.otf
 % ETbb-Bold-tlf-sc-t1'
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 4dacd726e2f..b00a93655b4 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 Wed Jul  1 20:56:52 2020
+% Encoding created by otftotfm on Sat Dec 18 18:25:18 2021
 % Command line follows encoding
 /AutoEnc_nfh2owxdg6o6hn6aumhzqgw4xe [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
 % --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
 % --ligkern=ff i =: ffi --ligkern=ff l =: ffl ETbb-Regular.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3pfdgz.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_no4mhs.enc
index 0ed0555f82e..444db780d27 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3pfdgz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_no4mhs.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_3pfdgzsbueyunimviyizcdlq3b
-% Encoding created by otftotfm on Wed Jul  1 20:56:19 2020
+%%AutoEnc_no4mhsvdevbqot7r3poyrn6ifd
+% Encoding created by otftotfm on Sat Dec 18 18:24:19 2021
 % Command line follows encoding
-/AutoEnc_3pfdgzsbueyunimviyizcdlq3b [
+/AutoEnc_no4mhsvdevbqot7r3poyrn6ifd [
 %00
   /grave.superior /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,19 +45,19 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %E0
   /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
   /egrave.superior /eacute.superior /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
 %F0
   /eth /ntilde.superior /ograve /oacute /ocircumflex /otilde /odieresis /oe
-  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls.ss02
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=sups
 % --ligkern=* {KL} * ETbb-Bold.otf ETbb-Bold-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cpixk3.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nvfc5y.enc
index 3636a5e9808..0d9ba4e8401 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cpixk3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nvfc5y.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_cpixk3kzz7zlit4vgu64uofbpa
-% Encoding created by otftotfm on Wed Jul  1 20:56:13 2020
+%%AutoEnc_nvfc5y2s42cdp2nj6iltss7xrc
+% Encoding created by otftotfm on Sat Dec 18 18:24:23 2021
 % Command line follows encoding
-/AutoEnc_cpixk3kzz7zlit4vgu64uofbpa [
+/AutoEnc_nvfc5y2s42cdp2nj6iltss7xrc [
 %00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /exclam /asterisk
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
 %10
   /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
@@ -14,8 +14,8 @@
   /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
   /.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 /Q /Q.swsh /.notdef /minus /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
 %40
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /bigcircle
@@ -27,10 +27,10 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %70
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %80
-  /breve /caron /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
-  /bullet /.notdef /.notdef /cent /florin /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
+  /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
   /.notdef /.notdef /.notdef /numero /.notdef /.notdef /.notdef /.notdef
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=pnum ETbb-Bold.otf ETbb-Bold-osf-ts1'
+% --feature=pnum ETbb-Bold.otf ETbb-Bold-lf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_3ccbvp.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nvr6ig.enc
index 487e1e0a902..9492aa97b75 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_3ccbvp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nvr6ig.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_3ccbvpb2mahh6euinpg3u7qqze
-% Encoding created by otftotfm on Wed Jul  1 20:56:14 2020
+%%AutoEnc_nvr6ig6btf4vcx43seyfwfdddf
+% Encoding created by otftotfm on Sat Dec 18 18:24:31 2021
 % Command line follows encoding
-/AutoEnc1_3ccbvpb2mahh6euinpg3u7qqze [
+/AutoEnc_nvr6ig6btf4vcx43seyfwfdddf [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,20 +45,20 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %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
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=onum --feature=tnum --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fue2l2.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_oe3mzn.enc
index ab2d50ad8c7..87c717292dc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fue2l2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_oe3mzn.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_fue2l2dyo4hhc3efyctqx2ll4c
-% Encoding created by otftotfm on Wed Jul  1 20:56:37 2020
+%%AutoEnc_oe3mznofozp2ytwevbi4nhgsyh
+% Encoding created by otftotfm on Sat Dec 18 18:25:00 2021
 % Command line follows encoding
-/AutoEnc_fue2l2dyo4hhc3efyctqx2ll4c [
+/AutoEnc_oe3mznofozp2ytwevbi4nhgsyh [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,9 +58,11 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Italic.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Italic.otf
 % ETbb-Italic-osf-sc-ly1'
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 a5ca913d7db..cee7c0b24d0 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 Wed Jul  1 20:56:17 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:21 2021
 % Command line follows encoding
 /AutoEnc_ohc25e7nugkq5uftwleqtlzhic [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
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 7ae64f899e6..593d2ae8e37 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 Wed Jul  1 20:56:19 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:19 2021
 % Command line follows encoding
 /AutoEnc_ohvjcvc5bqqlbwbvbss6jzvdvg [
 %00
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=sups --ligkern=* {KL} * ETbb-Bold.otf
 % ETbb-Bold-sup-ot1'
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 e40301fd4dd..0c8d1e758b9 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 Wed Jul  1 20:56:45 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:50 2021
 % Command line follows encoding
 /AutoEnc_oynaqbx2tknlw3aeddaeveg26e [
 %00
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sups --ligkern=*
 % {KL} * ETbb-Italic.otf ETbb-Italic-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_p4wmli.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_p4wmli.enc
index 7ef41a4245a..14da153c555 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_p4wmli.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_p4wmli.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_p4wmligvvkue2xskkzbfmabuja
-% Encoding created by otftotfm on Wed Jul  1 20:56:10 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:25 2021
 % Command line follows encoding
 /AutoEnc_p4wmligvvkue2xskkzbfmabuja [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
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 498bdc18c58..777ab60384e 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 Wed Jul  1 20:56:16 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:20 2021
 % Command line follows encoding
 /AutoEnc_pijcl45xbcrh3ujmxpu2uuufoe [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
 % --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
 % --ligkern=ff i =: ffi --ligkern=ff l =: ffl ETbb-Bold.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_bowihu.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_q62n24.enc
index 3d70e64bd77..c9b1e5b08fc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_bowihu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_q62n24.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_bowihunnspwduw2eofxbzcdp7b
-% Encoding created by otftotfm on Wed Jul  1 20:56:30 2020
+%%AutoEnc_q62n247r56bsa7x73lg2hfrq3b
+% Encoding created by otftotfm on Sat Dec 18 18:24:37 2021
 % Command line follows encoding
-/AutoEnc_bowihunnspwduw2eofxbzcdp7b [
+/AutoEnc_q62n247r56bsa7x73lg2hfrq3b [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,9 +58,11 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
-% ETbb-BoldItalic.otf ETbb-BoldItalic-lf-sc-ly1'
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-BoldItalic.otf
+% ETbb-BoldItalic-lf-sc-ly1'
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 4e8529ba54f..930b767bd07 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 Wed Jul  1 20:56:55 2020
+% Encoding created by otftotfm on Sat Dec 18 18:25:06 2021
 % Command line follows encoding
 /AutoEnc_qqjyrebwkze4pfxo72toftkebf [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
 % --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
 % --ligkern=ff i =: ffi --ligkern=ff l =: ffl ETbb-Regular.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_vmkycp.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_qrk72g.enc
index b3c01189967..91cb6f85d59 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_vmkycp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_qrk72g.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_vmkycpf7ajyvncqs3krblmkupe
-% Encoding created by otftotfm on Wed Jul  1 20:56:47 2020
+%%AutoEnc_qrk72gtd2bxaznl2wdopxnwg2e
+% Encoding created by otftotfm on Sat Dec 18 18:25:11 2021
 % Command line follows encoding
-/AutoEnc_vmkycpf7ajyvncqs3krblmkupe [
+/AutoEnc_qrk72gtd2bxaznl2wdopxnwg2e [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /Omega /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,9 +58,10 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
 % --feature=smcp --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
 % --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --unicoding=germandbls =: SSsmall ETbb-Regular.otf
-% ETbb-Regular-tlf-sc-ot1'
+% --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall --unicoding=fi
+% =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =: FLsmall
+% --unicoding=ffl =: FFLsmall ETbb-Regular.otf ETbb-Regular-tlf-sc-ot1'
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 34d0e43a7ed..5aed3369df9 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 Wed Jul  1 20:56:49 2020
+% Encoding created by otftotfm on Sat Dec 18 18:25:14 2021
 % Command line follows encoding
 /AutoEnc_r34xpuqbjubisgsjxlr74lrpqd [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
 % --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
 % --ligkern=ff i =: ffi --ligkern=ff l =: ffl ETbb-Regular.otf
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 425581d3e4f..5cf3c139829 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 Wed Jul  1 20:56:21 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:39 2021
 % Command line follows encoding
 /AutoEnc_riohwxsior5lnnjjsjpbvpslke [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=tnum --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_w52zjg.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rluk7r.enc
index 9ecee9638b2..b94efc3521c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_w52zjg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rluk7r.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh
-% Encoding created by otftotfm on Wed Jul  1 20:56:08 2020
+%%AutoEnc_rluk7ruzo437pfvfnnh45fsnde
+% Encoding created by otftotfm on Sat Dec 18 18:24:34 2021
 % Command line follows encoding
-/AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh [
+/AutoEnc_rluk7ruzo437pfvfnnh45fsnde [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,19 +45,19 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %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
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dnom
 % --ligkern=* {KL} * ETbb-Bold.otf ETbb-Bold-dnom-t1'
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 c079e4c8c2b..6fc6bee770e 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 Wed Jul  1 20:56:14 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:30 2021
 % Command line follows encoding
 /AutoEnc_rt4krokhlnwam4wxhivtc42zod [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
 % --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
 % --ligkern=ff i =: ffi --ligkern=ff l =: ffl ETbb-Bold.otf
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 7a4ba508fcc..92b3f11d355 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 Wed Jul  1 20:56:33 2020
+% Encoding created by otftotfm on Sat Dec 18 18:25:05 2021
 % Command line follows encoding
 /AutoEnc_rzlqzq4dfqtplm3j7w5fz6domf [
 %00
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dnom --ligkern=*
 % {KL} * ETbb-Italic.otf ETbb-Italic-dnom-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_skushq.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_skushq.enc
index 9f46704593f..51a3373c88e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_skushq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_skushq.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_skushqlalkfgdo46rxhdwryuge
-% Encoding created by otftotfm on Wed Jul  1 20:56:28 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:48 2021
 % Command line follows encoding
 /AutoEnc_skushqlalkfgdo46rxhdwryuge [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_tbmtgo.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_tbmtgo.enc
index 63e099c851e..35499568936 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_tbmtgo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_tbmtgo.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_tbmtgoznr33jpt6iokvjfw4jnd
-% Encoding created by otftotfm on Wed Jul  1 20:56:41 2020
+% Encoding created by otftotfm on Sat Dec 18 18:25:04 2021
 % Command line follows encoding
 /AutoEnc_tbmtgoznr33jpt6iokvjfw4jnd [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
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 04b619b8959..84309c96e4b 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 Wed Jul  1 20:56:44 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:50 2021
 % Command line follows encoding
 /AutoEnc_tif2ynv3fdnyajhtthl5l33lxb [
 %00
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=sups --ligkern=* {KL} * ETbb-Italic.otf
 % ETbb-Italic-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5325we.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_u2xzqd.enc
index d5c23fc6b34..16742ccac78 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5325we.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_u2xzqd.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_5325we5aho44lxbyegll2vl3dc
-% Encoding created by otftotfm on Wed Jul  1 20:56:15 2020
+%%AutoEnc_u2xzqdhpypappkhgw7cwbtqsxe
+% Encoding created by otftotfm on Sat Dec 18 18:24:32 2021
 % Command line follows encoding
-/AutoEnc_5325we5aho44lxbyegll2vl3dc [
+/AutoEnc_u2xzqdhpypappkhgw7cwbtqsxe [
 %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
+  /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -45,22 +45,24 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %E0
   /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
   /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
 %F0
   /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
-  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /germandbls.sc.ss02
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Bold.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Bold.otf
 % ETbb-Bold-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_77pqsh.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ue3xcj.enc
index 1737a46b06e..06f0015b55d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_77pqsh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ue3xcj.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_77pqsh35tfbpgcie3v2crjtyef
-% Encoding created by otftotfm on Wed Jul  1 20:56:34 2020
+%%AutoEnc_ue3xcj3ucrhmky4gvnr7atygla
+% Encoding created by otftotfm on Sat Dec 18 18:24:55 2021
 % Command line follows encoding
-/AutoEnc_77pqsh35tfbpgcie3v2crjtyef [
+/AutoEnc_ue3xcj3ucrhmky4gvnr7atygla [
 %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
+  /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -45,22 +45,24 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %E0
   /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
   /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
 %F0
   /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
-  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /germandbls.sc.ss02
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Italic.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Italic.otf
 % ETbb-Italic-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_eqc2ac.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ujerr7.enc
index f90464217c5..4e871093ec8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_eqc2ac.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ujerr7.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_eqc2ac2qcg4bxjlkwezu334h4f
-% Encoding created by otftotfm on Wed Jul  1 20:56:16 2020
+%%AutoEnc_ujerr7xbnnjkudzzzotq7l2mrg
+% Encoding created by otftotfm on Sat Dec 18 18:24:20 2021
 % Command line follows encoding
-/AutoEnc1_eqc2ac2qcg4bxjlkwezu334h4f [
+/AutoEnc_ujerr7xbnnjkudzzzotq7l2mrg [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,20 +45,20 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %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
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ujmsnd.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ujmsnd.enc
index 3cd4816129b..1521bd427d4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ujmsnd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ujmsnd.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ujmsnd4wrjk5td66f5dpjczund
-% Encoding created by otftotfm on Wed Jul  1 20:56:50 2020
+% Encoding created by otftotfm on Sat Dec 18 18:25:16 2021
 % Command line follows encoding
 /AutoEnc_ujmsnd4wrjk5td66f5dpjczund [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
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 d7915b83ab6..c43742f055a 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 Wed Jul  1 20:56:45 2020
+% Encoding created by otftotfm on Sat Dec 18 18:25:21 2021
 % Command line follows encoding
 /AutoEnc_uoncjtwnmhcjmejtj3u7v6bsxh [
 %00
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=dnom --ligkern=* {KL} *
 % ETbb-Regular.otf ETbb-Regular-dnom-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nnawaw.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_upf3od.enc
index ad5d97448f4..143145e9545 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nnawaw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_upf3od.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_nnawawhrqtfql6ks2vijrjl4ef
-% Encoding created by otftotfm on Wed Jul  1 20:56:13 2020
+%%AutoEnc_upf3oddxlsq2xphry33a6uekvh
+% Encoding created by otftotfm on Sat Dec 18 18:24:27 2021
 % Command line follows encoding
-/AutoEnc_nnawawhrqtfql6ks2vijrjl4ef [
+/AutoEnc_upf3oddxlsq2xphry33a6uekvh [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,19 +45,19 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %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
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=sinf
 % --ligkern=* {KL} * ETbb-Bold.otf ETbb-Bold-inf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_v6nho7.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_v6nho7.enc
index f7297ab2758..ec591be1fd2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_v6nho7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_v6nho7.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_v6nho72t4emng74mnbztuynq6f
-% Encoding created by otftotfm on Wed Jul  1 20:56:22 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:41 2021
 % Command line follows encoding
 /AutoEnc_v6nho72t4emng74mnbztuynq6f [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_2wngtz.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_vbmlbb.enc
index 45d82a7bf1a..1113b1d0808 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_2wngtz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_vbmlbb.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc1_2wngtzno6dnkbgy6u3wuotcora
-% Encoding created by otftotfm on Wed Jul  1 20:56:43 2020
+%%AutoEnc_vbmlbbxz7tbehbzj5lbnuze2zg
+% Encoding created by otftotfm on Sat Dec 18 18:24:52 2021
 % Command line follows encoding
-/AutoEnc1_2wngtzno6dnkbgy6u3wuotcora [
+/AutoEnc_vbmlbbxz7tbehbzj5lbnuze2zg [
 %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
+  /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -45,22 +45,24 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %E0
   /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
   /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
 %F0
   /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
-  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /uni1E9E.c2sc
+  /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
 % =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall ETbb-Italic.otf
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall ETbb-Italic.otf
 % ETbb-Italic-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_wplash.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_wplash.enc
index 11ccf7cd5ea..e833c8cceb5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_wplash.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_wplash.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_wplashkp5h2u4lgwljah7kwuab
-% Encoding created by otftotfm on Wed Jul  1 20:56:57 2020
+% Encoding created by otftotfm on Sat Dec 18 18:25:08 2021
 % Command line follows encoding
 /AutoEnc_wplashkp5h2u4lgwljah7kwuab [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
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 42f5a2832d9..57200662fae 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 Wed Jul  1 20:56:39 2020
+% Encoding created by otftotfm on Sat Dec 18 18:25:02 2021
 % Command line follows encoding
 /AutoEnc_xe5wuhzidgbvcpd4udlt7isypc [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=tnum --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xmn5et.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xmn5et.enc
index d4a7ed12e61..c2ca2d23adb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xmn5et.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xmn5et.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_xmn5etwdfamaoydl5hgcpvzzmh
-% Encoding created by otftotfm on Wed Jul  1 20:56:16 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:33 2021
 % Command line follows encoding
 /AutoEnc_xmn5etwdfamaoydl5hgcpvzzmh [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_v2eodf.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xq7qra.enc
index bdd539d7743..464c3c574a7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_v2eodf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_xq7qra.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_v2eodfhfoafkknfaq4dvfpm3vf
-% Encoding created by otftotfm on Wed Jul  1 20:56:09 2020
+%%AutoEnc_xq7qrab6xf2f2gznvgat2zorhc
+% Encoding created by otftotfm on Sat Dec 18 18:24:24 2021
 % Command line follows encoding
-/AutoEnc_v2eodfhfoafkknfaq4dvfpm3vf [
+/AutoEnc_xq7qrab6xf2f2gznvgat2zorhc [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -58,8 +58,10 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
 % --feature=smcp --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
 % --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --unicoding=germandbls =: SSsmall ETbb-Bold.otf ETbb-Bold-tlf-sc-ot1'
+% --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall --unicoding=fi
+% =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =: FLsmall
+% --unicoding=ffl =: FFLsmall ETbb-Bold.otf ETbb-Bold-tlf-sc-ot1'
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 7d312e86b45..976c68e72a7 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 Wed Jul  1 20:56:14 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:31 2021
 % Command line follows encoding
 /AutoEnc_ybjyd4l7q3pzoonr2vgt7y7cye [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=tnum --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ydcfbc.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ydcfbc.enc
index 36db7ab14a6..2b21a11acd4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ydcfbc.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ydcfbc.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ydcfbcl5ljqkibbzqu2uvlk5mh
-% Encoding created by otftotfm on Wed Jul  1 20:56:48 2020
+% Encoding created by otftotfm on Sat Dec 18 18:25:12 2021
 % Command line follows encoding
 /AutoEnc_ydcfbcl5ljqkibbzqu2uvlk5mh [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
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 e2e95881df5..6675feb4c88 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 Wed Jul  1 20:56:20 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:49 2021
 % Command line follows encoding
 /AutoEnc_yiqwpuq7peloj5eprodwnynevc [
 %00
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dnom --ligkern=*
 % {KL} * ETbb-BoldItalic.otf ETbb-BoldItalic-dnom-ly1'
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 cc8a3ee59b3..101e37235ca 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 Wed Jul  1 20:56:39 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:58 2021
 % Command line follows encoding
 /AutoEnc_ytzykvcotxef33p6cozlsx4zlh [
 %00
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sinf --ligkern=*
 % {KL} * ETbb-Italic.otf ETbb-Italic-inf-ly1'
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 a6f52fdd3ea..835348c838e 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 Wed Jul  1 20:56:13 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:27 2021
 % Command line follows encoding
 /AutoEnc_yzoycro7xigz5wnd723rnypzae [
 %00
@@ -58,6 +58,6 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sinf --ligkern=*
 % {KL} * ETbb-Bold.otf ETbb-Bold-inf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yjlloh.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ziol45.enc
index 64f77725c19..92ed1b11d88 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yjlloh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ziol45.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_yjllohyiapvbznlcedbxnkm3sa
-% Encoding created by otftotfm on Wed Jul  1 20:56:45 2020
+%%AutoEnc_ziol45eykyi2baku6kum6xzyig
+% Encoding created by otftotfm on Sat Dec 18 18:24:50 2021
 % Command line follows encoding
-/AutoEnc_yjllohyiapvbznlcedbxnkm3sa [
+/AutoEnc_ziol45eykyi2baku6kum6xzyig [
 %00
   /grave.superior /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -45,19 +45,19 @@
   /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
+  /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
 %E0
   /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
   /egrave.superior /eacute.superior /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
 %F0
   /eth /ntilde.superior /ograve /oacute /ocircumflex /otilde /odieresis /oe
-  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls.ss02
+  /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] 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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=sups
 % --ligkern=* {KL} * ETbb-Italic.otf ETbb-Italic-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_zpkt7y.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_zpkt7y.enc
index d9a4317a4b5..b9cd8dd929b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_zpkt7y.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_zpkt7y.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_zpkt7yo2662luadsq46ip6qshh
-% Encoding created by otftotfm on Wed Jul  1 20:56:13 2020
+% Encoding created by otftotfm on Sat Dec 18 18:24:30 2021
 % Command line follows encoding
 /AutoEnc_zpkt7yo2662luadsq46ip6qshh [
 %00
@@ -58,7 +58,7 @@
 % --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
+% --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap --force
 % --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
diff --git a/Master/texmf-dist/fonts/map/dvips/etbb/ETbb.map b/Master/texmf-dist/fonts/map/dvips/etbb/ETbb.map
index 264aea3107e..771adb419c2 100644
--- a/Master/texmf-dist/fonts/map/dvips/etbb/ETbb.map
+++ b/Master/texmf-dist/fonts/map/dvips/etbb/ETbb.map
@@ -1,250 +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-sup-ot1 ETbb-Bold "AutoEnc_ohvjcvc5bqqlbwbvbss6jzvdvg ReEncodeFont" <[etbb_ohvjcv.enc <ETbb-Bold.pfb
+ETbb-Bold-sup-t1--base ETbb-Bold "AutoEnc_no4mhsvdevbqot7r3poyrn6ifd ReEncodeFont" <[etbb_no4mhs.enc <ETbb-Bold.pfb
+ETbb-Bold-sup-ly1--base ETbb-Bold "AutoEnc_atf2m5uqgbwoyyy5ueppslzajb ReEncodeFont" <[etbb_atf2m5.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_ujerr7xbnnjkudzzzotq7l2mrg ReEncodeFont" <[etbb_ujerr7.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_m74he64fxnid2mvcvujjgk3jfc ReEncodeFont" <[etbb_m74he6.enc <ETbb-Bold.pfb
+ETbb-Bold-lf-sc-t1--base ETbb-Bold "AutoEnc_6b4rhpsa6pxda3dbpecbcbe4hh ReEncodeFont" <[etbb_6b4rhp.enc <ETbb-Bold.pfb
+ETbb-Bold-lf-sc-ly1--base ETbb-Bold "AutoEnc_jejpugv4fkdzohdbifitcnkxjb ReEncodeFont" <[etbb_jejpug.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_gojfsqpn6o4h6lbxak4mkqz2pf ReEncodeFont" <[etbb_gojfsq.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_nvfc5y2s42cdp2nj6iltss7xrc ReEncodeFont" <[etbb_nvfc5y.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-t1--base ETbb-Bold "AutoEnc_hbqmiufivrhezoy6gtopfrghab ReEncodeFont" <[etbb_hbqmiu.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-sc-ot1--base ETbb-Bold "AutoEnc_xq7qrab6xf2f2gznvgat2zorhc ReEncodeFont" <[etbb_xq7qra.enc <ETbb-Bold.pfb
+ETbb-Bold-tlf-sc-t1--base ETbb-Bold "AutoEnc_n6yk3iegd2fawdz5k6sldx7ioc ReEncodeFont" <[etbb_n6yk3i.enc <ETbb-Bold.pfb
+ETbb-Bold-tlf-sc-ly1--base ETbb-Bold "AutoEnc_5hqhd4mz7tebzmdeshgwzm7htg ReEncodeFont" <[etbb_5hqhd4.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-t1--base ETbb-Bold "AutoEnc_frt5zk5mf5bi5r6kaiwbsdwm4h ReEncodeFont" <[etbb_frt5zk.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-tlf-ts1--base ETbb-Bold "AutoEnc_nvfc5y2s42cdp2nj6iltss7xrc ReEncodeFont" <[etbb_nvfc5y.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_upf3oddxlsq2xphry33a6uekvh ReEncodeFont" <[etbb_upf3od.enc <ETbb-Bold.pfb
+ETbb-Bold-inf-ly1--base ETbb-Bold "AutoEnc_yzoycro7xigz5wnd723rnypzae ReEncodeFont" <[etbb_yzoycr.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-t1--base ETbb-Bold "AutoEnc_55s5uqo65pdpku3cr7xsyxg5of ReEncodeFont" <[etbb_55s5uq.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-sc-ot1--base ETbb-Bold "AutoEnc_3pnwavz3hg7d6qd5gas2dqmv6h ReEncodeFont" <[etbb_3pnwav.enc <ETbb-Bold.pfb
+ETbb-Bold-osf-sc-t1--base ETbb-Bold "AutoEnc_gcyiicz4csxvfbjtqre3wkk2ma ReEncodeFont" <[etbb_gcyiic.enc <ETbb-Bold.pfb
+ETbb-Bold-osf-sc-ly1--base ETbb-Bold "AutoEnc_brounlscz4abnslwmf4hmgz7mb ReEncodeFont" <[etbb_brounl.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-t1--base ETbb-Bold "AutoEnc_ifuncrfewwm74pymebmifdmupa ReEncodeFont" <[etbb_ifuncr.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-osf-ts1--base ETbb-Bold "AutoEnc_nvfc5y2s42cdp2nj6iltss7xrc ReEncodeFont" <[etbb_nvfc5y.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-t1--base ETbb-Bold "AutoEnc_nvr6ig6btf4vcx43seyfwfdddf ReEncodeFont" <[etbb_nvr6ig.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-sc-ot1--base ETbb-Bold "AutoEnc_icp3zkdjqefmy7aeihz6ksfvph ReEncodeFont" <[etbb_icp3zk.enc <ETbb-Bold.pfb
+ETbb-Bold-tosf-sc-t1--base ETbb-Bold "AutoEnc_u2xzqdhpypappkhgw7cwbtqsxe ReEncodeFont" <[etbb_u2xzqd.enc <ETbb-Bold.pfb
+ETbb-Bold-tosf-sc-ly1--base ETbb-Bold "AutoEnc_5ll7zhwvujbykp4klqbuo6xcpa ReEncodeFont" <[etbb_5ll7zh.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-t1--base ETbb-Bold "AutoEnc_4h6gmskd3mmlebycwa2rvw3mfh ReEncodeFont" <[etbb_4h6gms.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-Bold-tosf-ts1--base ETbb-Bold "AutoEnc_nvfc5y2s42cdp2nj6iltss7xrc ReEncodeFont" <[etbb_nvfc5y.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_rluk7ruzo437pfvfnnh45fsnde ReEncodeFont" <[etbb_rluk7r.enc <ETbb-Bold.pfb
+ETbb-Bold-dnom-ly1--base ETbb-Bold "AutoEnc_mpvq56haezsrrjg72prw5fumwf ReEncodeFont" <[etbb_mpvq56.enc <ETbb-Bold.pfb
+ETbb-BoldItalic-sup-ot1 ETbb-BoldItalic "AutoEnc_ea2dgh24m4p3kft426m6vb5nre ReEncodeFont" <[etbb_ea2dgh.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-sup-t1--base ETbb-BoldItalic "AutoEnc_7vqeicxaixdn6xbz3lrlbtoqhg ReEncodeFont" <[etbb_7vqeic.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-sup-ly1--base ETbb-BoldItalic "AutoEnc_7t4ywj5n7dfcy72ielrltqzb7a ReEncodeFont" <[etbb_7t4ywj.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_ujerr7xbnnjkudzzzotq7l2mrg ReEncodeFont" <[etbb_ujerr7.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_m74he64fxnid2mvcvujjgk3jfc ReEncodeFont" <[etbb_m74he6.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-lf-sc-t1--base ETbb-BoldItalic "AutoEnc_6b4rhpsa6pxda3dbpecbcbe4hh ReEncodeFont" <[etbb_6b4rhp.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-lf-sc-ly1--base ETbb-BoldItalic "AutoEnc_q62n247r56bsa7x73lg2hfrq3b ReEncodeFont" <[etbb_q62n24.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_gojfsqpn6o4h6lbxak4mkqz2pf ReEncodeFont" <[etbb_gojfsq.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_hn62aykleptmvhydkg3euih6fg ReEncodeFont" <[etbb_hn62ay.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-t1--base ETbb-BoldItalic "AutoEnc_hbqmiufivrhezoy6gtopfrghab ReEncodeFont" <[etbb_hbqmiu.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-sc-ot1--base ETbb-BoldItalic "AutoEnc_xq7qrab6xf2f2gznvgat2zorhc ReEncodeFont" <[etbb_xq7qra.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-tlf-sc-t1--base ETbb-BoldItalic "AutoEnc_n6yk3iegd2fawdz5k6sldx7ioc ReEncodeFont" <[etbb_n6yk3i.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-tlf-sc-ly1--base ETbb-BoldItalic "AutoEnc_ladhhj66shqsq2lfu2ukqmc2fg ReEncodeFont" <[etbb_ladhhj.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-t1--base ETbb-BoldItalic "AutoEnc_frt5zk5mf5bi5r6kaiwbsdwm4h ReEncodeFont" <[etbb_frt5zk.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-tlf-ts1--base ETbb-BoldItalic "AutoEnc_hn62aykleptmvhydkg3euih6fg ReEncodeFont" <[etbb_hn62ay.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_upf3oddxlsq2xphry33a6uekvh ReEncodeFont" <[etbb_upf3od.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-inf-ly1--base ETbb-BoldItalic "AutoEnc_kvzzr3edrncu7vt2awvffb64cc ReEncodeFont" <[etbb_kvzzr3.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-t1--base ETbb-BoldItalic "AutoEnc_55s5uqo65pdpku3cr7xsyxg5of ReEncodeFont" <[etbb_55s5uq.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-sc-ot1--base ETbb-BoldItalic "AutoEnc_3pnwavz3hg7d6qd5gas2dqmv6h ReEncodeFont" <[etbb_3pnwav.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-osf-sc-t1--base ETbb-BoldItalic "AutoEnc_gcyiicz4csxvfbjtqre3wkk2ma ReEncodeFont" <[etbb_gcyiic.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-osf-sc-ly1--base ETbb-BoldItalic "AutoEnc_j4gzycykvaqv5pnwloczfvlbha ReEncodeFont" <[etbb_j4gzyc.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-t1--base ETbb-BoldItalic "AutoEnc_ifuncrfewwm74pymebmifdmupa ReEncodeFont" <[etbb_ifuncr.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-osf-ts1--base ETbb-BoldItalic "AutoEnc_hn62aykleptmvhydkg3euih6fg ReEncodeFont" <[etbb_hn62ay.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-t1--base ETbb-BoldItalic "AutoEnc_nvr6ig6btf4vcx43seyfwfdddf ReEncodeFont" <[etbb_nvr6ig.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-sc-ot1--base ETbb-BoldItalic "AutoEnc_icp3zkdjqefmy7aeihz6ksfvph ReEncodeFont" <[etbb_icp3zk.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-tosf-sc-t1--base ETbb-BoldItalic "AutoEnc_u2xzqdhpypappkhgw7cwbtqsxe ReEncodeFont" <[etbb_u2xzqd.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-tosf-sc-ly1--base ETbb-BoldItalic "AutoEnc_boj3jd46imhlttx4pucalv5dud ReEncodeFont" <[etbb_boj3jd.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-t1--base ETbb-BoldItalic "AutoEnc_4h6gmskd3mmlebycwa2rvw3mfh ReEncodeFont" <[etbb_4h6gms.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-BoldItalic-tosf-ts1--base ETbb-BoldItalic "AutoEnc_hn62aykleptmvhydkg3euih6fg ReEncodeFont" <[etbb_hn62ay.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_rluk7ruzo437pfvfnnh45fsnde ReEncodeFont" <[etbb_rluk7r.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-dnom-ly1--base ETbb-BoldItalic "AutoEnc_yiqwpuq7peloj5eprodwnynevc ReEncodeFont" <[etbb_yiqwpu.enc <ETbb-BoldItalic.pfb
+ETbb-Italic-sup-ot1 ETbb-Italic "AutoEnc_tif2ynv3fdnyajhtthl5l33lxb ReEncodeFont" <[etbb_tif2yn.enc <ETbb-Italic.pfb
+ETbb-Italic-sup-t1--base ETbb-Italic "AutoEnc_ziol45eykyi2baku6kum6xzyig ReEncodeFont" <[etbb_ziol45.enc <ETbb-Italic.pfb
+ETbb-Italic-sup-ly1--base ETbb-Italic "AutoEnc_oynaqbx2tknlw3aeddaeveg26e ReEncodeFont" <[etbb_oynaqb.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_ujerr7xbnnjkudzzzotq7l2mrg ReEncodeFont" <[etbb_ujerr7.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_3rdlaplsvqg4x5d4ogftbp3u5b ReEncodeFont" <[etbb_3rdlap.enc <ETbb-Italic.pfb
+ETbb-Italic-lf-sc-t1--base ETbb-Italic "AutoEnc_vbmlbbxz7tbehbzj5lbnuze2zg ReEncodeFont" <[etbb_vbmlbb.enc <ETbb-Italic.pfb
+ETbb-Italic-lf-sc-ly1--base ETbb-Italic "AutoEnc_e7zo2oi7r3xrhfqd6ly5q2jezg ReEncodeFont" <[etbb_e7zo2o.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_gojfsqpn6o4h6lbxak4mkqz2pf ReEncodeFont" <[etbb_gojfsq.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_65swoaksouobshgplr6wc46zbe ReEncodeFont" <[etbb_65swoa.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-t1--base ETbb-Italic "AutoEnc_hbqmiufivrhezoy6gtopfrghab ReEncodeFont" <[etbb_hbqmiu.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-sc-ot1--base ETbb-Italic "AutoEnc_dz2nenk67xbt7khdbdbcfb6m7a ReEncodeFont" <[etbb_dz2nen.enc <ETbb-Italic.pfb
+ETbb-Italic-tlf-sc-t1--base ETbb-Italic "AutoEnc_ue3xcj3ucrhmky4gvnr7atygla ReEncodeFont" <[etbb_ue3xcj.enc <ETbb-Italic.pfb
+ETbb-Italic-tlf-sc-ly1--base ETbb-Italic "AutoEnc_cyp5f54p4q6zxw5lofrrfueuud ReEncodeFont" <[etbb_cyp5f5.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-t1--base ETbb-Italic "AutoEnc_frt5zk5mf5bi5r6kaiwbsdwm4h ReEncodeFont" <[etbb_frt5zk.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-tlf-ts1--base ETbb-Italic "AutoEnc_65swoaksouobshgplr6wc46zbe ReEncodeFont" <[etbb_65swoa.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_upf3oddxlsq2xphry33a6uekvh ReEncodeFont" <[etbb_upf3od.enc <ETbb-Italic.pfb
+ETbb-Italic-inf-ly1--base ETbb-Italic "AutoEnc_ytzykvcotxef33p6cozlsx4zlh ReEncodeFont" <[etbb_ytzykv.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-t1--base ETbb-Italic "AutoEnc_55s5uqo65pdpku3cr7xsyxg5of ReEncodeFont" <[etbb_55s5uq.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-sc-ot1--base ETbb-Italic "AutoEnc_le3wsuk34kmoex4bzg5ny6m6ph ReEncodeFont" <[etbb_le3wsu.enc <ETbb-Italic.pfb
+ETbb-Italic-osf-sc-t1--base ETbb-Italic "AutoEnc_6bb767vgyf6bkkruaompchxqgf ReEncodeFont" <[etbb_6bb767.enc <ETbb-Italic.pfb
+ETbb-Italic-osf-sc-ly1--base ETbb-Italic "AutoEnc_oe3mznofozp2ytwevbi4nhgsyh ReEncodeFont" <[etbb_oe3mzn.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-t1--base ETbb-Italic "AutoEnc_ifuncrfewwm74pymebmifdmupa ReEncodeFont" <[etbb_ifuncr.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-osf-ts1--base ETbb-Italic "AutoEnc_65swoaksouobshgplr6wc46zbe ReEncodeFont" <[etbb_65swoa.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-t1--base ETbb-Italic "AutoEnc_nvr6ig6btf4vcx43seyfwfdddf ReEncodeFont" <[etbb_nvr6ig.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-sc-ot1--base ETbb-Italic "AutoEnc_agksatcf7xec4mnvs5v6hcdxae ReEncodeFont" <[etbb_agksat.enc <ETbb-Italic.pfb
+ETbb-Italic-tosf-sc-t1--base ETbb-Italic "AutoEnc_cp6bsz5iopjtxmf6p55nagrmkh ReEncodeFont" <[etbb_cp6bsz.enc <ETbb-Italic.pfb
+ETbb-Italic-tosf-sc-ly1--base ETbb-Italic "AutoEnc_hdnox5ov25qala2bkiojjms64c ReEncodeFont" <[etbb_hdnox5.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-t1--base ETbb-Italic "AutoEnc_4h6gmskd3mmlebycwa2rvw3mfh ReEncodeFont" <[etbb_4h6gms.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-Italic-tosf-ts1--base ETbb-Italic "AutoEnc_65swoaksouobshgplr6wc46zbe ReEncodeFont" <[etbb_65swoa.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_rluk7ruzo437pfvfnnh45fsnde ReEncodeFont" <[etbb_rluk7r.enc <ETbb-Italic.pfb
+ETbb-Italic-dnom-ly1--base ETbb-Italic "AutoEnc_rzlqzq4dfqtplm3j7w5fz6domf ReEncodeFont" <[etbb_rzlqzq.enc <ETbb-Italic.pfb
+ETbb-Regular-sup-ot1 ETbb-Regular "AutoEnc_dep6cdmobxdewjybmud7kefdcf ReEncodeFont" <[etbb_dep6cd.enc <ETbb-Regular.pfb
+ETbb-Regular-sup-t1--base ETbb-Regular "AutoEnc_muumxeoou2fakmyg63u2ohpivb ReEncodeFont" <[etbb_muumxe.enc <ETbb-Regular.pfb
+ETbb-Regular-sup-ly1--base ETbb-Regular "AutoEnc_7pzsmkr2zp4z2jzsqyz5xypura ReEncodeFont" <[etbb_7pzsmk.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_ujerr7xbnnjkudzzzotq7l2mrg ReEncodeFont" <[etbb_ujerr7.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_ghqdpy3yxw3upgthc3bzm4vtqe ReEncodeFont" <[etbb_ghqdpy.enc <ETbb-Regular.pfb
+ETbb-Regular-lf-sc-t1--base ETbb-Regular "AutoEnc_vbmlbbxz7tbehbzj5lbnuze2zg ReEncodeFont" <[etbb_vbmlbb.enc <ETbb-Regular.pfb
+ETbb-Regular-lf-sc-ly1--base ETbb-Regular "AutoEnc_7uz5xhzp5ouhs2ck6ma6xzvyvd ReEncodeFont" <[etbb_7uz5xh.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_gojfsqpn6o4h6lbxak4mkqz2pf ReEncodeFont" <[etbb_gojfsq.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_6z6nrwwfi372xivperdacs5nkc ReEncodeFont" <[etbb_6z6nrw.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-t1--base ETbb-Regular "AutoEnc_hbqmiufivrhezoy6gtopfrghab ReEncodeFont" <[etbb_hbqmiu.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-sc-ot1--base ETbb-Regular "AutoEnc_qrk72gtd2bxaznl2wdopxnwg2e ReEncodeFont" <[etbb_qrk72g.enc <ETbb-Regular.pfb
+ETbb-Regular-tlf-sc-t1--base ETbb-Regular "AutoEnc_ue3xcj3ucrhmky4gvnr7atygla ReEncodeFont" <[etbb_ue3xcj.enc <ETbb-Regular.pfb
+ETbb-Regular-tlf-sc-ly1--base ETbb-Regular "AutoEnc_7tqudygnbzgjmkxijlp2ftxcbc ReEncodeFont" <[etbb_7tqudy.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-t1--base ETbb-Regular "AutoEnc_frt5zk5mf5bi5r6kaiwbsdwm4h ReEncodeFont" <[etbb_frt5zk.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-tlf-ts1--base ETbb-Regular "AutoEnc_6z6nrwwfi372xivperdacs5nkc ReEncodeFont" <[etbb_6z6nrw.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_3bao6xeqlfbwoz74bra6iev3fc ReEncodeFont" <[etbb_3bao6x.enc <ETbb-Regular.pfb
+ETbb-Regular-inf-ly1--base ETbb-Regular "AutoEnc_4sxvu4thduhlpavew6yzmuysdd ReEncodeFont" <[etbb_4sxvu4.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-t1--base ETbb-Regular "AutoEnc_55s5uqo65pdpku3cr7xsyxg5of ReEncodeFont" <[etbb_55s5uq.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-sc-ot1--base ETbb-Regular "AutoEnc_n5h2ymzshpvgw4adqdcmaf3b4g ReEncodeFont" <[etbb_n5h2ym.enc <ETbb-Regular.pfb
+ETbb-Regular-osf-sc-t1--base ETbb-Regular "AutoEnc_6bb767vgyf6bkkruaompchxqgf ReEncodeFont" <[etbb_6bb767.enc <ETbb-Regular.pfb
+ETbb-Regular-osf-sc-ly1--base ETbb-Regular "AutoEnc_ehl4wcmvklaee5zon2l2w6x6qe ReEncodeFont" <[etbb_ehl4wc.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-t1--base ETbb-Regular "AutoEnc_ifuncrfewwm74pymebmifdmupa ReEncodeFont" <[etbb_ifuncr.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-osf-ts1--base ETbb-Regular "AutoEnc_6z6nrwwfi372xivperdacs5nkc ReEncodeFont" <[etbb_6z6nrw.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-t1--base ETbb-Regular "AutoEnc_nvr6ig6btf4vcx43seyfwfdddf ReEncodeFont" <[etbb_nvr6ig.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-sc-ot1--base ETbb-Regular "AutoEnc_dv2xfwwuyxa3wtigrdvdpedgag ReEncodeFont" <[etbb_dv2xfw.enc <ETbb-Regular.pfb
+ETbb-Regular-tosf-sc-t1--base ETbb-Regular "AutoEnc_cp6bsz5iopjtxmf6p55nagrmkh ReEncodeFont" <[etbb_cp6bsz.enc <ETbb-Regular.pfb
+ETbb-Regular-tosf-sc-ly1--base ETbb-Regular "AutoEnc_7dlbn4dwkeu5h7cbv2vzasjpuf ReEncodeFont" <[etbb_7dlbn4.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-t1--base ETbb-Regular "AutoEnc_4h6gmskd3mmlebycwa2rvw3mfh ReEncodeFont" <[etbb_4h6gms.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-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-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-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-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
+ETbb-Regular-tosf-ts1--base ETbb-Regular "AutoEnc_6z6nrwwfi372xivperdacs5nkc ReEncodeFont" <[etbb_6z6nrw.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_rluk7ruzo437pfvfnnh45fsnde ReEncodeFont" <[etbb_rluk7r.enc <ETbb-Regular.pfb
+ETbb-Regular-dnom-ly1--base ETbb-Regular "AutoEnc_mpvq56haezsrrjg72prw5fumwf ReEncodeFont" <[etbb_mpvq56.enc <ETbb-Regular.pfb
+Etbb1-Bold-lf-t1--base ETbb-Bold "AutoEnc1_ujerr7xbnnjkudzzzotq7l2mrg ReEncodeFont" <[etbb1_ujerr7.enc <ETbb-Bold.pfb
+Etbb1-Bold-lf-sc-t1--base ETbb-Bold "AutoEnc1_6b4rhpsa6pxda3dbpecbcbe4hh ReEncodeFont" <[etbb1_6b4rhp.enc <ETbb-Bold.pfb
+Etbb1-Bold-lf-swash-t1--base ETbb-Bold "AutoEnc1_gojfsqpn6o4h6lbxak4mkqz2pf ReEncodeFont" <[etbb1_gojfsq.enc <ETbb-Bold.pfb
+Etbb1-Bold-tlf-t1--base ETbb-Bold "AutoEnc1_hbqmiufivrhezoy6gtopfrghab ReEncodeFont" <[etbb1_hbqmiu.enc <ETbb-Bold.pfb
+Etbb1-Bold-tlf-sc-t1--base ETbb-Bold "AutoEnc1_n6yk3iegd2fawdz5k6sldx7ioc ReEncodeFont" <[etbb1_n6yk3i.enc <ETbb-Bold.pfb
+Etbb1-Bold-tlf-swash-t1--base ETbb-Bold "AutoEnc1_frt5zk5mf5bi5r6kaiwbsdwm4h ReEncodeFont" <[etbb1_frt5zk.enc <ETbb-Bold.pfb
+Etbb1-Bold-osf-t1--base ETbb-Bold "AutoEnc1_55s5uqo65pdpku3cr7xsyxg5of ReEncodeFont" <[etbb1_55s5uq.enc <ETbb-Bold.pfb
+Etbb1-Bold-osf-sc-t1--base ETbb-Bold "AutoEnc1_gcyiicz4csxvfbjtqre3wkk2ma ReEncodeFont" <[etbb1_gcyiic.enc <ETbb-Bold.pfb
+Etbb1-Bold-osf-swash-t1--base ETbb-Bold "AutoEnc1_ifuncrfewwm74pymebmifdmupa ReEncodeFont" <[etbb1_ifuncr.enc <ETbb-Bold.pfb
+Etbb1-Bold-tosf-t1--base ETbb-Bold "AutoEnc1_nvr6ig6btf4vcx43seyfwfdddf ReEncodeFont" <[etbb1_nvr6ig.enc <ETbb-Bold.pfb
+Etbb1-Bold-tosf-sc-t1--base ETbb-Bold "AutoEnc1_u2xzqdhpypappkhgw7cwbtqsxe ReEncodeFont" <[etbb1_u2xzqd.enc <ETbb-Bold.pfb
+Etbb1-Bold-tosf-swash-t1--base ETbb-Bold "AutoEnc1_4h6gmskd3mmlebycwa2rvw3mfh ReEncodeFont" <[etbb1_4h6gms.enc <ETbb-Bold.pfb
+Etbb1-Bold-dnom-t1--base ETbb-Bold "AutoEnc1_rluk7ruzo437pfvfnnh45fsnde ReEncodeFont" <[etbb1_rluk7r.enc <ETbb-Bold.pfb
+Etbb1-BoldItalic-lf-t1--base ETbb-BoldItalic "AutoEnc1_ujerr7xbnnjkudzzzotq7l2mrg ReEncodeFont" <[etbb1_ujerr7.enc <ETbb-BoldItalic.pfb
+Etbb1-BoldItalic-lf-sc-t1--base ETbb-BoldItalic "AutoEnc1_6b4rhpsa6pxda3dbpecbcbe4hh ReEncodeFont" <[etbb1_6b4rhp.enc <ETbb-BoldItalic.pfb
+Etbb1-BoldItalic-lf-swash-t1--base ETbb-BoldItalic "AutoEnc1_gojfsqpn6o4h6lbxak4mkqz2pf ReEncodeFont" <[etbb1_gojfsq.enc <ETbb-BoldItalic.pfb
+Etbb1-BoldItalic-tlf-t1--base ETbb-BoldItalic "AutoEnc1_hbqmiufivrhezoy6gtopfrghab ReEncodeFont" <[etbb1_hbqmiu.enc <ETbb-BoldItalic.pfb
+Etbb1-BoldItalic-tlf-sc-t1--base ETbb-BoldItalic "AutoEnc1_n6yk3iegd2fawdz5k6sldx7ioc ReEncodeFont" <[etbb1_n6yk3i.enc <ETbb-BoldItalic.pfb
+Etbb1-BoldItalic-tlf-swash-t1--base ETbb-BoldItalic "AutoEnc1_frt5zk5mf5bi5r6kaiwbsdwm4h ReEncodeFont" <[etbb1_frt5zk.enc <ETbb-BoldItalic.pfb
+Etbb1-BoldItalic-osf-t1--base ETbb-BoldItalic "AutoEnc1_55s5uqo65pdpku3cr7xsyxg5of ReEncodeFont" <[etbb1_55s5uq.enc <ETbb-BoldItalic.pfb
+Etbb1-BoldItalic-osf-sc-t1--base ETbb-BoldItalic "AutoEnc1_gcyiicz4csxvfbjtqre3wkk2ma ReEncodeFont" <[etbb1_gcyiic.enc <ETbb-BoldItalic.pfb
+Etbb1-BoldItalic-osf-swash-t1--base ETbb-BoldItalic "AutoEnc1_ifuncrfewwm74pymebmifdmupa ReEncodeFont" <[etbb1_ifuncr.enc <ETbb-BoldItalic.pfb
+Etbb1-BoldItalic-tosf-t1--base ETbb-BoldItalic "AutoEnc1_nvr6ig6btf4vcx43seyfwfdddf ReEncodeFont" <[etbb1_nvr6ig.enc <ETbb-BoldItalic.pfb
+Etbb1-BoldItalic-tosf-sc-t1--base ETbb-BoldItalic "AutoEnc1_u2xzqdhpypappkhgw7cwbtqsxe ReEncodeFont" <[etbb1_u2xzqd.enc <ETbb-BoldItalic.pfb
+Etbb1-BoldItalic-tosf-swash-t1--base ETbb-BoldItalic "AutoEnc1_4h6gmskd3mmlebycwa2rvw3mfh ReEncodeFont" <[etbb1_4h6gms.enc <ETbb-BoldItalic.pfb
+Etbb1-BoldItalic-dnom-t1--base ETbb-BoldItalic "AutoEnc1_rluk7ruzo437pfvfnnh45fsnde ReEncodeFont" <[etbb1_rluk7r.enc <ETbb-BoldItalic.pfb
+Etbb1-Italic-lf-t1--base ETbb-Italic "AutoEnc1_ujerr7xbnnjkudzzzotq7l2mrg ReEncodeFont" <[etbb1_ujerr7.enc <ETbb-Italic.pfb
+Etbb1-Italic-lf-sc-t1--base ETbb-Italic "AutoEnc1_vbmlbbxz7tbehbzj5lbnuze2zg ReEncodeFont" <[etbb1_vbmlbb.enc <ETbb-Italic.pfb
+Etbb1-Italic-lf-swash-t1--base ETbb-Italic "AutoEnc1_gojfsqpn6o4h6lbxak4mkqz2pf ReEncodeFont" <[etbb1_gojfsq.enc <ETbb-Italic.pfb
+Etbb1-Italic-tlf-t1--base ETbb-Italic "AutoEnc1_hbqmiufivrhezoy6gtopfrghab ReEncodeFont" <[etbb1_hbqmiu.enc <ETbb-Italic.pfb
+Etbb1-Italic-tlf-sc-t1--base ETbb-Italic "AutoEnc1_ue3xcj3ucrhmky4gvnr7atygla ReEncodeFont" <[etbb1_ue3xcj.enc <ETbb-Italic.pfb
+Etbb1-Italic-tlf-swash-t1--base ETbb-Italic "AutoEnc1_frt5zk5mf5bi5r6kaiwbsdwm4h ReEncodeFont" <[etbb1_frt5zk.enc <ETbb-Italic.pfb
+Etbb1-Italic-osf-t1--base ETbb-Italic "AutoEnc1_55s5uqo65pdpku3cr7xsyxg5of ReEncodeFont" <[etbb1_55s5uq.enc <ETbb-Italic.pfb
+Etbb1-Italic-osf-sc-t1--base ETbb-Italic "AutoEnc1_6bb767vgyf6bkkruaompchxqgf ReEncodeFont" <[etbb1_6bb767.enc <ETbb-Italic.pfb
+Etbb1-Italic-osf-swash-t1--base ETbb-Italic "AutoEnc1_ifuncrfewwm74pymebmifdmupa ReEncodeFont" <[etbb1_ifuncr.enc <ETbb-Italic.pfb
+Etbb1-Italic-tosf-t1--base ETbb-Italic "AutoEnc1_nvr6ig6btf4vcx43seyfwfdddf ReEncodeFont" <[etbb1_nvr6ig.enc <ETbb-Italic.pfb
+Etbb1-Italic-tosf-sc-t1--base ETbb-Italic "AutoEnc1_cp6bsz5iopjtxmf6p55nagrmkh ReEncodeFont" <[etbb1_cp6bsz.enc <ETbb-Italic.pfb
+Etbb1-Italic-tosf-swash-t1--base ETbb-Italic "AutoEnc1_4h6gmskd3mmlebycwa2rvw3mfh ReEncodeFont" <[etbb1_4h6gms.enc <ETbb-Italic.pfb
+Etbb1-Italic-dnom-t1--base ETbb-Italic "AutoEnc1_rluk7ruzo437pfvfnnh45fsnde ReEncodeFont" <[etbb1_rluk7r.enc <ETbb-Italic.pfb
+Etbb1-Regular-lf-t1--base ETbb-Regular "AutoEnc1_ujerr7xbnnjkudzzzotq7l2mrg ReEncodeFont" <[etbb1_ujerr7.enc <ETbb-Regular.pfb
+Etbb1-Regular-lf-sc-t1--base ETbb-Regular "AutoEnc1_vbmlbbxz7tbehbzj5lbnuze2zg ReEncodeFont" <[etbb1_vbmlbb.enc <ETbb-Regular.pfb
+Etbb1-Regular-lf-swash-t1--base ETbb-Regular "AutoEnc1_gojfsqpn6o4h6lbxak4mkqz2pf ReEncodeFont" <[etbb1_gojfsq.enc <ETbb-Regular.pfb
+Etbb1-Regular-tlf-t1--base ETbb-Regular "AutoEnc1_hbqmiufivrhezoy6gtopfrghab ReEncodeFont" <[etbb1_hbqmiu.enc <ETbb-Regular.pfb
+Etbb1-Regular-tlf-sc-t1--base ETbb-Regular "AutoEnc1_ue3xcj3ucrhmky4gvnr7atygla ReEncodeFont" <[etbb1_ue3xcj.enc <ETbb-Regular.pfb
+Etbb1-Regular-tlf-swash-t1--base ETbb-Regular "AutoEnc1_frt5zk5mf5bi5r6kaiwbsdwm4h ReEncodeFont" <[etbb1_frt5zk.enc <ETbb-Regular.pfb
+Etbb1-Regular-osf-t1--base ETbb-Regular "AutoEnc1_55s5uqo65pdpku3cr7xsyxg5of ReEncodeFont" <[etbb1_55s5uq.enc <ETbb-Regular.pfb
+Etbb1-Regular-osf-sc-t1--base ETbb-Regular "AutoEnc1_6bb767vgyf6bkkruaompchxqgf ReEncodeFont" <[etbb1_6bb767.enc <ETbb-Regular.pfb
+Etbb1-Regular-osf-swash-t1--base ETbb-Regular "AutoEnc1_ifuncrfewwm74pymebmifdmupa ReEncodeFont" <[etbb1_ifuncr.enc <ETbb-Regular.pfb
+Etbb1-Regular-tosf-t1--base ETbb-Regular "AutoEnc1_nvr6ig6btf4vcx43seyfwfdddf ReEncodeFont" <[etbb1_nvr6ig.enc <ETbb-Regular.pfb
+Etbb1-Regular-tosf-sc-t1--base ETbb-Regular "AutoEnc1_cp6bsz5iopjtxmf6p55nagrmkh ReEncodeFont" <[etbb1_cp6bsz.enc <ETbb-Regular.pfb
+Etbb1-Regular-tosf-swash-t1--base ETbb-Regular "AutoEnc1_4h6gmskd3mmlebycwa2rvw3mfh ReEncodeFont" <[etbb1_4h6gms.enc <ETbb-Regular.pfb
+Etbb1-Regular-dnom-t1--base ETbb-Regular "AutoEnc1_rluk7ruzo437pfvfnnh45fsnde ReEncodeFont" <[etbb1_rluk7r.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 1d54b6a5b93..c6225cd7a4c 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 4ce97db0c79..b382326c63c 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 4c9270339e0..696e10f44ad 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 2a5a41b7936..8d23f7f1725 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-dnom-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-dnom-t1--base.tfm
index f8c5939c26e..d64e4980410 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-dnom-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-dnom-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-dnom-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-dnom-t1.tfm
index c4936669132..7610ec65a5c 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-dnom-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-dnom-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-inf-t1--base.tfm
index d629fbc6ac1..24f9de8c15a 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-inf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-inf-t1.tfm
index 92f8037878d..22e5c6cfa45 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-inf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-ly1--base.tfm
index 6838d4cb296..5b79c97fe9d 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-ly1.tfm
index ef2b8faeee2..655e0042659 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-ot1--base.tfm
index b1472f40d2e..1cdb6b812f7 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-ot1.tfm
index 84338ed6662..a56d1c3b54c 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-t1--base.tfm
index 7d2e29a971b..6184c9c0f4e 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-t1.tfm
index d2724f34ee0..663590264c2 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-sc-t1.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
index 3f75bc82459..90d855b7425 100644
--- 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
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
index 0e65a618867..8b4284d5382 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-t1--base.tfm
index 19dd31a4696..09113fe3d28 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-t1.tfm
index 240e125f122..1cc76da6ad9 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-lf-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 93458377f2a..74d5173c246 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 46b5f8830d8..d35839c57fc 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-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-ly1--base.tfm
index f78138f5477..c32cef4b639 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-ly1.tfm
index 783b395bfee..959b54686a9 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-ot1--base.tfm
index 19564720c57..e597d200c1f 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-ot1.tfm
index 791626465c3..820b78712a7 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-t1--base.tfm
index 4400c435519..9a631a4b76d 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-t1.tfm
index 7f77b7fcfc3..18d2fe05440 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-sc-t1.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
index 5f29caa54e7..ce716da99c1 100644
--- 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
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
index e76dc08843d..442e763c491 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-t1--base.tfm
index c0f0576f287..52c39759722 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-t1.tfm
index 0097210d477..7b3948b83dc 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-osf-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 93458377f2a..74d5173c246 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 46b5f8830d8..d35839c57fc 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-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-sup-t1--base.tfm
index af48adaea8f..e33939d68a1 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-sup-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-sup-t1.tfm
index 552b2b78e8d..b5f46c9c352 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-sup-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-ly1--base.tfm
index 6616901f4aa..0df208af09b 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-ly1.tfm
index c31283600aa..bd3ff5b07f8 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-ot1--base.tfm
index 9d655e9d467..c1523fecd55 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-ot1.tfm
index e5ed1d72122..9ac634ff9f3 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-t1--base.tfm
index 75decd77755..169606a1e6b 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-t1.tfm
index af61017b9a3..e627998198f 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-sc-t1.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
index 19107b7e104..a782a80af3b 100644
--- 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
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
index f7560fa99ca..bf1ba348da7 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-t1--base.tfm
index d89fa735fed..2821ec126d2 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-t1.tfm
index a4e9f271100..69c7633c5ea 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tlf-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 6bfb65321e3..74d5173c246 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 e64d8272584..d35839c57fc 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-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-ly1--base.tfm
index 09d90720515..4d983a5797d 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-ly1.tfm
index 61a5f2fc149..9f9213cec55 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-ot1--base.tfm
index a69e7c38600..52b96284802 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-ot1.tfm
index afa3a784b80..02bd32094d0 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-t1--base.tfm
index 0d5a1521050..119d37af33a 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-t1.tfm
index 4f22f745324..5f26c1b57e5 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-sc-t1.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
index f5b61af4682..737c5b698f1 100644
--- 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
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
index da305345cbe..535aa9d7a49 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-t1--base.tfm
index 13472e55717..5a297d00e8a 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-t1.tfm
index 5a7e074a462..392e9314444 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Bold-tosf-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 6bfb65321e3..74d5173c246 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 e64d8272584..d35839c57fc 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-dnom-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-dnom-t1--base.tfm
index 388d1938425..d81a90c3a95 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-dnom-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-dnom-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-inf-t1--base.tfm
index 6dd8fad2d49..022007f6bef 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-inf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-ly1--base.tfm
index 97e21d58213..ab6163d2eac 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-ly1.tfm
index 22f39f77df5..0861deaa47f 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-ot1--base.tfm
index 2dfbdf43a8d..5bc715597ce 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-ot1.tfm
index 758d42bea15..61a3ac42ebb 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-t1--base.tfm
index 72b9989e052..6fec1e10a9e 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-t1.tfm
index 8a805a82788..d92a36a64d2 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-sc-t1.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
index 56d9fd7f9c7..371c492835e 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-t1--base.tfm
index 2003c6b5633..502f2c067f7 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-lf-t1--base.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 7b16ad81f18..48305093eff 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 b8977c91aad..66aaa23f967 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-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-ly1--base.tfm
index 3e00490141f..2ae41b7a59d 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-ly1.tfm
index 68039d26549..9e59936a285 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-ot1--base.tfm
index eeac56e63b1..69c80370b23 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-ot1.tfm
index 4bcc4da6f6d..e4ab456c1ec 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-t1--base.tfm
index b97f6d77356..c7ac56a0a99 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-t1.tfm
index 37141dcac68..b74875ab82d 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-sc-t1.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
index 4328ba13438..3c89daca63d 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-t1--base.tfm
index 56c97a16682..04883279c78 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-osf-t1--base.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 7b16ad81f18..48305093eff 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 b8977c91aad..66aaa23f967 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-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-sup-t1--base.tfm
index c25b959bf6b..bc0eaabcc01 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-sup-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-sup-t1.tfm
index 6d7c2eacea6..63ac34b3a0d 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-sup-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-ly1--base.tfm
index ef323ce4c54..39e05715dad 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-ly1.tfm
index 7ee4a89f643..1d4d3e787b0 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-ot1--base.tfm
index 96827ca56b6..f42ff916a1a 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-ot1.tfm
index 4927ed3266d..ed34b676199 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-t1--base.tfm
index 2cf4b6d7474..9e85424fb18 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-t1.tfm
index 76beba82108..01012f85160 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-sc-t1.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
index 83d6953fea5..765f29797fb 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-t1--base.tfm
index f21bd5df2fa..7f9b839bb26 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tlf-t1--base.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 6ded3870e9f..48305093eff 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 41360078311..66aaa23f967 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-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-ly1--base.tfm
index 125fbac0ab8..ca1e4fd5c9b 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-ly1.tfm
index d968d909c34..4abb96e96e3 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-ot1--base.tfm
index f7e89932f3b..74caaff526f 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-ot1.tfm
index 333a62c3c37..f5249223643 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-t1--base.tfm
index ec2a1f67e96..a07fa544128 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-t1.tfm
index 5b287af2dea..2535757e775 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-sc-t1.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
index a948527ee28..196a4f2cc8c 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-t1--base.tfm
index 5b02191f9f8..37763b201bd 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-BoldItalic-tosf-t1--base.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 6ded3870e9f..48305093eff 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 41360078311..66aaa23f967 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-dnom-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-dnom-t1--base.tfm
index cea6abf711c..79d2f1c3117 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-dnom-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-dnom-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-dnom-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-dnom-t1.tfm
index 05d9aa2776f..7db0d884c7b 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-dnom-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-dnom-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-inf-t1--base.tfm
index 6425f9d9991..66de353198b 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-inf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-inf-t1.tfm
index 5e30dd1f37b..4bb8691bf06 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-inf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-ly1--base.tfm
index 9467dee3a16..fbbeca61338 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-ly1.tfm
index 9ca9f2a71a1..83938d7fede 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-ot1--base.tfm
index 279575ea9e1..35071f5f567 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-ot1.tfm
index a70e912c896..858f79c252c 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-t1--base.tfm
index 9e29e3d30c1..24302d43960 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-t1.tfm
index 7cc4604357b..9d6b723993e 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-sc-t1.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
index af1c848ed76..5c2286a054a 100644
--- 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
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
index 848877c818b..3bfcc53e33b 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-t1--base.tfm
index 6798e5afe99..9706951e49e 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-t1.tfm
index c14ff7bbb93..77b1d208917 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-lf-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 5491c16520c..0860a64909f 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 7fa74f928d5..bef4ca8d942 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-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-ly1--base.tfm
index 245e9e4724a..42e3d71b81c 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-ly1.tfm
index ec4ef613a78..5eef3258a36 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-ot1--base.tfm
index 762595e0dcc..af4fac960ce 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-ot1.tfm
index a6ff5e5ef02..f3cd05c8c5d 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-t1--base.tfm
index 13e85fc6c58..674a7050405 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-t1.tfm
index 0cdb5a579ec..a597fce4c86 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-sc-t1.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
index 1d1320394f9..8bcf50a509d 100644
--- 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
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
index 685bd0f06d4..1c1079d943d 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-t1--base.tfm
index f087dfbda29..89f3ae07e8d 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-t1.tfm
index 7de89a57acf..5a44f4e9896 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-osf-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 5491c16520c..0860a64909f 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 7fa74f928d5..bef4ca8d942 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-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-sup-t1--base.tfm
index b32548a2b1d..768d0d8001f 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-sup-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-sup-t1.tfm
index 14ab0e8d287..d89ccc4de37 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-sup-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-ly1--base.tfm
index b2fd4e1e298..bcd1210799a 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-ly1.tfm
index e5897653cb4..bbe7b25ec62 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-ot1--base.tfm
index 08c75b5ec3b..18c3a2aec91 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-ot1.tfm
index 4d221e1db94..1f93ac3d9ab 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-t1--base.tfm
index 31fb3d7119c..0f1ba02d4b9 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-t1.tfm
index 959ff440345..2250dffcd8d 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-sc-t1.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
index 318f58ad548..b356424a95c 100644
--- 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
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
index e10b16fa6e3..e1021b18542 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-t1--base.tfm
index cf0f283cc66..fa1072031a9 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-t1.tfm
index 4eb4a448737..86495230362 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tlf-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 f535630f56a..0860a64909f 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 61a759b7a61..bef4ca8d942 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-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-ly1--base.tfm
index 2308e8091e5..13624040cfc 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-ly1.tfm
index 7a61ed42522..3e2911d9ef2 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-ot1--base.tfm
index d52cdd3f1b3..cf15f94f7c4 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-ot1.tfm
index a759d473a8c..2fd2d8815a6 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-t1--base.tfm
index e56665cd7f8..d14609db89b 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-t1.tfm
index fd33905f45a..4408e4e9bb6 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-sc-t1.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
index 6264cbaca1f..d33df212ce8 100644
--- 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
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
index 850cc4b7c82..6f480c93e32 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-t1--base.tfm
index 08bb1f44046..24effbb3cdc 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-t1.tfm
index 11471e2b84c..6c327ac3c21 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Italic-tosf-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 f535630f56a..0860a64909f 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 61a759b7a61..bef4ca8d942 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-dnom-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-dnom-t1--base.tfm
index d0c24f702b9..028ca2af8f0 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-dnom-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-dnom-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-dnom-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-dnom-t1.tfm
index b8795493837..788e235c711 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-dnom-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-dnom-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-inf-t1--base.tfm
index 18d9c6d2f94..f55e76f6908 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-inf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-inf-t1.tfm
index e82b719e066..a898a0780da 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-inf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-ly1--base.tfm
index a3df75a74c8..5ff0505fb7b 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-ly1.tfm
index 6076ba9810f..6e1a6bbc010 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-ot1--base.tfm
index b4d13cfcba9..e6b99874329 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-ot1.tfm
index a63aefb78cb..9509a32b689 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-t1--base.tfm
index c6ef99aaf4f..43c8511c0a6 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-t1.tfm
index d0600059173..daf8264a65e 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-sc-t1.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
index 25ee3be640f..fbbc7035850 100644
--- 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
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
index b2b9342a762..05da41158b6 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-t1--base.tfm
index b550abedfe8..8147dcfc306 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-t1.tfm
index 56dc42c03ac..2256b7c52ae 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-lf-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 8bb26a3b289..8255b344676 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 dda6726f253..d0c88cf00da 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-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-ly1--base.tfm
index 28f097de1e8..9fa7b02d315 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-ly1.tfm
index f38436df0b3..de860d8f7a6 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-ot1--base.tfm
index 78e0e154b0c..91cccbae2c4 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-ot1.tfm
index 842feacfacb..2900227ffde 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-t1--base.tfm
index 693b6e67e7e..95e9e5e9eee 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-t1.tfm
index 95de7a60e7a..6cf8b354633 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-sc-t1.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
index 5f3a5a748fe..8295f1d51df 100644
--- 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
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
index f6da0376d4f..ee63fb78d3d 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-t1--base.tfm
index 79674387b48..1995a6def2d 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-t1.tfm
index 28ba073ed93..af4726308bb 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-osf-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 8bb26a3b289..8255b344676 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 dda6726f253..d0c88cf00da 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-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-sup-t1--base.tfm
index f9c35886bce..129c60a543f 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-sup-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-sup-t1.tfm
index cf14424570d..42e63a6109e 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-sup-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-ly1--base.tfm
index 8be02450b20..033edfb37f6 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-ly1.tfm
index 5ebcb6a3350..43ef2156169 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-ot1--base.tfm
index 358854ff126..29deeaa30f1 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-ot1.tfm
index a755a10b531..f27d39c914a 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-t1--base.tfm
index 0f12f38baee..e2ee65416d4 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-t1.tfm
index 551cc81dfd9..3b4c52ea549 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-sc-t1.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
index 6d1c13a18e4..1327d20d032 100644
--- 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
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
index 07492b4e2a8..1c64cd955bf 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-t1--base.tfm
index 844ecb55c62..28f14ea8ea4 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-t1.tfm
index 71e4f9abf1e..08e39877225 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tlf-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 8107e45556e..8255b344676 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 640600bdc32..d0c88cf00da 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-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-ly1--base.tfm
index 5eff11748a1..3d3e9b06021 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-ly1.tfm
index 3da8b140f4d..ae50848a257 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-ot1--base.tfm
index 18ef01c2db3..ccd846a6e3b 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-ot1.tfm
index fd2eb33fcfe..7e334ad508f 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-t1--base.tfm
index 511a9094106..e24fe6bd7b1 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-t1.tfm
index aca6e69aa5b..b1507f7cb7b 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-sc-t1.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
index 6a93cf25bf5..05251001c4b 100644
--- 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
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
index 59df47bb0aa..e7c29d1f268 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-t1--base.tfm
index ce1d7787f8a..5b5df7341e3 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-t1.tfm
index 836f1f7662c..2f224c18751 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/ETbb-Regular-tosf-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 8107e45556e..8255b344676 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 640600bdc32..d0c88cf00da 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-dnom-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-dnom-t1--base.tfm
index 82b999eed0e..930a4831106 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-dnom-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-dnom-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-dnom-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-dnom-t1.tfm
index e9f17040e41..e404e91b31c 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-dnom-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-dnom-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-sc-t1--base.tfm
index bd17ff0ced6..3675375c7cb 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-sc-t1.tfm
index c588ed8d919..2033f328986 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-sc-t1.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
index 866cf623d30..4ba78e9c4f2 100644
--- 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
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
index 5e599217491..8c539ed43a5 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-t1--base.tfm
index 76f3c40e6f3..bf274f3f2fb 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-t1.tfm
index cb55d41a600..756b854120a 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-sc-t1--base.tfm
index adedb94c0bf..c5360ea23ff 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-sc-t1.tfm
index dbafaef3409..bb326262463 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-sc-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
index be3d2645e9b..edea64b0155 100644
--- 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
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
index b0d46263c57..4189b9058b0 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-t1--base.tfm
index b3ceb917736..486039b1692 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-t1.tfm
index e47a2f80b15..1efa6d43093 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-osf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-sc-t1--base.tfm
index a8099f0f787..069385111a6 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-sc-t1.tfm
index 71a1246a5cf..0d5f3e13a59 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-sc-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
index 591a6bf54c4..ccb241716a2 100644
--- 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
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
index ce1d6636557..8aeeb1c023f 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-t1--base.tfm
index fa115283401..df575a3aeba 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-t1.tfm
index b2db0d3c146..c29e9b9bea6 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tlf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-sc-t1--base.tfm
index 4fbbefea47c..e78778b6b6e 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-sc-t1.tfm
index a5789a61e7f..6f0cad885c7 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-sc-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
index b821a786b4e..b4c96713802 100644
--- 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
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
index 0288018fc01..1914cae50ff 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-t1--base.tfm
index 4da794825b9..4e9891f483e 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-t1.tfm
index 1e2e05893ff..00bc94657f5 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Bold-tosf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-dnom-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-dnom-t1--base.tfm
index 41fca1b861a..56ea413d149 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-dnom-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-dnom-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-dnom-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-dnom-t1.tfm
index 2ce5bf17234..1ca2c56b0da 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-dnom-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-dnom-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-sc-t1--base.tfm
index 9625e95a454..caee911dbd9 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-sc-t1.tfm
index af8203f7329..72e43a3107c 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-sc-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
index c8f70b50712..0ebe69aea43 100644
--- 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
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
index 96634983f39..1ecbd0f95f0 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-t1--base.tfm
index 5935d9a532d..86c28f40bb4 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-t1.tfm
index 40eb8d0bf0a..0d44c95b32e 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-sc-t1--base.tfm
index 0331b9e0bfc..b9665f81777 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-sc-t1.tfm
index d880b63c8ed..db3c8d73399 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-sc-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
index 7937c47cb5c..3ab22579f44 100644
--- 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
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
index d6050561cc7..6a5b8b6921f 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-t1--base.tfm
index a6420df3b02..6460540a942 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-t1.tfm
index f1133b3708e..1a10880addb 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-osf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-sc-t1--base.tfm
index 939620514c5..dd1a598b52f 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-sc-t1.tfm
index a7f1222fa8a..54054bf5ae5 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-sc-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
index c26891fda5c..81abcb51789 100644
--- 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
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
index b55ebcdfcb9..c83ed2650da 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-t1--base.tfm
index 10894666d62..9eb3879fd5b 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-t1.tfm
index d5ca9ade5ba..070fb88b9ff 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tlf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-sc-t1--base.tfm
index 399059c189b..00100cb06cc 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-sc-t1.tfm
index 9126a09710f..c11aa402a97 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-sc-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
index cf68ae0412c..f71057645b8 100644
--- 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
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
index 7386a0159d2..885cec3617a 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-t1--base.tfm
index 8ad4ad26ee9..5b78f82318f 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-t1.tfm
index ccc9b1f9c8c..9e760fe6795 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-BoldItalic-tosf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-dnom-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-dnom-t1--base.tfm
index 103338a79bd..ca2c4a204bc 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-dnom-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-dnom-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-dnom-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-dnom-t1.tfm
index d2b2f356a22..c5cc2b6e7d5 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-dnom-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-dnom-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-sc-t1--base.tfm
index ad38e9e1bc7..c075f1ca690 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-sc-t1.tfm
index 2fb95df68da..b0003bd2f1a 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-sc-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
index 82fcfa88900..7158f3d27c1 100644
--- 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
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
index 729aa71e7c3..7c233361720 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-t1--base.tfm
index 54ef872be03..6b6df9f5069 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-t1.tfm
index cb9ce113a12..b2f675f0c13 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-sc-t1--base.tfm
index b2622e4a571..91665119dcb 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-sc-t1.tfm
index df125846b87..b360bafe71f 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-sc-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
index c24c9260b1d..0da41d3411e 100644
--- 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
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
index 649c80af72f..ff5ac150a26 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-t1--base.tfm
index 4bfedfae566..2ecfdcfb471 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-t1.tfm
index b063805d05b..d96fbd8c7b9 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-osf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-sc-t1--base.tfm
index 300d506499a..6c2dfb5cc61 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-sc-t1.tfm
index e6c8597d452..f1e90861947 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-sc-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
index a902356baf1..7e7360a6988 100644
--- 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
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
index 747561dcbd0..4c202fdddcc 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-t1--base.tfm
index 07005920316..0b9f176342b 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-t1.tfm
index 41254a75511..fcfb5cbe1cb 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tlf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-sc-t1--base.tfm
index ed4c7b8dde4..ea865c658a9 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-sc-t1.tfm
index d1353f5fef7..e29c9a14fa6 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-sc-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
index 4d5c6867e69..fbe7c63128d 100644
--- 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
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
index e11022d4fd0..67961bf8efd 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-t1--base.tfm
index 553a68de23f..f2c5910c07b 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-t1.tfm
index c3f894635bc..bd9c59f199a 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Italic-tosf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-dnom-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-dnom-t1--base.tfm
index 05f05339d51..3a6ac89170c 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-dnom-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-dnom-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-dnom-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-dnom-t1.tfm
index 40213bb199e..2e3decf61e7 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-dnom-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-dnom-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-sc-t1--base.tfm
index 066d1783aa0..4be64a41a68 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-sc-t1.tfm
index 4d2fb1d18e4..e0290738875 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-sc-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
index 715de18b26f..884cb7239df 100644
--- 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
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
index aec872d0f88..ab1b479ff60 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-t1--base.tfm
index 1f9f3bcc873..0ae1b82f993 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-t1.tfm
index 31ba4217586..66ebc4a2bd9 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-sc-t1--base.tfm
index c03bda2b993..994a89283b7 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-sc-t1.tfm
index ff19105d292..2260e806349 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-sc-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
index 22178850fe5..57be6a79f55 100644
--- 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
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
index 97c93c4f9ba..fd102aceadb 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-t1--base.tfm
index 2866a0384df..8c88183b46f 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-t1.tfm
index 4c91f124298..7309dc89b3a 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-osf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-sc-t1--base.tfm
index 4606f0a17cf..f4055a28156 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-sc-t1.tfm
index adc87d4c902..fd5b42c962c 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-sc-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
index 8fab63c8a62..8c4aa1b5ccf 100644
--- 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
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
index 7fbbd7c8c36..e807156a1dc 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-t1--base.tfm
index a5b07618e4e..5bd9c1ae6f7 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-t1.tfm
index 3f2da6bf367..b39079853ef 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tlf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-sc-t1--base.tfm
index 6d64f2ce7df..4c02b940c92 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-sc-t1.tfm
index b001a39508d..dd04f7b1bff 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-sc-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
index 222eb049d71..9a4b8fe9f51 100644
--- 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
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
index 94a78ba27be..7647f0f9eb2 100644
--- 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
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-t1--base.tfm
index 482897a8363..c3da514d832 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-t1.tfm
index cbd7242d820..46f5aca0892 100644
--- a/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/etbb/Etbb1-Regular-tosf-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 5b531d8e64e..d65a7772164 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 9cef4fafef5..69dd7839bf7 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 c322ba35db5..b9e92de752c 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 d6380220605..ff8060bb3e6 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-dnom-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-dnom-t1.vf
index a7a6d97cbbc..48e13ec08e7 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-dnom-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-dnom-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-inf-t1.vf
index ce75e1f16a9..3245134ddba 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-inf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-sc-ly1.vf
index 544a4137925..830645a5968 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-sc-ot1.vf
index b7b7373e9b3..8ba4973e221 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-sc-t1.vf
index 80d89e7fc6b..c95088303fa 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-sc-t1.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
index ce5232025a9..7a6cd053518 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-t1.vf
index 6b94066a2d7..269ad99fd19 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-lf-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 37b303c75de..06e8984a1ac 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-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-sc-ly1.vf
index 48308939afe..fa8f520d943 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-sc-ot1.vf
index 7587b93aa69..bc0e355f5c1 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-sc-t1.vf
index dd23846595b..7544c9ca4fc 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-sc-t1.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
index 7b977e47cf4..d4b4197c99a 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-t1.vf
index 4bc54ca0918..a57ce2af9af 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-osf-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 4493b946906..589bcbd11c6 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-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-sup-t1.vf
index 2762a8f8024..7b1a9e3d760 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-sup-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-sc-ly1.vf
index 32c93bdee72..0d6e38d45d7 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-sc-ot1.vf
index 664c2b0bd5e..2e2836c7b1f 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-sc-t1.vf
index 14c76c343e4..f68a6e39f04 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-sc-t1.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
index 13b859c4edd..fa3333dde30 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-t1.vf
index 398c7133ced..d7cf1c24d57 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tlf-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 70eaf33b74c..86bb7ccae5e 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-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-sc-ly1.vf
index 7797dd41b08..ad67dd4d969 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-sc-ot1.vf
index 021edc4b582..a42169b3495 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-sc-t1.vf
index 093f93f4532..54d1d59af4f 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-sc-t1.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
index 4233b43ea46..fa7ca5b8cf4 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-t1.vf
index 9fb037e9087..a616854cb9a 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Bold-tosf-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 71d28df3b0a..8ec16db0842 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-dnom-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-dnom-t1.vf
index a1b3670c0d4..845e4dbd285 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-dnom-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-dnom-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-inf-t1.vf
index 1bd6d2fc2f5..86b70cb741b 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-inf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-sc-ly1.vf
index 748c4001d18..3ba00a944e7 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-sc-ot1.vf
index 6159d008cfd..600f8603d3c 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-sc-t1.vf
index 49a8c4637e3..f5a64cde289 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-sc-t1.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
index 2b20ebeb320..45d6dc83d60 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-t1.vf
index c802f516c63..782581e9086 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-lf-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 4af70356626..8eac86ca30f 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-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-sc-ly1.vf
index 557e467e64e..13dabd84a01 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-sc-ot1.vf
index 1c5bf99f470..8a0d9efaba0 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-sc-t1.vf
index 809711c5472..db502b6fa1d 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-sc-t1.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
index 067bf9e007f..1be31847cc7 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-t1.vf
index 9466f2cbab4..3a0dac76712 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-osf-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 27f97702fc1..19bab2cdfd7 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-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-sup-t1.vf
index 03263e1179e..0a2950304a0 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-sup-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-sc-ly1.vf
index bb49ca13b27..8e535fb45ad 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-sc-ot1.vf
index 184c9714ef1..87acab8be58 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-sc-t1.vf
index 1efa4cd5db2..6ba65bc5c0a 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-sc-t1.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
index 4adaa1444dd..1021637836b 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-t1.vf
index fbf7b8a8051..50e42fe5417 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tlf-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 8bd25cd770b..d13a867ccd9 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-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-sc-ly1.vf
index 0b657b35eea..07431cb86bc 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-sc-ot1.vf
index 912e1138390..23bbff9fe82 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-sc-t1.vf
index fd02ce28694..71c2227d7ed 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-sc-t1.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
index ceb60c15260..fe7b3a77c55 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-t1.vf
index b015cddd6c0..19d15aa1f85 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-BoldItalic-tosf-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 a4df3f8c3d1..e68560734f1 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-dnom-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-dnom-t1.vf
index e55edcceca2..a8cdb7ef608 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-dnom-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-dnom-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-inf-t1.vf
index e4992231089..4ea50592b1f 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-inf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-sc-ly1.vf
index 16415ba7b30..39fb3c1be36 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-sc-ot1.vf
index 19a35a0405b..15608415143 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-sc-t1.vf
index 8d9e8849905..aa52be77679 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-sc-t1.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
index b309e6bce55..1e6f5b4e7ea 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-t1.vf
index 1a7d8d493c6..6bec7d03701 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-lf-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 7f33f2d3bd9..0801e77353e 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-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-sc-ly1.vf
index 7fe1d96897e..b463e088b70 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-sc-ot1.vf
index cdef3d829c2..3eb9f4af827 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-sc-t1.vf
index 0f0bb7079e9..f0b126ee264 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-sc-t1.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
index 251c2cac55b..eabbedbf95d 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-t1.vf
index 1b32f6e734d..cb0bb22cac3 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-osf-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 7c45d62c7fb..582d6e369f3 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-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-sup-t1.vf
index ade2209bc73..728398ba46d 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-sup-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-sc-ly1.vf
index 5cc5a790cfa..942517149e7 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-sc-ot1.vf
index b36e9b8c802..0b779c835d1 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-sc-t1.vf
index e41c34077ab..ea4d550357d 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-sc-t1.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
index 9037eefdd16..2f4fbe5d9c2 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-t1.vf
index b645d239830..9c85e08ce37 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tlf-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 ceba3b9aca3..74e05f9584e 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-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-sc-ly1.vf
index 8c522429a69..d397e1469ce 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-sc-ot1.vf
index 164fc7e928d..1eced0baa9c 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-sc-t1.vf
index 78f866ca09b..d88ea08e436 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-sc-t1.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
index 3871cf0008e..7a571814cc9 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-t1.vf
index e037b65eb8b..49d48c73dd9 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Italic-tosf-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 6b70cd9526c..5fe19469b77 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-dnom-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-dnom-t1.vf
index a09c8dab804..46697603e6d 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-dnom-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-dnom-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-inf-t1.vf
index 4e29d010227..8b2edce98d1 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-inf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-sc-ly1.vf
index 396a7296a22..b11865b05f2 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-sc-ot1.vf
index b97a01c5d0c..c79434a4122 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-sc-t1.vf
index dd4ee0427e7..8351c2dc23f 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-sc-t1.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
index 00a0a544bda..cfc5298da3b 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-t1.vf
index 8fea93638af..aedfbc38260 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-lf-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 05501754a8f..e45b652692a 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-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-sc-ly1.vf
index 98b051ac46b..68300a9bef2 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-sc-ot1.vf
index b65fe1fe87e..6b6a505b9a4 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-sc-t1.vf
index 22aef67eaf6..fa30b6def4f 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-sc-t1.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
index 52ad47af09d..b64175d7361 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-t1.vf
index d788abcb823..d6042f2224d 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-osf-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 9e451f940c3..4ead90e792e 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-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-sup-t1.vf
index 9e43cec0aa5..cac2c844ec8 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-sup-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-sc-ly1.vf
index c0a1259e0b1..8cf7d6f3385 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-sc-ot1.vf
index 14627a4ee7d..7a4c26a9d98 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-sc-t1.vf
index a96d4af4307..688a3ef6dba 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-sc-t1.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
index 2d99d9ff49d..ddedf67ea7e 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-t1.vf
index 24b6c4e9182..c46c767e681 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tlf-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 6e4f7a85dff..104390bee30 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-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-sc-ly1.vf
index 678f50e1920..ca0d3965b5d 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-sc-ot1.vf
index 88ab219ab05..52db31d71aa 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-sc-t1.vf
index 0ada40bf6d2..2f128270486 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-sc-t1.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
index 1e570412406..d6aa49e7ec5 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-t1.vf
index 96c65602fa5..57a942794e6 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/ETbb-Regular-tosf-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 73c5defecde..df7ae2126a0 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-dnom-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-dnom-t1.vf
index 8a74fab813c..38252dd2a56 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-dnom-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-dnom-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-lf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-lf-sc-t1.vf
index 56f472cc632..873cf17652e 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-lf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-lf-sc-t1.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
index 57deb9d3af1..4cc673ffab1 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-lf-t1.vf
index 01486b89de0..ba6939b33f9 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-lf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-osf-sc-t1.vf
index b6272db1530..951287c34d5 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-osf-sc-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
index 454299b7a7d..5a0cb805309 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-osf-t1.vf
index 7a54911f9ac..5504ceb41fc 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-osf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tlf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tlf-sc-t1.vf
index a86b7ebe77b..e0474daabcc 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tlf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tlf-sc-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
index 23f5e671961..0ef7715a08e 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tlf-t1.vf
index 5c7c874b78f..c19dfdfb874 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tlf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tosf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tosf-sc-t1.vf
index 50c6f00be18..e4d124ba450 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tosf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tosf-sc-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
index 9127f7e62cb..2f009bd0fc5 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tosf-t1.vf
index 58f5e013639..a862cf3eec1 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Bold-tosf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-dnom-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-dnom-t1.vf
index e3179c92d1d..a2a2d4c04ea 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-dnom-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-dnom-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-lf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-lf-sc-t1.vf
index d200300208d..f0a6f0f0e50 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-lf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-lf-sc-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
index 4d24b794869..8523df81cda 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-lf-t1.vf
index 27e0f47e8e2..a2ab126203d 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-lf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-osf-sc-t1.vf
index 7c0d601e7a3..86d63179950 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-osf-sc-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
index 3eb11931a50..4a90181ccc8 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-osf-t1.vf
index 5f8356605ab..781c4813ebb 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-osf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tlf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tlf-sc-t1.vf
index f93c9017d04..bedfe1f5976 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tlf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tlf-sc-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
index f71c7927c6a..0dd9bae25c3 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tlf-t1.vf
index f973b61f180..ffa2fa2fe33 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tlf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tosf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tosf-sc-t1.vf
index 9e243d52592..5899c3f88d8 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tosf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tosf-sc-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
index fc502c2e571..ff5445ef4ab 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tosf-t1.vf
index 66d0964c00b..2abaa750ecd 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-BoldItalic-tosf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-dnom-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-dnom-t1.vf
index 5ea88b77b4e..b7f4966eca2 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-dnom-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-dnom-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-lf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-lf-sc-t1.vf
index 5f69c2e604f..54c67ccdcb4 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-lf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-lf-sc-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
index 48f245f5a9a..12a64bcf662 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-lf-t1.vf
index b3b58a37db2..1e61d817a22 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-lf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-osf-sc-t1.vf
index b941417af12..deef60ff9d4 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-osf-sc-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
index cf1d9ead0b1..0acb0f78776 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-osf-t1.vf
index 2f7d666e4c5..acbbf7b1c12 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-osf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tlf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tlf-sc-t1.vf
index f1173a6e0ac..1de7d72dfdc 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tlf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tlf-sc-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
index 7a169eaa417..9823997551c 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tlf-t1.vf
index 13d122c4126..947d349da1e 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tlf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tosf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tosf-sc-t1.vf
index 293ab13de27..45e16395f0a 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tosf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tosf-sc-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
index 25ee7aab3ac..5e4e9d0790c 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tosf-t1.vf
index 80610dd7a01..189e1fca4e6 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Italic-tosf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-dnom-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-dnom-t1.vf
index 8e3fd321211..7f30329220f 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-dnom-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-dnom-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-lf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-lf-sc-t1.vf
index 294a4cb3538..f8002e5a28b 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-lf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-lf-sc-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
index 29ecea302b4..57f9e1ceb60 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-lf-t1.vf
index 9513c7a5b5d..7e0680a7223 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-lf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-osf-sc-t1.vf
index 35638dd8ed1..cbb58cac131 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-osf-sc-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
index acd97d5b592..749f310dc0f 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-osf-t1.vf
index a97b64e02a5..5b1f545e893 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-osf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tlf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tlf-sc-t1.vf
index bb2874935d5..3143bbce2cd 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tlf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tlf-sc-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
index 51b82c432e8..f7863ee688b 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tlf-t1.vf
index 1158aaf423b..cd77e248ece 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tlf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tosf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tosf-sc-t1.vf
index f56624504b6..a8afe1006dd 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tosf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tosf-sc-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
index 22ed9cbc6bf..77447898dde 100644
--- 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
diff --git a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tosf-t1.vf
index fe6edfbeb61..3f800aedb8a 100644
--- a/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/etbb/Etbb1-Regular-tosf-t1.vf
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Dnom.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Dnom.fd
index 4924d3a55a0..448ecacaf37 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/07/01
+%% Generated by autoinst on 2021/12/18
 %%
 \ProvidesFile{LY1ETbb-Dnom.fd}
-    [2020/07/01 (autoinst)  Font definitions for LY1/ETbb-Dnom.]
+    [2021/12/18 (autoinst)  Font definitions for LY1/ETbb-Dnom.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,71 +20,61 @@
 \DeclareFontFamily{LY1}{ETbb-Dnom}{}
 
 
-%   ----  bold  ----
+%   ----  b = bold  ----
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-dnom-ly1
+\DeclareFontShape{LY1}{ETbb-Dnom}{b}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-dnom-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-Dnom}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-dnom-ly1
+      <-> alias * ETbb-Dnom/b/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{sl}{
-      <-> ssub * ETbb-Dnom/bold/it
+\DeclareFontShape{LY1}{ETbb-Dnom}{b}{n}{
+      <-> \ETbb@@scale ETbb-Bold-dnom-ly1
 }{}
 
-
-%   ----  regular  ----
-
-\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-dnom-ly1
+\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{n}{
+      <-> alias * ETbb-Dnom/b/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-dnom-ly1
+\DeclareFontShape{LY1}{ETbb-Dnom}{b}{sl}{
+    <-> ssub * ETbb-Dnom/b/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{sl}{
-      <-> ssub * ETbb-Dnom/regular/it
+\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{sl}{
+    <-> ssub * ETbb-Dnom/bold/it
 }{}
 
-%
-%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
 
-%   m --> regular
+%   ----  m = regular  ----
 
 \DeclareFontShape{LY1}{ETbb-Dnom}{m}{n}{
-      <-> alias * ETbb-Dnom/regular/n
+      <-> \ETbb@@scale ETbb-Regular-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{m}{sl}{
-      <-> alias * ETbb-Dnom/regular/sl
+\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{n}{
+      <-> alias * ETbb-Dnom/m/n
 }{}
 
 \DeclareFontShape{LY1}{ETbb-Dnom}{m}{it}{
-      <-> alias * ETbb-Dnom/regular/it
+      <-> \ETbb@@scale ETbb-Italic-dnom-ly1
 }{}
 
-
-%   b --> bold
-
-\DeclareFontShape{LY1}{ETbb-Dnom}{b}{it}{
-      <-> alias * ETbb-Dnom/bold/it
+\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{it}{
+      <-> alias * ETbb-Dnom/m/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{b}{sl}{
-      <-> alias * ETbb-Dnom/bold/sl
+\DeclareFontShape{LY1}{ETbb-Dnom}{m}{sl}{
+    <-> ssub * ETbb-Dnom/m/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{b}{n}{
-      <-> alias * ETbb-Dnom/bold/n
+\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{sl}{
+    <-> ssub * ETbb-Dnom/regular/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{bx}{it}{
-      <-> ssub * ETbb-Dnom/b/it
-}{}
+
+%   ----  Extra 'ssub' rules to map 'bx' to 'b'  ----
 
 \DeclareFontShape{LY1}{ETbb-Dnom}{bx}{n}{
       <-> ssub * ETbb-Dnom/b/n
@@ -94,4 +84,8 @@
       <-> ssub * ETbb-Dnom/b/sl
 }{}
 
+\DeclareFontShape{LY1}{ETbb-Dnom}{bx}{it}{
+      <-> ssub * ETbb-Dnom/b/it
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd
index e2c933c86df..2aa77b5a9c5 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/07/01
+%% Generated by autoinst on 2021/12/18
 %%
 \ProvidesFile{LY1ETbb-Inf.fd}
-    [2020/07/01 (autoinst)  Font definitions for LY1/ETbb-Inf.]
+    [2021/12/18 (autoinst)  Font definitions for LY1/ETbb-Inf.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,66 +20,64 @@
 \DeclareFontFamily{LY1}{ETbb-Inf}{}
 
 
-%   ----  regular  ----
+%   ----  m = regular  ----
 
-\DeclareFontShape{LY1}{ETbb-Inf}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-inf-ly1
+\DeclareFontShape{LY1}{ETbb-Inf}{m}{it}{
+      <-> \ETbb@@scale ETbb-Italic-inf-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-Inf}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-inf-ly1
+      <-> alias * ETbb-Inf/m/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{regular}{sl}{
-      <-> ssub * ETbb-Inf/regular/it
+\DeclareFontShape{LY1}{ETbb-Inf}{m}{n}{
+      <-> \ETbb@@scale ETbb-Regular-inf-ly1
 }{}
 
-
-%   ----  bold  ----
-
-\DeclareFontShape{LY1}{ETbb-Inf}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-inf-ly1
+\DeclareFontShape{LY1}{ETbb-Inf}{regular}{n}{
+      <-> alias * ETbb-Inf/m/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-inf-ly1
+\DeclareFontShape{LY1}{ETbb-Inf}{m}{sl}{
+    <-> ssub * ETbb-Inf/m/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{bold}{sl}{
-      <-> ssub * ETbb-Inf/bold/it
+\DeclareFontShape{LY1}{ETbb-Inf}{regular}{sl}{
+    <-> ssub * ETbb-Inf/regular/it
 }{}
 
-%
-%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
 
-%   m --> regular
+%   ----  b = bold  ----
 
-\DeclareFontShape{LY1}{ETbb-Inf}{m}{it}{
-      <-> alias * ETbb-Inf/regular/it
+\DeclareFontShape{LY1}{ETbb-Inf}{b}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{m}{n}{
-      <-> alias * ETbb-Inf/regular/n
+\DeclareFontShape{LY1}{ETbb-Inf}{bold}{it}{
+      <-> alias * ETbb-Inf/b/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{m}{sl}{
-      <-> alias * ETbb-Inf/regular/sl
+\DeclareFontShape{LY1}{ETbb-Inf}{b}{n}{
+      <-> \ETbb@@scale ETbb-Bold-inf-ly1
 }{}
 
+\DeclareFontShape{LY1}{ETbb-Inf}{bold}{n}{
+      <-> alias * ETbb-Inf/b/n
+}{}
 
-%   b --> bold
-
-\DeclareFontShape{LY1}{ETbb-Inf}{b}{it}{
-      <-> alias * ETbb-Inf/bold/it
+\DeclareFontShape{LY1}{ETbb-Inf}{b}{sl}{
+    <-> ssub * ETbb-Inf/b/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{b}{n}{
-      <-> alias * ETbb-Inf/bold/n
+\DeclareFontShape{LY1}{ETbb-Inf}{bold}{sl}{
+    <-> ssub * ETbb-Inf/bold/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{b}{sl}{
-      <-> alias * ETbb-Inf/bold/sl
+
+%   ----  Extra 'ssub' rules to map 'bx' to 'b'  ----
+
+\DeclareFontShape{LY1}{ETbb-Inf}{bx}{it}{
+      <-> ssub * ETbb-Inf/b/it
 }{}
 
 \DeclareFontShape{LY1}{ETbb-Inf}{bx}{n}{
@@ -90,8 +88,4 @@
       <-> ssub * ETbb-Inf/b/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{bx}{it}{
-      <-> ssub * ETbb-Inf/b/it
-}{}
-
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd
index ba3f657a21e..c00872dbd3f 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/07/01
+%% Generated by autoinst on 2021/12/18
 %%
 \ProvidesFile{LY1ETbb-Sup.fd}
-    [2020/07/01 (autoinst)  Font definitions for LY1/ETbb-Sup.]
+    [2021/12/18 (autoinst)  Font definitions for LY1/ETbb-Sup.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,71 +20,61 @@
 \DeclareFontFamily{LY1}{ETbb-Sup}{}
 
 
-%   ----  regular  ----
+%   ----  m = regular  ----
 
-\DeclareFontShape{LY1}{ETbb-Sup}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-sup-ly1
+\DeclareFontShape{LY1}{ETbb-Sup}{m}{n}{
+      <-> \ETbb@@scale ETbb-Regular-sup-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-Sup}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-sup-ly1
+      <-> alias * ETbb-Sup/m/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Sup}{regular}{sl}{
-      <-> ssub * ETbb-Sup/regular/it
+\DeclareFontShape{LY1}{ETbb-Sup}{m}{it}{
+      <-> \ETbb@@scale ETbb-Italic-sup-ly1
 }{}
 
-
-%   ----  bold  ----
-
-\DeclareFontShape{LY1}{ETbb-Sup}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-sup-ly1
+\DeclareFontShape{LY1}{ETbb-Sup}{regular}{it}{
+      <-> alias * ETbb-Sup/m/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Sup}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-sup-ly1
+\DeclareFontShape{LY1}{ETbb-Sup}{m}{sl}{
+    <-> ssub * ETbb-Sup/m/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Sup}{bold}{sl}{
-      <-> ssub * ETbb-Sup/bold/it
+\DeclareFontShape{LY1}{ETbb-Sup}{regular}{sl}{
+    <-> ssub * ETbb-Sup/regular/it
 }{}
 
-%
-%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
 
-%   m --> regular
+%   ----  b = bold  ----
 
-\DeclareFontShape{LY1}{ETbb-Sup}{m}{sl}{
-      <-> alias * ETbb-Sup/regular/sl
+\DeclareFontShape{LY1}{ETbb-Sup}{b}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Sup}{m}{n}{
-      <-> alias * ETbb-Sup/regular/n
+\DeclareFontShape{LY1}{ETbb-Sup}{bold}{it}{
+      <-> alias * ETbb-Sup/b/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Sup}{m}{it}{
-      <-> alias * ETbb-Sup/regular/it
+\DeclareFontShape{LY1}{ETbb-Sup}{b}{n}{
+      <-> \ETbb@@scale ETbb-Bold-sup-ly1
 }{}
 
-
-%   b --> bold
+\DeclareFontShape{LY1}{ETbb-Sup}{bold}{n}{
+      <-> alias * ETbb-Sup/b/n
+}{}
 
 \DeclareFontShape{LY1}{ETbb-Sup}{b}{sl}{
-      <-> alias * ETbb-Sup/bold/sl
+    <-> ssub * ETbb-Sup/b/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Sup}{b}{n}{
-      <-> alias * ETbb-Sup/bold/n
+\DeclareFontShape{LY1}{ETbb-Sup}{bold}{sl}{
+    <-> ssub * ETbb-Sup/bold/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Sup}{b}{it}{
-      <-> alias * ETbb-Sup/bold/it
-}{}
 
-\DeclareFontShape{LY1}{ETbb-Sup}{bx}{it}{
-      <-> ssub * ETbb-Sup/b/it
-}{}
+%   ----  Extra 'ssub' rules to map 'bx' to 'b'  ----
 
 \DeclareFontShape{LY1}{ETbb-Sup}{bx}{n}{
       <-> ssub * ETbb-Sup/b/n
@@ -94,4 +84,8 @@
       <-> 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/OT1ETbb-Dnom.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Dnom.fd
index 5638d234eca..47e1d8bf611 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/07/01
+%% Generated by autoinst on 2021/12/18
 %%
 \ProvidesFile{OT1ETbb-Dnom.fd}
-    [2020/07/01 (autoinst)  Font definitions for OT1/ETbb-Dnom.]
+    [2021/12/18 (autoinst)  Font definitions for OT1/ETbb-Dnom.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,66 +20,64 @@
 \DeclareFontFamily{OT1}{ETbb-Dnom}{}
 
 
-%   ----  regular  ----
+%   ----  b = bold  ----
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-dnom-ot1
+\DeclareFontShape{OT1}{ETbb-Dnom}{b}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-dnom-ot1
+\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{it}{
+      <-> alias * ETbb-Dnom/b/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{sl}{
-      <-> ssub * ETbb-Dnom/regular/it
+\DeclareFontShape{OT1}{ETbb-Dnom}{b}{n}{
+      <-> \ETbb@@scale ETbb-Bold-dnom-ot1
 }{}
 
-
-%   ----  bold  ----
-
-\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-dnom-ot1
+\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{n}{
+      <-> alias * ETbb-Dnom/b/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-dnom-ot1
+\DeclareFontShape{OT1}{ETbb-Dnom}{b}{sl}{
+    <-> ssub * ETbb-Dnom/b/it
 }{}
 
 \DeclareFontShape{OT1}{ETbb-Dnom}{bold}{sl}{
-      <-> ssub * ETbb-Dnom/bold/it
+    <-> ssub * ETbb-Dnom/bold/it
 }{}
 
-%
-%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
 
-%   m --> regular
+%   ----  m = regular  ----
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{m}{it}{
-      <-> alias * ETbb-Dnom/regular/it
+\DeclareFontShape{OT1}{ETbb-Dnom}{m}{n}{
+      <-> \ETbb@@scale ETbb-Regular-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{m}{sl}{
-      <-> alias * ETbb-Dnom/regular/sl
+\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{n}{
+      <-> alias * ETbb-Dnom/m/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{m}{n}{
-      <-> alias * ETbb-Dnom/regular/n
+\DeclareFontShape{OT1}{ETbb-Dnom}{m}{it}{
+      <-> \ETbb@@scale ETbb-Italic-dnom-ot1
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{it}{
+      <-> alias * ETbb-Dnom/m/it
+}{}
 
-%   b --> bold
-
-\DeclareFontShape{OT1}{ETbb-Dnom}{b}{it}{
-      <-> alias * ETbb-Dnom/bold/it
+\DeclareFontShape{OT1}{ETbb-Dnom}{m}{sl}{
+    <-> ssub * ETbb-Dnom/m/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{b}{n}{
-      <-> alias * ETbb-Dnom/bold/n
+\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{sl}{
+    <-> ssub * ETbb-Dnom/regular/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{b}{sl}{
-      <-> alias * ETbb-Dnom/bold/sl
+
+%   ----  Extra 'ssub' rules to map 'bx' to 'b'  ----
+
+\DeclareFontShape{OT1}{ETbb-Dnom}{bx}{it}{
+      <-> ssub * ETbb-Dnom/b/it
 }{}
 
 \DeclareFontShape{OT1}{ETbb-Dnom}{bx}{n}{
@@ -90,8 +88,4 @@
       <-> ssub * ETbb-Dnom/b/sl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{bx}{it}{
-      <-> ssub * ETbb-Dnom/b/it
-}{}
-
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd
index d521370a34a..9cb1a65d3d1 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/07/01
+%% Generated by autoinst on 2021/12/18
 %%
 \ProvidesFile{OT1ETbb-Inf.fd}
-    [2020/07/01 (autoinst)  Font definitions for OT1/ETbb-Inf.]
+    [2021/12/18 (autoinst)  Font definitions for OT1/ETbb-Inf.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,72 +20,62 @@
 \DeclareFontFamily{OT1}{ETbb-Inf}{}
 
 
-%   ----  bold  ----
+%   ----  m = regular  ----
 
-\DeclareFontShape{OT1}{ETbb-Inf}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-inf-ot1
+\DeclareFontShape{OT1}{ETbb-Inf}{m}{n}{
+      <-> \ETbb@@scale ETbb-Regular-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-inf-ot1
+\DeclareFontShape{OT1}{ETbb-Inf}{regular}{n}{
+      <-> alias * ETbb-Inf/m/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{bold}{sl}{
-      <-> ssub * ETbb-Inf/bold/it
+\DeclareFontShape{OT1}{ETbb-Inf}{m}{it}{
+      <-> \ETbb@@scale ETbb-Italic-inf-ot1
 }{}
 
-
-%   ----  regular  ----
-
 \DeclareFontShape{OT1}{ETbb-Inf}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-inf-ot1
+      <-> alias * ETbb-Inf/m/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-inf-ot1
+\DeclareFontShape{OT1}{ETbb-Inf}{m}{sl}{
+    <-> ssub * ETbb-Inf/m/it
 }{}
 
 \DeclareFontShape{OT1}{ETbb-Inf}{regular}{sl}{
-      <-> ssub * ETbb-Inf/regular/it
+    <-> ssub * ETbb-Inf/regular/it
 }{}
 
-%
-%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
-
-%   m --> regular
 
-\DeclareFontShape{OT1}{ETbb-Inf}{m}{sl}{
-      <-> alias * ETbb-Inf/regular/sl
-}{}
+%   ----  b = bold  ----
 
-\DeclareFontShape{OT1}{ETbb-Inf}{m}{n}{
-      <-> alias * ETbb-Inf/regular/n
+\DeclareFontShape{OT1}{ETbb-Inf}{b}{n}{
+      <-> \ETbb@@scale ETbb-Bold-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{m}{it}{
-      <-> alias * ETbb-Inf/regular/it
+\DeclareFontShape{OT1}{ETbb-Inf}{bold}{n}{
+      <-> alias * ETbb-Inf/b/n
 }{}
 
-
-%   b --> bold
-
 \DeclareFontShape{OT1}{ETbb-Inf}{b}{it}{
-      <-> alias * ETbb-Inf/bold/it
+      <-> \ETbb@@scale ETbb-BoldItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{b}{n}{
-      <-> alias * ETbb-Inf/bold/n
+\DeclareFontShape{OT1}{ETbb-Inf}{bold}{it}{
+      <-> alias * ETbb-Inf/b/it
 }{}
 
 \DeclareFontShape{OT1}{ETbb-Inf}{b}{sl}{
-      <-> alias * ETbb-Inf/bold/sl
+    <-> ssub * ETbb-Inf/b/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{bx}{it}{
-      <-> ssub * ETbb-Inf/b/it
+\DeclareFontShape{OT1}{ETbb-Inf}{bold}{sl}{
+    <-> ssub * ETbb-Inf/bold/it
 }{}
 
+
+%   ----  Extra 'ssub' rules to map 'bx' to 'b'  ----
+
 \DeclareFontShape{OT1}{ETbb-Inf}{bx}{sl}{
       <-> ssub * ETbb-Inf/b/sl
 }{}
@@ -94,4 +84,8 @@
       <-> ssub * ETbb-Inf/b/n
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Inf}{bx}{it}{
+      <-> ssub * ETbb-Inf/b/it
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd
index f3e90c21429..eaad6bbc2a5 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/07/01
+%% Generated by autoinst on 2021/12/18
 %%
 \ProvidesFile{OT1ETbb-Sup.fd}
-    [2020/07/01 (autoinst)  Font definitions for OT1/ETbb-Sup.]
+    [2021/12/18 (autoinst)  Font definitions for OT1/ETbb-Sup.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,66 +20,64 @@
 \DeclareFontFamily{OT1}{ETbb-Sup}{}
 
 
-%   ----  regular  ----
+%   ----  m = regular  ----
 
-\DeclareFontShape{OT1}{ETbb-Sup}{regular}{it}{
+\DeclareFontShape{OT1}{ETbb-Sup}{m}{it}{
       <-> \ETbb@@scale ETbb-Italic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-sup-ot1
+\DeclareFontShape{OT1}{ETbb-Sup}{regular}{it}{
+      <-> alias * ETbb-Sup/m/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{regular}{sl}{
-      <-> ssub * ETbb-Sup/regular/it
+\DeclareFontShape{OT1}{ETbb-Sup}{m}{n}{
+      <-> \ETbb@@scale ETbb-Regular-sup-ot1
 }{}
 
-
-%   ----  bold  ----
-
-\DeclareFontShape{OT1}{ETbb-Sup}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-sup-ot1
+\DeclareFontShape{OT1}{ETbb-Sup}{regular}{n}{
+      <-> alias * ETbb-Sup/m/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-sup-ot1
+\DeclareFontShape{OT1}{ETbb-Sup}{m}{sl}{
+    <-> ssub * ETbb-Sup/m/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{bold}{sl}{
-      <-> ssub * ETbb-Sup/bold/it
+\DeclareFontShape{OT1}{ETbb-Sup}{regular}{sl}{
+    <-> ssub * ETbb-Sup/regular/it
 }{}
 
-%
-%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
 
-%   m --> regular
+%   ----  b = bold  ----
 
-\DeclareFontShape{OT1}{ETbb-Sup}{m}{n}{
-      <-> alias * ETbb-Sup/regular/n
+\DeclareFontShape{OT1}{ETbb-Sup}{b}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{m}{sl}{
-      <-> alias * ETbb-Sup/regular/sl
+\DeclareFontShape{OT1}{ETbb-Sup}{bold}{it}{
+      <-> alias * ETbb-Sup/b/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{m}{it}{
-      <-> alias * ETbb-Sup/regular/it
+\DeclareFontShape{OT1}{ETbb-Sup}{b}{n}{
+      <-> \ETbb@@scale ETbb-Bold-sup-ot1
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Sup}{bold}{n}{
+      <-> alias * ETbb-Sup/b/n
+}{}
 
-%   b --> bold
-
-\DeclareFontShape{OT1}{ETbb-Sup}{b}{it}{
-      <-> alias * ETbb-Sup/bold/it
+\DeclareFontShape{OT1}{ETbb-Sup}{b}{sl}{
+    <-> ssub * ETbb-Sup/b/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{b}{n}{
-      <-> alias * ETbb-Sup/bold/n
+\DeclareFontShape{OT1}{ETbb-Sup}{bold}{sl}{
+    <-> ssub * ETbb-Sup/bold/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{b}{sl}{
-      <-> alias * ETbb-Sup/bold/sl
+
+%   ----  Extra 'ssub' rules to map 'bx' to 'b'  ----
+
+\DeclareFontShape{OT1}{ETbb-Sup}{bx}{it}{
+      <-> ssub * ETbb-Sup/b/it
 }{}
 
 \DeclareFontShape{OT1}{ETbb-Sup}{bx}{n}{
@@ -90,8 +88,4 @@
       <-> ssub * ETbb-Sup/b/sl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{bx}{it}{
-      <-> ssub * ETbb-Sup/b/it
-}{}
-
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Dnom.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Dnom.fd
index d3c5e759422..4e6cb6ec8bd 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/07/01
+%% Generated by autoinst on 2021/12/18
 %%
 \ProvidesFile{T1ETbb-Dnom.fd}
-    [2020/07/01 (autoinst)  Font definitions for T1/ETbb-Dnom.]
+    [2021/12/18 (autoinst)  Font definitions for T1/ETbb-Dnom.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,67 +20,61 @@
 \DeclareFontFamily{T1}{ETbb-Dnom}{}
 
 
-%   ----  bold  ----
+%   ----  m = regular  ----
 
-\DeclareFontShape{T1}{ETbb-Dnom}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-dnom-t1
+\DeclareFontShape{T1}{ETbb-Dnom}{m}{it}{
+      <-> \ETbb@@scale ETbb-Italic-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Dnom}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-dnom-t1
+\DeclareFontShape{T1}{ETbb-Dnom}{regular}{it}{
+      <-> alias * ETbb-Dnom/m/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Dnom}{bold}{sl}{
-      <-> ssub * ETbb-Dnom/bold/it
+\DeclareFontShape{T1}{ETbb-Dnom}{m}{n}{
+      <-> \ETbb@@scale ETbb-Regular-dnom-t1
 }{}
 
-
-%   ----  regular  ----
-
-\DeclareFontShape{T1}{ETbb-Dnom}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-dnom-t1
+\DeclareFontShape{T1}{ETbb-Dnom}{regular}{n}{
+      <-> alias * ETbb-Dnom/m/n
 }{}
 
-\DeclareFontShape{T1}{ETbb-Dnom}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-dnom-t1
+\DeclareFontShape{T1}{ETbb-Dnom}{m}{sl}{
+    <-> ssub * ETbb-Dnom/m/it
 }{}
 
 \DeclareFontShape{T1}{ETbb-Dnom}{regular}{sl}{
-      <-> ssub * ETbb-Dnom/regular/it
+    <-> ssub * ETbb-Dnom/regular/it
 }{}
 
-%
-%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
 
-%   m --> regular
+%   ----  b = bold  ----
 
-\DeclareFontShape{T1}{ETbb-Dnom}{m}{sl}{
-      <-> alias * ETbb-Dnom/regular/sl
+\DeclareFontShape{T1}{ETbb-Dnom}{b}{n}{
+      <-> \ETbb@@scale ETbb-Bold-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Dnom}{m}{n}{
-      <-> alias * ETbb-Dnom/regular/n
+\DeclareFontShape{T1}{ETbb-Dnom}{bold}{n}{
+      <-> alias * ETbb-Dnom/b/n
 }{}
 
-\DeclareFontShape{T1}{ETbb-Dnom}{m}{it}{
-      <-> alias * ETbb-Dnom/regular/it
+\DeclareFontShape{T1}{ETbb-Dnom}{b}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-dnom-t1
 }{}
 
-
-%   b --> bold
+\DeclareFontShape{T1}{ETbb-Dnom}{bold}{it}{
+      <-> alias * ETbb-Dnom/b/it
+}{}
 
 \DeclareFontShape{T1}{ETbb-Dnom}{b}{sl}{
-      <-> alias * ETbb-Dnom/bold/sl
+    <-> ssub * ETbb-Dnom/b/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Dnom}{b}{n}{
-      <-> alias * ETbb-Dnom/bold/n
+\DeclareFontShape{T1}{ETbb-Dnom}{bold}{sl}{
+    <-> ssub * ETbb-Dnom/bold/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Dnom}{b}{it}{
-      <-> alias * ETbb-Dnom/bold/it
-}{}
+
+%   ----  Extra 'ssub' rules to map 'bx' to 'b'  ----
 
 \DeclareFontShape{T1}{ETbb-Dnom}{bx}{sl}{
       <-> ssub * ETbb-Dnom/b/sl
diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd
index a207ba97ea7..4992550b056 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/07/01
+%% Generated by autoinst on 2021/12/18
 %%
 \ProvidesFile{T1ETbb-Inf.fd}
-    [2020/07/01 (autoinst)  Font definitions for T1/ETbb-Inf.]
+    [2021/12/18 (autoinst)  Font definitions for T1/ETbb-Inf.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,68 +20,62 @@
 \DeclareFontFamily{T1}{ETbb-Inf}{}
 
 
-%   ----  bold  ----
+%   ----  b = bold  ----
 
-\DeclareFontShape{T1}{ETbb-Inf}{bold}{it}{
+\DeclareFontShape{T1}{ETbb-Inf}{b}{it}{
       <-> \ETbb@@scale ETbb-BoldItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-inf-t1
+\DeclareFontShape{T1}{ETbb-Inf}{bold}{it}{
+      <-> alias * ETbb-Inf/b/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{bold}{sl}{
-      <-> ssub * ETbb-Inf/bold/it
+\DeclareFontShape{T1}{ETbb-Inf}{b}{n}{
+      <-> \ETbb@@scale ETbb-Bold-inf-t1
 }{}
 
-
-%   ----  regular  ----
-
-\DeclareFontShape{T1}{ETbb-Inf}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-inf-t1
+\DeclareFontShape{T1}{ETbb-Inf}{bold}{n}{
+      <-> alias * ETbb-Inf/b/n
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-inf-t1
+\DeclareFontShape{T1}{ETbb-Inf}{b}{sl}{
+    <-> ssub * ETbb-Inf/b/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{regular}{sl}{
-      <-> ssub * ETbb-Inf/regular/it
+\DeclareFontShape{T1}{ETbb-Inf}{bold}{sl}{
+    <-> ssub * ETbb-Inf/bold/it
 }{}
 
-%
-%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
 
-%   m --> regular
+%   ----  m = regular  ----
 
-\DeclareFontShape{T1}{ETbb-Inf}{m}{sl}{
-      <-> alias * ETbb-Inf/regular/sl
+\DeclareFontShape{T1}{ETbb-Inf}{m}{n}{
+      <-> \ETbb@@scale ETbb-Regular-inf-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{m}{n}{
-      <-> alias * ETbb-Inf/regular/n
+\DeclareFontShape{T1}{ETbb-Inf}{regular}{n}{
+      <-> alias * ETbb-Inf/m/n
 }{}
 
 \DeclareFontShape{T1}{ETbb-Inf}{m}{it}{
-      <-> alias * ETbb-Inf/regular/it
+      <-> \ETbb@@scale ETbb-Italic-inf-t1
 }{}
 
-
-%   b --> bold
-
-\DeclareFontShape{T1}{ETbb-Inf}{b}{n}{
-      <-> alias * ETbb-Inf/bold/n
+\DeclareFontShape{T1}{ETbb-Inf}{regular}{it}{
+      <-> alias * ETbb-Inf/m/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{b}{sl}{
-      <-> alias * ETbb-Inf/bold/sl
+\DeclareFontShape{T1}{ETbb-Inf}{m}{sl}{
+    <-> ssub * ETbb-Inf/m/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{b}{it}{
-      <-> alias * ETbb-Inf/bold/it
+\DeclareFontShape{T1}{ETbb-Inf}{regular}{sl}{
+    <-> ssub * ETbb-Inf/regular/it
 }{}
 
+
+%   ----  Extra 'ssub' rules to map 'bx' to 'b'  ----
+
 \DeclareFontShape{T1}{ETbb-Inf}{bx}{it}{
       <-> ssub * ETbb-Inf/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd
index 378a6ad038a..1404d80d0f5 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/07/01
+%% Generated by autoinst on 2021/12/18
 %%
 \ProvidesFile{T1ETbb-Sup.fd}
-    [2020/07/01 (autoinst)  Font definitions for T1/ETbb-Sup.]
+    [2021/12/18 (autoinst)  Font definitions for T1/ETbb-Sup.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,78 +20,72 @@
 \DeclareFontFamily{T1}{ETbb-Sup}{}
 
 
-%   ----  regular  ----
+%   ----  b = bold  ----
 
-\DeclareFontShape{T1}{ETbb-Sup}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-sup-t1
+\DeclareFontShape{T1}{ETbb-Sup}{b}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Sup}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-sup-t1
+\DeclareFontShape{T1}{ETbb-Sup}{bold}{it}{
+      <-> alias * ETbb-Sup/b/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Sup}{regular}{sl}{
-      <-> ssub * ETbb-Sup/regular/it
+\DeclareFontShape{T1}{ETbb-Sup}{b}{n}{
+      <-> \ETbb@@scale ETbb-Bold-sup-t1
 }{}
 
-
-%   ----  bold  ----
-
-\DeclareFontShape{T1}{ETbb-Sup}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-sup-t1
+\DeclareFontShape{T1}{ETbb-Sup}{bold}{n}{
+      <-> alias * ETbb-Sup/b/n
 }{}
 
-\DeclareFontShape{T1}{ETbb-Sup}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-sup-t1
+\DeclareFontShape{T1}{ETbb-Sup}{b}{sl}{
+    <-> ssub * ETbb-Sup/b/it
 }{}
 
 \DeclareFontShape{T1}{ETbb-Sup}{bold}{sl}{
-      <-> ssub * ETbb-Sup/bold/it
+    <-> ssub * ETbb-Sup/bold/it
 }{}
 
-%
-%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
 
-%   m --> regular
+%   ----  m = regular  ----
 
 \DeclareFontShape{T1}{ETbb-Sup}{m}{n}{
-      <-> alias * ETbb-Sup/regular/n
+      <-> \ETbb@@scale ETbb-Regular-sup-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Sup}{m}{sl}{
-      <-> alias * ETbb-Sup/regular/sl
+\DeclareFontShape{T1}{ETbb-Sup}{regular}{n}{
+      <-> alias * ETbb-Sup/m/n
 }{}
 
 \DeclareFontShape{T1}{ETbb-Sup}{m}{it}{
-      <-> alias * ETbb-Sup/regular/it
+      <-> \ETbb@@scale ETbb-Italic-sup-t1
 }{}
 
-
-%   b --> bold
-
-\DeclareFontShape{T1}{ETbb-Sup}{b}{it}{
-      <-> alias * ETbb-Sup/bold/it
+\DeclareFontShape{T1}{ETbb-Sup}{regular}{it}{
+      <-> alias * ETbb-Sup/m/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Sup}{b}{sl}{
-      <-> alias * ETbb-Sup/bold/sl
+\DeclareFontShape{T1}{ETbb-Sup}{m}{sl}{
+    <-> ssub * ETbb-Sup/m/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Sup}{b}{n}{
-      <-> alias * ETbb-Sup/bold/n
+\DeclareFontShape{T1}{ETbb-Sup}{regular}{sl}{
+    <-> ssub * ETbb-Sup/regular/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Sup}{bx}{sl}{
-      <-> ssub * ETbb-Sup/b/sl
+
+%   ----  Extra 'ssub' rules to map 'bx' to 'b'  ----
+
+\DeclareFontShape{T1}{ETbb-Sup}{bx}{it}{
+      <-> ssub * ETbb-Sup/b/it
 }{}
 
 \DeclareFontShape{T1}{ETbb-Sup}{bx}{n}{
       <-> ssub * ETbb-Sup/b/n
 }{}
 
-\DeclareFontShape{T1}{ETbb-Sup}{bx}{it}{
-      <-> ssub * ETbb-Sup/b/it
+\DeclareFontShape{T1}{ETbb-Sup}{bx}{sl}{
+      <-> ssub * ETbb-Sup/b/sl
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd
index ad3ef7c562e..1851e429087 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/07/01
+%% Generated by autoinst on 2021/12/18
 %%
 \ProvidesFile{TS1ETbb-LF.fd}
-    [2020/07/01 (autoinst)  Font definitions for TS1/ETbb-LF.]
+    [2021/12/18 (autoinst)  Font definitions for TS1/ETbb-LF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,71 +20,61 @@
 \DeclareFontFamily{TS1}{ETbb-LF}{}
 
 
-%   ----  bold  ----
+%   ----  b = bold  ----
 
-\DeclareFontShape{TS1}{ETbb-LF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-lf-ts1
+\DeclareFontShape{TS1}{ETbb-LF}{b}{n}{
+      <-> \ETbb@@scale ETbb-Bold-lf-ts1
 }{}
 
 \DeclareFontShape{TS1}{ETbb-LF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-lf-ts1
+      <-> alias * ETbb-LF/b/n
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{bold}{sl}{
-      <-> ssub * ETbb-LF/bold/it
+\DeclareFontShape{TS1}{ETbb-LF}{b}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-lf-ts1
 }{}
 
-
-%   ----  regular  ----
-
-\DeclareFontShape{TS1}{ETbb-LF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-lf-ts1
+\DeclareFontShape{TS1}{ETbb-LF}{bold}{it}{
+      <-> alias * ETbb-LF/b/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-lf-ts1
+\DeclareFontShape{TS1}{ETbb-LF}{b}{sl}{
+    <-> ssub * ETbb-LF/b/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{regular}{sl}{
-      <-> ssub * ETbb-LF/regular/it
+\DeclareFontShape{TS1}{ETbb-LF}{bold}{sl}{
+    <-> ssub * ETbb-LF/bold/it
 }{}
 
-%
-%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
 
-%   m --> regular
+%   ----  m = regular  ----
 
-\DeclareFontShape{TS1}{ETbb-LF}{m}{it}{
-      <-> alias * ETbb-LF/regular/it
+\DeclareFontShape{TS1}{ETbb-LF}{m}{n}{
+      <-> \ETbb@@scale ETbb-Regular-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{m}{sl}{
-      <-> alias * ETbb-LF/regular/sl
+\DeclareFontShape{TS1}{ETbb-LF}{regular}{n}{
+      <-> alias * ETbb-LF/m/n
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{m}{n}{
-      <-> alias * ETbb-LF/regular/n
+\DeclareFontShape{TS1}{ETbb-LF}{m}{it}{
+      <-> \ETbb@@scale ETbb-Italic-lf-ts1
 }{}
 
-
-%   b --> bold
-
-\DeclareFontShape{TS1}{ETbb-LF}{b}{sl}{
-      <-> alias * ETbb-LF/bold/sl
+\DeclareFontShape{TS1}{ETbb-LF}{regular}{it}{
+      <-> alias * ETbb-LF/m/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{b}{n}{
-      <-> alias * ETbb-LF/bold/n
+\DeclareFontShape{TS1}{ETbb-LF}{m}{sl}{
+    <-> ssub * ETbb-LF/m/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{b}{it}{
-      <-> alias * ETbb-LF/bold/it
+\DeclareFontShape{TS1}{ETbb-LF}{regular}{sl}{
+    <-> ssub * ETbb-LF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{bx}{it}{
-      <-> ssub * ETbb-LF/b/it
-}{}
+
+%   ----  Extra 'ssub' rules to map 'bx' to 'b'  ----
 
 \DeclareFontShape{TS1}{ETbb-LF}{bx}{n}{
       <-> ssub * ETbb-LF/b/n
@@ -94,4 +84,8 @@
       <-> 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 85e7778cbe9..780f60ed896 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/07/01
+%% Generated by autoinst on 2021/12/18
 %%
 \ProvidesFile{TS1ETbb-OsF.fd}
-    [2020/07/01 (autoinst)  Font definitions for TS1/ETbb-OsF.]
+    [2021/12/18 (autoinst)  Font definitions for TS1/ETbb-OsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,71 +20,61 @@
 \DeclareFontFamily{TS1}{ETbb-OsF}{}
 
 
-%   ----  bold  ----
+%   ----  b = bold  ----
 
-\DeclareFontShape{TS1}{ETbb-OsF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-osf-ts1
+\DeclareFontShape{TS1}{ETbb-OsF}{b}{n}{
+      <-> \ETbb@@scale ETbb-Bold-osf-ts1
 }{}
 
 \DeclareFontShape{TS1}{ETbb-OsF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-osf-ts1
+      <-> alias * ETbb-OsF/b/n
 }{}
 
-\DeclareFontShape{TS1}{ETbb-OsF}{bold}{sl}{
-      <-> ssub * ETbb-OsF/bold/it
+\DeclareFontShape{TS1}{ETbb-OsF}{b}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-osf-ts1
 }{}
 
-
-%   ----  regular  ----
-
-\DeclareFontShape{TS1}{ETbb-OsF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-osf-ts1
+\DeclareFontShape{TS1}{ETbb-OsF}{bold}{it}{
+      <-> alias * ETbb-OsF/b/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-OsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-osf-ts1
+\DeclareFontShape{TS1}{ETbb-OsF}{b}{sl}{
+    <-> ssub * ETbb-OsF/b/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-OsF}{regular}{sl}{
-      <-> ssub * ETbb-OsF/regular/it
+\DeclareFontShape{TS1}{ETbb-OsF}{bold}{sl}{
+    <-> ssub * ETbb-OsF/bold/it
 }{}
 
-%
-%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
 
-%   m --> regular
+%   ----  m = regular  ----
 
-\DeclareFontShape{TS1}{ETbb-OsF}{m}{it}{
-      <-> alias * ETbb-OsF/regular/it
+\DeclareFontShape{TS1}{ETbb-OsF}{m}{n}{
+      <-> \ETbb@@scale ETbb-Regular-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-OsF}{m}{sl}{
-      <-> alias * ETbb-OsF/regular/sl
+\DeclareFontShape{TS1}{ETbb-OsF}{regular}{n}{
+      <-> alias * ETbb-OsF/m/n
 }{}
 
-\DeclareFontShape{TS1}{ETbb-OsF}{m}{n}{
-      <-> alias * ETbb-OsF/regular/n
+\DeclareFontShape{TS1}{ETbb-OsF}{m}{it}{
+      <-> \ETbb@@scale ETbb-Italic-osf-ts1
 }{}
 
-
-%   b --> bold
-
-\DeclareFontShape{TS1}{ETbb-OsF}{b}{n}{
-      <-> alias * ETbb-OsF/bold/n
+\DeclareFontShape{TS1}{ETbb-OsF}{regular}{it}{
+      <-> alias * ETbb-OsF/m/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-OsF}{b}{sl}{
-      <-> alias * ETbb-OsF/bold/sl
+\DeclareFontShape{TS1}{ETbb-OsF}{m}{sl}{
+    <-> ssub * ETbb-OsF/m/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-OsF}{b}{it}{
-      <-> alias * ETbb-OsF/bold/it
+\DeclareFontShape{TS1}{ETbb-OsF}{regular}{sl}{
+    <-> ssub * ETbb-OsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-OsF}{bx}{it}{
-      <-> ssub * ETbb-OsF/b/it
-}{}
+
+%   ----  Extra 'ssub' rules to map 'bx' to 'b'  ----
 
 \DeclareFontShape{TS1}{ETbb-OsF}{bx}{sl}{
       <-> ssub * ETbb-OsF/b/sl
@@ -94,4 +84,8 @@
       <-> ssub * ETbb-OsF/b/n
 }{}
 
+\DeclareFontShape{TS1}{ETbb-OsF}{bx}{it}{
+      <-> ssub * ETbb-OsF/b/it
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd
index b0dc0d1af47..893b7aa3250 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/07/01
+%% Generated by autoinst on 2021/12/18
 %%
 \ProvidesFile{TS1ETbb-TLF.fd}
-    [2020/07/01 (autoinst)  Font definitions for TS1/ETbb-TLF.]
+    [2021/12/18 (autoinst)  Font definitions for TS1/ETbb-TLF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,78 +20,72 @@
 \DeclareFontFamily{TS1}{ETbb-TLF}{}
 
 
-%   ----  regular  ----
+%   ----  b = bold  ----
 
-\DeclareFontShape{TS1}{ETbb-TLF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-tlf-ts1
+\DeclareFontShape{TS1}{ETbb-TLF}{b}{n}{
+      <-> \ETbb@@scale ETbb-Bold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TLF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-tlf-ts1
+\DeclareFontShape{TS1}{ETbb-TLF}{bold}{n}{
+      <-> alias * ETbb-TLF/b/n
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TLF}{regular}{sl}{
-      <-> ssub * ETbb-TLF/regular/it
+\DeclareFontShape{TS1}{ETbb-TLF}{b}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tlf-ts1
 }{}
 
-
-%   ----  bold  ----
-
 \DeclareFontShape{TS1}{ETbb-TLF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tlf-ts1
+      <-> alias * ETbb-TLF/b/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TLF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-tlf-ts1
+\DeclareFontShape{TS1}{ETbb-TLF}{b}{sl}{
+    <-> ssub * ETbb-TLF/b/it
 }{}
 
 \DeclareFontShape{TS1}{ETbb-TLF}{bold}{sl}{
-      <-> ssub * ETbb-TLF/bold/it
+    <-> ssub * ETbb-TLF/bold/it
 }{}
 
-%
-%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
 
-%   m --> regular
+%   ----  m = regular  ----
 
 \DeclareFontShape{TS1}{ETbb-TLF}{m}{it}{
-      <-> alias * ETbb-TLF/regular/it
+      <-> \ETbb@@scale ETbb-Italic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TLF}{m}{n}{
-      <-> alias * ETbb-TLF/regular/n
+\DeclareFontShape{TS1}{ETbb-TLF}{regular}{it}{
+      <-> alias * ETbb-TLF/m/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TLF}{m}{sl}{
-      <-> alias * ETbb-TLF/regular/sl
+\DeclareFontShape{TS1}{ETbb-TLF}{m}{n}{
+      <-> \ETbb@@scale ETbb-Regular-tlf-ts1
 }{}
 
-
-%   b --> bold
-
-\DeclareFontShape{TS1}{ETbb-TLF}{b}{it}{
-      <-> alias * ETbb-TLF/bold/it
+\DeclareFontShape{TS1}{ETbb-TLF}{regular}{n}{
+      <-> alias * ETbb-TLF/m/n
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TLF}{b}{sl}{
-      <-> alias * ETbb-TLF/bold/sl
+\DeclareFontShape{TS1}{ETbb-TLF}{m}{sl}{
+    <-> ssub * ETbb-TLF/m/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TLF}{b}{n}{
-      <-> alias * ETbb-TLF/bold/n
+\DeclareFontShape{TS1}{ETbb-TLF}{regular}{sl}{
+    <-> ssub * ETbb-TLF/regular/it
 }{}
 
+
+%   ----  Extra 'ssub' rules to map 'bx' to 'b'  ----
+
 \DeclareFontShape{TS1}{ETbb-TLF}{bx}{it}{
       <-> ssub * ETbb-TLF/b/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TLF}{bx}{n}{
-      <-> ssub * ETbb-TLF/b/n
-}{}
-
 \DeclareFontShape{TS1}{ETbb-TLF}{bx}{sl}{
       <-> ssub * ETbb-TLF/b/sl
 }{}
 
+\DeclareFontShape{TS1}{ETbb-TLF}{bx}{n}{
+      <-> ssub * ETbb-TLF/b/n
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd
index 818b85f53ed..c2ff07d4461 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/07/01
+%% Generated by autoinst on 2021/12/18
 %%
 \ProvidesFile{TS1ETbb-TOsF.fd}
-    [2020/07/01 (autoinst)  Font definitions for TS1/ETbb-TOsF.]
+    [2021/12/18 (autoinst)  Font definitions for TS1/ETbb-TOsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,78 +20,72 @@
 \DeclareFontFamily{TS1}{ETbb-TOsF}{}
 
 
-%   ----  regular  ----
+%   ----  b = bold  ----
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-tosf-ts1
+\DeclareFontShape{TS1}{ETbb-TOsF}{b}{n}{
+      <-> \ETbb@@scale ETbb-Bold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-tosf-ts1
+\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{n}{
+      <-> alias * ETbb-TOsF/b/n
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{sl}{
-      <-> ssub * ETbb-TOsF/regular/it
+\DeclareFontShape{TS1}{ETbb-TOsF}{b}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tosf-ts1
 }{}
 
-
-%   ----  bold  ----
-
 \DeclareFontShape{TS1}{ETbb-TOsF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tosf-ts1
+      <-> alias * ETbb-TOsF/b/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-tosf-ts1
+\DeclareFontShape{TS1}{ETbb-TOsF}{b}{sl}{
+    <-> ssub * ETbb-TOsF/b/it
 }{}
 
 \DeclareFontShape{TS1}{ETbb-TOsF}{bold}{sl}{
-      <-> ssub * ETbb-TOsF/bold/it
+    <-> ssub * ETbb-TOsF/bold/it
 }{}
 
-%
-%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
 
-%   m --> regular
+%   ----  m = regular  ----
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{m}{it}{
-      <-> alias * ETbb-TOsF/regular/it
+\DeclareFontShape{TS1}{ETbb-TOsF}{m}{n}{
+      <-> \ETbb@@scale ETbb-Regular-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{m}{sl}{
-      <-> alias * ETbb-TOsF/regular/sl
+\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{n}{
+      <-> alias * ETbb-TOsF/m/n
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{m}{n}{
-      <-> alias * ETbb-TOsF/regular/n
+\DeclareFontShape{TS1}{ETbb-TOsF}{m}{it}{
+      <-> \ETbb@@scale ETbb-Italic-tosf-ts1
 }{}
 
-
-%   b --> bold
-
-\DeclareFontShape{TS1}{ETbb-TOsF}{b}{n}{
-      <-> alias * ETbb-TOsF/bold/n
+\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{it}{
+      <-> alias * ETbb-TOsF/m/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{b}{sl}{
-      <-> alias * ETbb-TOsF/bold/sl
+\DeclareFontShape{TS1}{ETbb-TOsF}{m}{sl}{
+    <-> ssub * ETbb-TOsF/m/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{b}{it}{
-      <-> alias * ETbb-TOsF/bold/it
+\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{sl}{
+    <-> ssub * ETbb-TOsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{it}{
-      <-> ssub * ETbb-TOsF/b/it
+
+%   ----  Extra 'ssub' rules to map 'bx' to 'b'  ----
+
+\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{n}{
+      <-> ssub * ETbb-TOsF/b/n
 }{}
 
 \DeclareFontShape{TS1}{ETbb-TOsF}{bx}{sl}{
       <-> ssub * ETbb-TOsF/b/sl
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{n}{
-      <-> ssub * ETbb-TOsF/b/n
+\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{it}{
+      <-> ssub * ETbb-TOsF/b/it
 }{}
 
 \endinput