etbb (18jun20)

git-svn-id: svn://tug.org/texlive/trunk@55584 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2020-06-18 21:06:14 +0000
committer: Karl Berry <karl@freefriends.org> 2020-06-18 21:06:14 +0000
commit: facf46d872098b35fbd393700c4e0bb95a0ae88e (patch)
tree: 29b66b8caafe41d587efc09233d73d15dcc34e8a /Master
parent: aed702b27ffb03affb98da23fd42f790c3067e46 (diff)
143 files changed, 872 insertions, 1111 deletions
diff --git a/Master/texmf-dist/doc/fonts/etbb/README b/Master/texmf-dist/doc/fonts/etbb/README
index 2d51b2a3802..d12ef00211e 100644
--- a/Master/texmf-dist/doc/fonts/etbb/README
+++ b/Master/texmf-dist/doc/fonts/etbb/README
@@ -3,7 +3,10 @@ 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.02 2020-05-15
+Current version: 1.03 2020-06-17
+
+Changes in version 1.03
+Removed all hinting in the font files. This will not affect Mac or PC users, but should be helpful to some Linux users whose font renderers can behave badly at times with Postscript hinting.
 
 Changes in version 1.02
 1. Added denominator figures to all styles.
diff --git a/Master/texmf-dist/fonts/afm/public/etbb/ETbb-Bold.afm b/Master/texmf-dist/fonts/afm/public/etbb/ETbb-Bold.afm
index c5321c1d743..0e9ec6695b8 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: Thu May 14 23:25:14 2020
+Comment Creation Date: Wed Jun 17 17:17:22 2020
 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 fc330379a1a..2464a7d50aa 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: Thu May 14 17:34:09 2020
+Comment Creation Date: Wed Jun 17 17:17:58 2020
 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 40c666e586f..a2c5a74653d 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: Thu May 14 17:12:24 2020
+Comment Creation Date: Wed Jun 17 17:17:01 2020
 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 d0d79a8674a..0bbbed35c28 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: Thu May 14 16:49:42 2020
+Comment Creation Date: Wed Jun 17 08:27:09 2020
 FontName ETbb-Regular
 FullName ET Bembo Regular
 FamilyName ETbb
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_2wngtz.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_2wngtz.enc
index 2f5a0c5a248..db745bc098d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_2wngtz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_2wngtz.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_2wngtzno6dnkbgy6u3wuotcora
-% Encoding created by otftotfm on Thu May 14 23:25:53 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:58 2020
 % Command line follows encoding
 /AutoEnc1_2wngtzno6dnkbgy6u3wuotcora [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_3ccbvp.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_3ccbvp.enc
index 65a72ec926c..d922cf3fdfc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_3ccbvp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_3ccbvp.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_3ccbvpb2mahh6euinpg3u7qqze
-% Encoding created by otftotfm on Thu May 14 23:25:34 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:34 2020
 % Command line follows encoding
 /AutoEnc1_3ccbvpb2mahh6euinpg3u7qqze [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_5325we.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_5325we.enc
index e31722e6b03..692e97c1f1f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_5325we.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_5325we.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_5325we5aho44lxbyegll2vl3dc
-% Encoding created by otftotfm on Thu May 14 23:25:35 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:35 2020
 % Command line follows encoding
 /AutoEnc1_5325we5aho44lxbyegll2vl3dc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_77pqsh.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_77pqsh.enc
index f0f90d3f12c..431d5736694 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_77pqsh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_77pqsh.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_77pqsh35tfbpgcie3v2crjtyef
-% Encoding created by otftotfm on Thu May 14 23:25:49 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:57 2020
 % Command line follows encoding
 /AutoEnc1_77pqsh35tfbpgcie3v2crjtyef [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_eqc2ac.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_eqc2ac.enc
index a7934f9ccd3..e86929ddb7d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_eqc2ac.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_eqc2ac.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_eqc2ac2qcg4bxjlkwezu334h4f
-% Encoding created by otftotfm on Thu May 14 23:25:28 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:41 2020
 % Command line follows encoding
 /AutoEnc1_eqc2ac2qcg4bxjlkwezu334h4f [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hah5or.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hah5or.enc
index f3c551e4b93..fc69585a4f1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hah5or.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hah5or.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_hah5orya7ruvjmqzsfnwzilfbf
-% Encoding created by otftotfm on Thu May 14 23:25:31 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:36 2020
 % Command line follows encoding
 /AutoEnc1_hah5orya7ruvjmqzsfnwzilfbf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hibu6u.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hibu6u.enc
index 616dcbb8ffa..36bb5d0cb65 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hibu6u.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_hibu6u.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_hibu6umvrjtqrirvpvs25evi3c
-% Encoding created by otftotfm on Thu May 14 23:25:26 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:40 2020
 % Command line follows encoding
 /AutoEnc1_hibu6umvrjtqrirvpvs25evi3c [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_pvrda3.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_pvrda3.enc
index 49fa712df88..169d2634b77 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_pvrda3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_pvrda3.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_pvrda3ayd24l2jz24a3yz6f4kd
-% Encoding created by otftotfm on Thu May 14 23:25:25 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:39 2020
 % Command line follows encoding
 /AutoEnc1_pvrda3ayd24l2jz24a3yz6f4kd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_rwec2l.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_rwec2l.enc
index 56060a05ff4..59442daeb8e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_rwec2l.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_rwec2l.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_rwec2ltafusdbpjxc5bs7fdg3b
-% Encoding created by otftotfm on Thu May 14 23:25:58 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:51 2020
 % Command line follows encoding
 /AutoEnc1_rwec2ltafusdbpjxc5bs7fdg3b [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_sp7p3o.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_sp7p3o.enc
index 1d48d299b26..496f54ce368 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_sp7p3o.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_sp7p3o.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_sp7p3ogzc33lxwuaxiyoy7i63e
-% Encoding created by otftotfm on Thu May 14 23:25:55 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:53 2020
 % Command line follows encoding
 /AutoEnc1_sp7p3ogzc33lxwuaxiyoy7i63e [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_w52zjg.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_w52zjg.enc
index 7e9fa84dcc2..afe4638210d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_w52zjg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_w52zjg.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh
-% Encoding created by otftotfm on Thu May 14 23:25:33 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:38 2020
 % Command line follows encoding
 /AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_x5rskw.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_x5rskw.enc
index 6ec750ddeec..d993eb57ebd 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_x5rskw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_x5rskw.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_x5rskwfdgrpeovvnp5dgzgax7e
-% Encoding created by otftotfm on Thu May 14 23:25:29 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:42 2020
 % Command line follows encoding
 /AutoEnc1_x5rskwfdgrpeovvnp5dgzgax7e [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_zxy3n5.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_zxy3n5.enc
index a25d6281a30..dc5dad8b669 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_zxy3n5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb1_zxy3n5.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc1_zxy3n5aiatzd3xjlhm2urzyfuc
-% Encoding created by otftotfm on Thu May 14 23:25:32 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:37 2020
 % Command line follows encoding
 /AutoEnc1_zxy3n5aiatzd3xjlhm2urzyfuc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_22apno.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_22apno.enc
index 97513223046..b162d8983d4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_22apno.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_22apno.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_22apnozoce6wprtbuf6ihvsd5b
-% Encoding created by otftotfm on Thu May 14 23:26:11 2020
+% Encoding created by otftotfm on Wed Jun 17 17:23:00 2020
 % Command line follows encoding
 /AutoEnc_22apnozoce6wprtbuf6ihvsd5b [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_242knm.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_242knm.enc
index 0fa80fd04cf..38bede24e2a 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 Thu May 14 23:25:43 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:44 2020
 % Command line follows encoding
 /AutoEnc_242knmbltpk57lyn3w752okimf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_2mysj3.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_2mysj3.enc
index 304c3b20dd8..ba1079f16c7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_2mysj3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_2mysj3.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_2mysj3r5ge4vrkh7fk26pe4rbd
-% Encoding created by otftotfm on Thu May 14 23:26:06 2020
+% Encoding created by otftotfm on Wed Jun 17 17:23:02 2020
 % Command line follows encoding
 /AutoEnc_2mysj3r5ge4vrkh7fk26pe4rbd [
 %00
@@ -60,4 +60,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/etbb
 % --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
 % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=pnum ETbb-Regular.otf ETbb-Regular-lf-ts1'
+% --feature=pnum ETbb-Regular.otf ETbb-Regular-osf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_2wngtz.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_2wngtz.enc
index 6997e785f64..4442a5f7f77 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_2wngtz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_2wngtz.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_2wngtzno6dnkbgy6u3wuotcora
-% Encoding created by otftotfm on Thu May 14 23:25:53 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:58 2020
 % Command line follows encoding
 /AutoEnc_2wngtzno6dnkbgy6u3wuotcora [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_33mftd.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_33mftd.enc
index 8c28a95b242..d446f89f8e6 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 Thu May 14 23:25:31 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:36 2020
 % Command line follows encoding
 /AutoEnc_33mftda5zpj2atc2k5o52aguyh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3ccbvp.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3ccbvp.enc
index a7d70ce2fb6..9c5ccd18a69 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3ccbvp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3ccbvp.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_3ccbvpb2mahh6euinpg3u7qqze
-% Encoding created by otftotfm on Thu May 14 23:25:34 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:34 2020
 % Command line follows encoding
 /AutoEnc_3ccbvpb2mahh6euinpg3u7qqze [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3jmjat.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3jmjat.enc
index f136ce5d3cc..6f9176d4c80 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3jmjat.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3jmjat.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_3jmjatxposyckyyeodfflfb4zf
-% Encoding created by otftotfm on Thu May 14 23:25:49 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:56 2020
 % Command line follows encoding
 /AutoEnc_3jmjatxposyckyyeodfflfb4zf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3li7dq.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3li7dq.enc
index 7f493913da5..8bb62d633ad 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 Thu May 14 23:25:31 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:36 2020
 % Command line follows encoding
 /AutoEnc_3li7dqpy2izcpma72gvve2muqf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3pfdgz.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3pfdgz.enc
index 805ff7fdaa8..ba78b73cded 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3pfdgz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_3pfdgz.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_3pfdgzsbueyunimviyizcdlq3b
-% Encoding created by otftotfm on Thu May 14 23:25:28 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:38 2020
 % Command line follows encoding
 /AutoEnc_3pfdgzsbueyunimviyizcdlq3b [
 %00
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 7ece2998b98..c70e3957f7c 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 Thu May 14 23:26:03 2020
+% Encoding created by otftotfm on Wed Jun 17 17:23:04 2020
 % Command line follows encoding
 /AutoEnc_4sxvu4thduhlpavew6yzmuysdd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5325we.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5325we.enc
index 1875c559e5e..38430ec7153 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5325we.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5325we.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_5325we5aho44lxbyegll2vl3dc
-% Encoding created by otftotfm on Thu May 14 23:25:35 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:35 2020
 % Command line follows encoding
 /AutoEnc_5325we5aho44lxbyegll2vl3dc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5cjnk5.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5cjnk5.enc
index f7854cd3f80..040144032f9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5cjnk5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5cjnk5.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_5cjnk55s6lighj2fknbv2zorpf
-% Encoding created by otftotfm on Thu May 14 23:26:05 2020
+% Encoding created by otftotfm on Wed Jun 17 17:23:07 2020
 % Command line follows encoding
 /AutoEnc_5cjnk55s6lighj2fknbv2zorpf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5iollt.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_5iollt.enc
index c1e378c9e91..2ff8ea58e15 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 Thu May 14 23:25:52 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:58 2020
 % Command line follows encoding
 /AutoEnc_5iolltwrolq7y3af3zfxbxwjhg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_6tax72.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_6tax72.enc
index 7431bdc1557..ae9de3d78f4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_6tax72.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_6tax72.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_6tax72yid4piwl3l7e6mpqevrf
-% Encoding created by otftotfm on Thu May 14 23:25:44 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:45 2020
 % Command line follows encoding
 /AutoEnc_6tax72yid4piwl3l7e6mpqevrf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_6vun2r.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_6vun2r.enc
index 63369e2fc44..ff1a460bd95 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_6vun2r.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_6vun2r.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_6vun2rq6eccu4qmsiafrhz35wf
-% Encoding created by otftotfm on Thu May 14 23:25:42 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:45 2020
 % Command line follows encoding
 /AutoEnc_6vun2rq6eccu4qmsiafrhz35wf [
 %00
@@ -60,4 +60,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/etbb
 % --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
 % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=pnum ETbb-BoldItalic.otf ETbb-BoldItalic-lf-ts1'
+% --feature=pnum ETbb-BoldItalic.otf ETbb-BoldItalic-osf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_77pqsh.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_77pqsh.enc
index 7cd20bb1cde..5c5cdfcc31d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_77pqsh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_77pqsh.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_77pqsh35tfbpgcie3v2crjtyef
-% Encoding created by otftotfm on Thu May 14 23:25:49 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:57 2020
 % Command line follows encoding
 /AutoEnc_77pqsh35tfbpgcie3v2crjtyef [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_7pzsmk.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_7pzsmk.enc
index 3927e60dcf9..4b2497936c3 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 Thu May 14 23:26:04 2020
+% Encoding created by otftotfm on Wed Jun 17 17:23:03 2020
 % Command line follows encoding
 /AutoEnc_7pzsmkr2zp4z2jzsqyz5xypura [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_7t4ywj.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_7t4ywj.enc
index 9da21f4b291..4d34c27e939 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 Thu May 14 23:25:40 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:47 2020
 % Command line follows encoding
 /AutoEnc_7t4ywj5n7dfcy72ielrltqzb7a [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_atf2m5.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_atf2m5.enc
index ffbb690f6dd..b49b0c6095b 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 Thu May 14 23:25:28 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:38 2020
 % Command line follows encoding
 /AutoEnc_atf2m5uqgbwoyyy5ueppslzajb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_behrx3.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_behrx3.enc
index e6f3cc675fc..2fa8c907fd2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_behrx3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_behrx3.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_behrx3e73zcxs6ypih5z3jwzfc
-% Encoding created by otftotfm on Thu May 14 23:26:03 2020
+% Encoding created by otftotfm on Wed Jun 17 17:23:04 2020
 % Command line follows encoding
 /AutoEnc_behrx3e73zcxs6ypih5z3jwzfc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_bludla.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_bludla.enc
index 2598d2353e5..8014591e543 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_bludla.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_bludla.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_bludla2t2nbjgt6v2mhnowpvfc
-% Encoding created by otftotfm on Thu May 14 23:25:27 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:36 2020
 % Command line follows encoding
 /AutoEnc_bludla2t2nbjgt6v2mhnowpvfc [
 %00
@@ -60,4 +60,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/etbb
 % --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
 % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=tnum ETbb-Bold.otf ETbb-Bold-tlf-ts1'
+% --feature=tnum ETbb-Bold.otf ETbb-Bold-tosf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_bowihu.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_bowihu.enc
index 3d2bab6b64c..4db9bf30557 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_bowihu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_bowihu.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_bowihunnspwduw2eofxbzcdp7b
-% Encoding created by otftotfm on Thu May 14 23:25:41 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:50 2020
 % Command line follows encoding
 /AutoEnc_bowihunnspwduw2eofxbzcdp7b [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_c6gjhm.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_c6gjhm.enc
index a1a7f670d41..d6a2aad678b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_c6gjhm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_c6gjhm.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_c6gjhmb3ta3czdt7nhimutsk5c
-% Encoding created by otftotfm on Thu May 14 23:25:29 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:42 2020
 % Command line follows encoding
 /AutoEnc_c6gjhmb3ta3czdt7nhimutsk5c [
 %00
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 c08ec0485e1..141a57b0942 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 Thu May 14 23:25:27 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:39 2020
 % Command line follows encoding
 /AutoEnc_cluc7m4ium2bcpwlcwz2h6yxsd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cpdyi3.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cpdyi3.enc
index 83456e79585..728285b52dc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cpdyi3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cpdyi3.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_cpdyi3iny2nijyt7gl7sena5id
-% Encoding created by otftotfm on Thu May 14 23:25:35 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:35 2020
 % Command line follows encoding
 /AutoEnc_cpdyi3iny2nijyt7gl7sena5id [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cuqhrj.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cuqhrj.enc
index 9f655a42f12..8260ed11430 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cuqhrj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_cuqhrj.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_cuqhrji6wzmpdmxr5b7kf5n6ha
-% Encoding created by otftotfm on Thu May 14 23:26:05 2020
+% Encoding created by otftotfm on Wed Jun 17 17:23:07 2020
 % Command line follows encoding
 /AutoEnc_cuqhrji6wzmpdmxr5b7kf5n6ha [
 %00
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 ed16637ce07..eda6e88b0e6 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 Thu May 14 23:25:46 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:43 2020
 % Command line follows encoding
 /AutoEnc_cyyszv3tgoadb7habjipfqte7b [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dcps7k.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dcps7k.enc
index e7aa86b23f9..bab65575099 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dcps7k.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dcps7k.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_dcps7kztgw3wzbkeqywcdknetd
-% Encoding created by otftotfm on Thu May 14 23:25:31 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:36 2020
 % Command line follows encoding
 /AutoEnc_dcps7kztgw3wzbkeqywcdknetd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dep6cd.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dep6cd.enc
index 214dbce3de1..0dbcd03a37b 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 Thu May 14 23:26:03 2020
+% Encoding created by otftotfm on Wed Jun 17 17:23:03 2020
 % Command line follows encoding
 /AutoEnc_dep6cdmobxdewjybmud7kefdcf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dz2qg3.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dz2qg3.enc
index cb1bdbf9d27..9edc19e6f3a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dz2qg3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_dz2qg3.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_dz2qg3d3q3x6zjjkul4syetglf
-% Encoding created by otftotfm on Thu May 14 23:25:55 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:53 2020
 % Command line follows encoding
 /AutoEnc_dz2qg3d3q3x6zjjkul4syetglf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_e3m4fz.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_e3m4fz.enc
index 4c8ac9b48ff..d4dcc8e2c41 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 Thu May 14 23:26:00 2020
+% Encoding created by otftotfm on Wed Jun 17 17:23:04 2020
 % Command line follows encoding
 /AutoEnc_e3m4fzaal3fm6lwih762ck4hoh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ea2dgh.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ea2dgh.enc
index 0c52ed8eceb..004bf45c1ff 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 Thu May 14 23:25:39 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:46 2020
 % Command line follows encoding
 /AutoEnc_ea2dgh24m4p3kft426m6vb5nre [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_elsw3h.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_elsw3h.enc
index 398042773a8..867c6a769f9 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 Thu May 14 23:25:25 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:40 2020
 % Command line follows encoding
 /AutoEnc_elsw3hdxi5xivsxqghfqivctad [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_eqc2ac.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_eqc2ac.enc
index 0dff868dcb2..959cd9940f7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_eqc2ac.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_eqc2ac.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_eqc2ac2qcg4bxjlkwezu334h4f
-% Encoding created by otftotfm on Thu May 14 23:25:28 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:41 2020
 % Command line follows encoding
 /AutoEnc_eqc2ac2qcg4bxjlkwezu334h4f [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f7n52p.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f7n52p.enc
index b70f5e63ebe..d2b4624a1a3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f7n52p.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_f7n52p.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_f7n52pgkdu3b46yojqf7dkhspc
-% Encoding created by otftotfm on Thu May 14 23:25:53 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:58 2020
 % Command line follows encoding
 /AutoEnc_f7n52pgkdu3b46yojqf7dkhspc [
 %00
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 5ebf258e150..515459931bc 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 Thu May 14 23:26:02 2020
+% Encoding created by otftotfm on Wed Jun 17 17:23:04 2020
 % Command line follows encoding
 /AutoEnc_ftphfyliafmvcwfqlg66apswmh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fue2l2.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fue2l2.enc
index a23826803c1..5e20f667183 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fue2l2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_fue2l2.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_fue2l2dyo4hhc3efyctqx2ll4c
-% Encoding created by otftotfm on Thu May 14 23:25:55 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:53 2020
 % Command line follows encoding
 /AutoEnc_fue2l2dyo4hhc3efyctqx2ll4c [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gkmjhd.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gkmjhd.enc
index 16d12217c1d..f09758e6312 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gkmjhd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gkmjhd.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_gkmjhd3seclagiouwe46zxr2nh
-% Encoding created by otftotfm on Thu May 14 23:25:37 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:49 2020
 % Command line follows encoding
 /AutoEnc_gkmjhd3seclagiouwe46zxr2nh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gtayjy.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gtayjy.enc
index a534954a991..e26bd1468c9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gtayjy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_gtayjy.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_gtayjyqjbvkxwi76vvo5bz5rsh
-% Encoding created by otftotfm on Thu May 14 23:25:29 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:41 2020
 % Command line follows encoding
 /AutoEnc_gtayjyqjbvkxwi76vvo5bz5rsh [
 %00
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 595b1c04b2b..f1b79e325c1 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 Thu May 14 23:25:33 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:37 2020
 % Command line follows encoding
 /AutoEnc_h4dyumvfz6ek2rcxjxry72wymd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hah5or.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hah5or.enc
index 924991fc90f..f9ac4aaab09 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hah5or.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hah5or.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_hah5orya7ruvjmqzsfnwzilfbf
-% Encoding created by otftotfm on Thu May 14 23:25:31 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:36 2020
 % Command line follows encoding
 /AutoEnc_hah5orya7ruvjmqzsfnwzilfbf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hibu6u.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hibu6u.enc
index dcd9623c1f0..bed318a6ad0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hibu6u.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_hibu6u.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_hibu6umvrjtqrirvpvs25evi3c
-% Encoding created by otftotfm on Thu May 14 23:25:26 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:40 2020
 % Command line follows encoding
 /AutoEnc_hibu6umvrjtqrirvpvs25evi3c [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_i5ezvi.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_i5ezvi.enc
index a0020557e0e..7c3a9ad93d5 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 Thu May 14 23:25:48 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:56 2020
 % Command line follows encoding
 /AutoEnc_i5ezvitppcazvehmki6u25ne3h [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ihmnlr.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ihmnlr.enc
index d04fafa5052..524d41281fa 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 Thu May 14 23:25:25 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:39 2020
 % Command line follows encoding
 /AutoEnc_ihmnlry5rdqsk57rbbszezzogb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_imedjx.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_imedjx.enc
index 3c5fb5dda47..40b7b17e970 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_imedjx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_imedjx.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_imedjxssqsfkutdv3rq6n6nujc
-% Encoding created by otftotfm on Thu May 14 23:25:47 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:44 2020
 % Command line follows encoding
 /AutoEnc_imedjxssqsfkutdv3rq6n6nujc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_j7myeh.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_j7myeh.enc
index da5d35da336..bcd2d07ba61 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 Thu May 14 23:25:40 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:49 2020
 % Command line follows encoding
 /AutoEnc_j7myehdyrz6gorvvepmwcnbthh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ko4aue.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ko4aue.enc
index d87a819318e..be9dae04d22 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ko4aue.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ko4aue.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ko4auenlxbrvzhbacuekbifdwd
-% Encoding created by otftotfm on Thu May 14 23:25:52 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:58 2020
 % Command line follows encoding
 /AutoEnc_ko4auenlxbrvzhbacuekbifdwd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_kuig7z.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_kuig7z.enc
index 942a25131d3..0c36d7edab7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_kuig7z.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_kuig7z.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_kuig7zeiv5iolg6nn736gdpm7h
-% Encoding created by otftotfm on Thu May 14 23:25:26 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:40 2020
 % Command line follows encoding
 /AutoEnc_kuig7zeiv5iolg6nn736gdpm7h [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_kvzzr3.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_kvzzr3.enc
index f2600f3c0a4..cdc287ecb3e 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 Thu May 14 23:25:39 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:47 2020
 % Command line follows encoding
 /AutoEnc_kvzzr3edrncu7vt2awvffb64cc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lchj55.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lchj55.enc
index 5849b63e55a..04d190b9a17 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lchj55.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_lchj55.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_lchj55yasnnqx5ykwctrzateoh
-% Encoding created by otftotfm on Thu May 14 23:26:01 2020
+% Encoding created by otftotfm on Wed Jun 17 17:23:05 2020
 % Command line follows encoding
 /AutoEnc_lchj55yasnnqx5ykwctrzateoh [
 %00
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 6cf6a25411c..2478d49b569 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 Thu May 14 23:25:55 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:53 2020
 % Command line follows encoding
 /AutoEnc_m5kdwta2ya4v2cpfk2w7yaatjb [
 %00
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 9fb2119ad3c..6b8f44d5503 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 Thu May 14 23:25:34 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:38 2020
 % Command line follows encoding
 /AutoEnc_mpvq56haezsrrjg72prw5fumwf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_na6tk5.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_na6tk5.enc
index 209cc10d8d0..e99f90093d0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_na6tk5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_na6tk5.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_na6tk5osakq2zemkf5qfxhpzie
-% Encoding created by otftotfm on Thu May 14 23:26:11 2020
+% Encoding created by otftotfm on Wed Jun 17 17:23:00 2020
 % Command line follows encoding
 /AutoEnc_na6tk5osakq2zemkf5qfxhpzie [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nfh2ow.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nfh2ow.enc
index 95e624a7410..8969c6a3abf 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 Thu May 14 23:26:10 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:59 2020
 % Command line follows encoding
 /AutoEnc_nfh2owxdg6o6hn6aumhzqgw4xe [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nmcbzq.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nmcbzq.enc
index 5df1afab7d4..e230d4a22dc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nmcbzq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nmcbzq.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_nmcbzq4sgpjqihlgrfjsupvbaf
-% Encoding created by otftotfm on Thu May 14 23:26:02 2020
+% Encoding created by otftotfm on Wed Jun 17 17:23:00 2020
 % Command line follows encoding
 /AutoEnc_nmcbzq4sgpjqihlgrfjsupvbaf [
 %00
@@ -60,4 +60,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/etbb
 % --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
 % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=tnum ETbb-Regular.otf ETbb-Regular-tlf-ts1'
+% --feature=tnum ETbb-Regular.otf ETbb-Regular-tosf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nnawaw.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nnawaw.enc
index e2c89c03545..8051784f912 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nnawaw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_nnawaw.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_nnawawhrqtfql6ks2vijrjl4ef
-% Encoding created by otftotfm on Thu May 14 23:25:27 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:39 2020
 % Command line follows encoding
 /AutoEnc_nnawawhrqtfql6ks2vijrjl4ef [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ohc25e.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ohc25e.enc
index 4a0bc123eb7..66f04ea62a0 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 Thu May 14 23:25:29 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:41 2020
 % Command line follows encoding
 /AutoEnc_ohc25e7nugkq5uftwleqtlzhic [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ohvjcv.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ohvjcv.enc
index 103ed3e22be..377c408ad47 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 Thu May 14 23:25:28 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:38 2020
 % Command line follows encoding
 /AutoEnc_ohvjcvc5bqqlbwbvbss6jzvdvg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_oynaqb.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_oynaqb.enc
index 7657fb8ed9f..c59ab0710e2 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 Thu May 14 23:25:51 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:55 2020
 % Command line follows encoding
 /AutoEnc_oynaqbx2tknlw3aeddaeveg26e [
 %00
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 a18796d7111..6df1b9cbaa8 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 Thu May 14 23:25:28 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:41 2020
 % Command line follows encoding
 /AutoEnc_pijcl45xbcrh3ujmxpu2uuufoe [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_pvrda3.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_pvrda3.enc
index c17e5b426c7..afc0f179cd3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_pvrda3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_pvrda3.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_pvrda3ayd24l2jz24a3yz6f4kd
-% Encoding created by otftotfm on Thu May 14 23:25:25 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:39 2020
 % Command line follows encoding
 /AutoEnc_pvrda3ayd24l2jz24a3yz6f4kd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_qmwyqz.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_qmwyqz.enc
index 7bd9853e57a..872d17cecc1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_qmwyqz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_qmwyqz.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_qmwyqz2zii3wt5czsrhsmdlqle
-% Encoding created by otftotfm on Thu May 14 23:25:59 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:52 2020
 % Command line follows encoding
 /AutoEnc_qmwyqz2zii3wt5czsrhsmdlqle [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_qqjyre.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_qqjyre.enc
index 9b9a91c0759..4a11afdcfb0 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 Thu May 14 23:26:04 2020
+% Encoding created by otftotfm on Wed Jun 17 17:23:06 2020
 % Command line follows encoding
 /AutoEnc_qqjyrebwkze4pfxo72toftkebf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_r34xpu.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_r34xpu.enc
index e971ec2acfb..d7ce24a4546 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 Thu May 14 23:26:06 2020
+% Encoding created by otftotfm on Wed Jun 17 17:23:01 2020
 % Command line follows encoding
 /AutoEnc_r34xpuqbjubisgsjxlr74lrpqd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_riohwx.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_riohwx.enc
index e8058877ab9..63e446ccc46 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 Thu May 14 23:25:37 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:48 2020
 % Command line follows encoding
 /AutoEnc_riohwxsior5lnnjjsjpbvpslke [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rt4kro.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rt4kro.enc
index 33de350f125..53e806f1ce6 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 Thu May 14 23:25:34 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:34 2020
 % Command line follows encoding
 /AutoEnc_rt4krokhlnwam4wxhivtc42zod [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rwec2l.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rwec2l.enc
index 5209b34ab50..cb63231c6bb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rwec2l.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rwec2l.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_rwec2ltafusdbpjxc5bs7fdg3b
-% Encoding created by otftotfm on Thu May 14 23:25:58 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:51 2020
 % Command line follows encoding
 /AutoEnc_rwec2ltafusdbpjxc5bs7fdg3b [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rzlqzq.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_rzlqzq.enc
index e615d8011ad..c1408206d9d 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 Thu May 14 23:25:57 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:54 2020
 % Command line follows encoding
 /AutoEnc_rzlqzq4dfqtplm3j7w5fz6domf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_s2dnn6.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_s2dnn6.enc
index d8cebb410b9..1820900c01f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_s2dnn6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_s2dnn6.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_s2dnn6rj7tbunhbchxk63iytpd
-% Encoding created by otftotfm on Thu May 14 23:25:40 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:46 2020
 % Command line follows encoding
 /AutoEnc_s2dnn6rj7tbunhbchxk63iytpd [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sk3nrp.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sk3nrp.enc
index 4908cbf128c..b7da1491293 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sk3nrp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sk3nrp.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_sk3nrpgzyacs2cd4rfqahjbzdc
-% Encoding created by otftotfm on Thu May 14 23:26:03 2020
+% Encoding created by otftotfm on Wed Jun 17 17:23:03 2020
 % Command line follows encoding
 /AutoEnc_sk3nrpgzyacs2cd4rfqahjbzdc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sp7p3o.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sp7p3o.enc
index a1c7a278ad4..1863042ccd3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sp7p3o.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sp7p3o.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_sp7p3ogzc33lxwuaxiyoy7i63e
-% Encoding created by otftotfm on Thu May 14 23:25:55 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:53 2020
 % Command line follows encoding
 /AutoEnc_sp7p3ogzc33lxwuaxiyoy7i63e [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sz3fgd.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sz3fgd.enc
index b41ef039809..ec77da3fc55 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sz3fgd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_sz3fgd.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_sz3fgdxm5o6umjwa4dgutu666f
-% Encoding created by otftotfm on Thu May 14 23:25:32 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:37 2020
 % Command line follows encoding
 /AutoEnc_sz3fgdxm5o6umjwa4dgutu666f [
 %00
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 814cb89c2e3..8ed77014fec 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 Thu May 14 23:25:51 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:54 2020
 % Command line follows encoding
 /AutoEnc_tif2ynv3fdnyajhtthl5l33lxb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_un2f5f.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_un2f5f.enc
index bd77a4eadd7..7b11ec640a9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_un2f5f.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_un2f5f.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_un2f5ft3vrvcnpf2fv5j434njb
-% Encoding created by otftotfm on Thu May 14 23:25:35 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:35 2020
 % Command line follows encoding
 /AutoEnc_un2f5ft3vrvcnpf2fv5j434njb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_uoncjt.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_uoncjt.enc
index df384b9a558..5dab8df1ebb 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 Thu May 14 23:26:09 2020
+% Encoding created by otftotfm on Wed Jun 17 17:23:02 2020
 % Command line follows encoding
 /AutoEnc_uoncjtwnmhcjmejtj3u7v6bsxh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_v2eodf.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_v2eodf.enc
index 7e8ea06827f..888a1b2529c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_v2eodf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_v2eodf.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_v2eodfhfoafkknfaq4dvfpm3vf
-% Encoding created by otftotfm on Thu May 14 23:25:25 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:40 2020
 % Command line follows encoding
 /AutoEnc_v2eodfhfoafkknfaq4dvfpm3vf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_vmkycp.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_vmkycp.enc
index dbf87e63e5b..93a9197a311 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_vmkycp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_vmkycp.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_vmkycpf7ajyvncqs3krblmkupe
-% Encoding created by otftotfm on Thu May 14 23:26:01 2020
+% Encoding created by otftotfm on Wed Jun 17 17:23:05 2020
 % Command line follows encoding
 /AutoEnc_vmkycpf7ajyvncqs3krblmkupe [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_w2blwa.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_w2blwa.enc
index d01f920d9df..6c652b0854c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_w2blwa.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_w2blwa.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_w2blwaqr3viyqtflq3saritzvg
-% Encoding created by otftotfm on Thu May 14 23:25:30 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:37 2020
 % Command line follows encoding
 /AutoEnc_w2blwaqr3viyqtflq3saritzvg [
 %00
@@ -60,4 +60,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/etbb
 % --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
 % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=pnum ETbb-Bold.otf ETbb-Bold-lf-ts1'
+% --feature=pnum ETbb-Bold.otf ETbb-Bold-osf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_w52zjg.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_w52zjg.enc
index d032c252d23..bb0b696d95e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_w52zjg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_w52zjg.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh
-% Encoding created by otftotfm on Thu May 14 23:25:33 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:38 2020
 % Command line follows encoding
 /AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_whnzkz.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_whnzkz.enc
index df9ea9a026f..a13b154f62c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_whnzkz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_whnzkz.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_whnzkzr322c66cgq4nlbs67x7d
-% Encoding created by otftotfm on Thu May 14 23:25:58 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:51 2020
 % Command line follows encoding
 /AutoEnc_whnzkzr322c66cgq4nlbs67x7d [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_x5rskw.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_x5rskw.enc
index 9109f46631f..ca19a5a1e59 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_x5rskw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_x5rskw.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_x5rskwfdgrpeovvnp5dgzgax7e
-% Encoding created by otftotfm on Thu May 14 23:25:29 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:42 2020
 % Command line follows encoding
 /AutoEnc_x5rskwfdgrpeovvnp5dgzgax7e [
 %00
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 cfbd44035fc..939d7658d06 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 Thu May 14 23:25:58 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:51 2020
 % Command line follows encoding
 /AutoEnc_xe5wuhzidgbvcpd4udlt7isypc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_y34kuc.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_y34kuc.enc
index 0228d2ce45e..992346ff947 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_y34kuc.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_y34kuc.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_y34kucs7id2vztdpuvalj5rvwd
-% Encoding created by otftotfm on Thu May 14 23:25:54 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:54 2020
 % Command line follows encoding
 /AutoEnc_y34kucs7id2vztdpuvalj5rvwd [
 %00
@@ -60,4 +60,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/etbb
 % --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
 % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=pnum ETbb-Italic.otf ETbb-Italic-lf-ts1'
+% --feature=pnum ETbb-Italic.otf ETbb-Italic-osf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ybjyd4.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ybjyd4.enc
index dcae08b92e4..1c3dd114d72 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 Thu May 14 23:25:34 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:35 2020
 % Command line follows encoding
 /AutoEnc_ybjyd4l7q3pzoonr2vgt7y7cye [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yhvmm4.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yhvmm4.enc
index b0a0883be07..efd85e72f1c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yhvmm4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yhvmm4.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_yhvmm4p7ob5occ6mmnesxbgljh
-% Encoding created by otftotfm on Thu May 14 23:26:07 2020
+% Encoding created by otftotfm on Wed Jun 17 17:23:01 2020
 % Command line follows encoding
 /AutoEnc_yhvmm4p7ob5occ6mmnesxbgljh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yiqwpu.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yiqwpu.enc
index dcbbdcffdb5..3e6de8598ee 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 Thu May 14 23:25:45 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:46 2020
 % Command line follows encoding
 /AutoEnc_yiqwpuq7peloj5eprodwnynevc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yjlloh.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yjlloh.enc
index 74981fd2b2f..d935cd53064 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yjlloh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yjlloh.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_yjllohyiapvbznlcedbxnkm3sa
-% Encoding created by otftotfm on Thu May 14 23:25:51 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:55 2020
 % Command line follows encoding
 /AutoEnc_yjllohyiapvbznlcedbxnkm3sa [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ytzykv.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_ytzykv.enc
index 5603da5f05d..19645bd05ad 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 Thu May 14 23:25:51 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:55 2020
 % Command line follows encoding
 /AutoEnc_ytzykvcotxef33p6cozlsx4zlh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yx33ty.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yx33ty.enc
index ffc6613eef9..f368eaed053 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yx33ty.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yx33ty.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_yx33tyntdblls2w4cy5uilargh
-% Encoding created by otftotfm on Thu May 14 23:25:38 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:44 2020
 % Command line follows encoding
 /AutoEnc_yx33tyntdblls2w4cy5uilargh [
 %00
@@ -60,4 +60,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/etbb
 % --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
 % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=tnum ETbb-BoldItalic.otf ETbb-BoldItalic-tlf-ts1'
+% --feature=tnum ETbb-BoldItalic.otf ETbb-BoldItalic-tosf-ts1'
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 88c49eea62d..155119490c3 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 Thu May 14 23:25:27 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:39 2020
 % Command line follows encoding
 /AutoEnc_yzoycro7xigz5wnd723rnypzae [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yzujze.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yzujze.enc
index 7a7d4eee79c..a090f29662c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yzujze.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_yzujze.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_yzujze46wjghaaaz6ede3o5zpg
-% Encoding created by otftotfm on Thu May 14 23:26:08 2020
+% Encoding created by otftotfm on Wed Jun 17 17:23:02 2020
 % Command line follows encoding
 /AutoEnc_yzujze46wjghaaaz6ede3o5zpg [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_z6brcn.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_z6brcn.enc
index 947e77eb27d..6611eccfdb5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_z6brcn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_z6brcn.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_z6brcnoe5prjyyjcyzrsnkxmxe
-% Encoding created by otftotfm on Thu May 14 23:25:49 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:57 2020
 % Command line follows encoding
 /AutoEnc_z6brcnoe5prjyyjcyzrsnkxmxe [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_zfr6et.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_zfr6et.enc
index b476a54c4ac..5996ec7bf7d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_zfr6et.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_zfr6et.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_zfr6etjisovywe6xf6ccagxj5e
-% Encoding created by otftotfm on Thu May 14 23:25:50 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:52 2020
 % Command line follows encoding
 /AutoEnc_zfr6etjisovywe6xf6ccagxj5e [
 %00
@@ -60,4 +60,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/etbb
 % --map-file=texmf/fonts/map/dvips/etbb/ETbb.map --no-updmap
 % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=tnum ETbb-Italic.otf ETbb-Italic-tlf-ts1'
+% --feature=tnum ETbb-Italic.otf ETbb-Italic-tosf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_zxy3n5.enc b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_zxy3n5.enc
index 5fa2bc4e77b..dd9ec90b40c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_zxy3n5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/etbb/etbb_zxy3n5.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_zxy3n5aiatzd3xjlhm2urzyfuc
-% Encoding created by otftotfm on Thu May 14 23:25:32 2020
+% Encoding created by otftotfm on Wed Jun 17 17:22:37 2020
 % Command line follows encoding
 /AutoEnc_zxy3n5aiatzd3xjlhm2urzyfuc [
 %00
diff --git a/Master/texmf-dist/fonts/map/dvips/etbb/ETbb.map b/Master/texmf-dist/fonts/map/dvips/etbb/ETbb.map
index b694956de8a..7f6b4605bc5 100644
--- a/Master/texmf-dist/fonts/map/dvips/etbb/ETbb.map
+++ b/Master/texmf-dist/fonts/map/dvips/etbb/ETbb.map
@@ -1,5 +1,28 @@
 % Automatically maintained by otftotfm or other programs. Do not edit.
 
+ETbb-Bold-tosf-ot1 ETbb-Bold "AutoEnc_rt4krokhlnwam4wxhivtc42zod ReEncodeFont" <[etbb_rt4kro.enc <ETbb-Bold.pfb
+ETbb-Bold-tosf-t1--base ETbb-Bold "AutoEnc_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb_3ccbvp.enc <ETbb-Bold.pfb
+ETbb-Bold-tosf-ly1--base ETbb-Bold "AutoEnc_ybjyd4l7q3pzoonr2vgt7y7cye ReEncodeFont" <[etbb_ybjyd4.enc <ETbb-Bold.pfb
+ETbb-Bold-tosf-sc-ot1--base ETbb-Bold "AutoEnc_un2f5ft3vrvcnpf2fv5j434njb ReEncodeFont" <[etbb_un2f5f.enc <ETbb-Bold.pfb
+ETbb-Bold-tosf-sc-t1--base ETbb-Bold "AutoEnc_5325we5aho44lxbyegll2vl3dc ReEncodeFont" <[etbb_5325we.enc <ETbb-Bold.pfb
+ETbb-Bold-tosf-sc-ly1--base ETbb-Bold "AutoEnc_cpdyi3iny2nijyt7gl7sena5id ReEncodeFont" <[etbb_cpdyi3.enc <ETbb-Bold.pfb
+ETbb-Bold-tosf-ts1--base ETbb-Bold "AutoEnc_bludla2t2nbjgt6v2mhnowpvfc ReEncodeFont" <[etbb_bludla.enc <ETbb-Bold.pfb
+ETbb-Bold-osf-ot1 ETbb-Bold "AutoEnc_3li7dqpy2izcpma72gvve2muqf ReEncodeFont" <[etbb_3li7dq.enc <ETbb-Bold.pfb
+ETbb-Bold-osf-t1--base ETbb-Bold "AutoEnc_hah5orya7ruvjmqzsfnwzilfbf ReEncodeFont" <[etbb_hah5or.enc <ETbb-Bold.pfb
+ETbb-Bold-osf-ly1--base ETbb-Bold "AutoEnc_33mftda5zpj2atc2k5o52aguyh ReEncodeFont" <[etbb_33mftd.enc <ETbb-Bold.pfb
+ETbb-Bold-osf-sc-ot1--base ETbb-Bold "AutoEnc_dcps7kztgw3wzbkeqywcdknetd ReEncodeFont" <[etbb_dcps7k.enc <ETbb-Bold.pfb
+ETbb-Bold-osf-sc-t1--base ETbb-Bold "AutoEnc_zxy3n5aiatzd3xjlhm2urzyfuc ReEncodeFont" <[etbb_zxy3n5.enc <ETbb-Bold.pfb
+ETbb-Bold-osf-sc-ly1--base ETbb-Bold "AutoEnc_sz3fgdxm5o6umjwa4dgutu666f ReEncodeFont" <[etbb_sz3fgd.enc <ETbb-Bold.pfb
+ETbb-Bold-osf-ts1--base ETbb-Bold "AutoEnc_w2blwaqr3viyqtflq3saritzvg ReEncodeFont" <[etbb_w2blwa.enc <ETbb-Bold.pfb
+ETbb-Bold-dnom-ot1 ETbb-Bold "AutoEnc_h4dyumvfz6ek2rcxjxry72wymd ReEncodeFont" <[etbb_h4dyum.enc <ETbb-Bold.pfb
+ETbb-Bold-dnom-t1--base ETbb-Bold "AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb_w52zjg.enc <ETbb-Bold.pfb
+ETbb-Bold-dnom-ly1--base ETbb-Bold "AutoEnc_mpvq56haezsrrjg72prw5fumwf ReEncodeFont" <[etbb_mpvq56.enc <ETbb-Bold.pfb
+ETbb-Bold-sup-ot1 ETbb-Bold "AutoEnc_ohvjcvc5bqqlbwbvbss6jzvdvg ReEncodeFont" <[etbb_ohvjcv.enc <ETbb-Bold.pfb
+ETbb-Bold-sup-t1--base ETbb-Bold "AutoEnc_3pfdgzsbueyunimviyizcdlq3b ReEncodeFont" <[etbb_3pfdgz.enc <ETbb-Bold.pfb
+ETbb-Bold-sup-ly1--base ETbb-Bold "AutoEnc_atf2m5uqgbwoyyy5ueppslzajb ReEncodeFont" <[etbb_atf2m5.enc <ETbb-Bold.pfb
+ETbb-Bold-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-tlf-ot1 ETbb-Bold "AutoEnc_ihmnlry5rdqsk57rbbszezzogb ReEncodeFont" <[etbb_ihmnlr.enc <ETbb-Bold.pfb
 ETbb-Bold-tlf-t1--base ETbb-Bold "AutoEnc_pvrda3ayd24l2jz24a3yz6f4kd ReEncodeFont" <[etbb_pvrda3.enc <ETbb-Bold.pfb
 ETbb-Bold-tlf-ly1--base ETbb-Bold "AutoEnc_elsw3hdxi5xivsxqghfqivctad ReEncodeFont" <[etbb_elsw3h.enc <ETbb-Bold.pfb
@@ -7,12 +30,6 @@ ETbb-Bold-tlf-sc-ot1--base ETbb-Bold "AutoEnc_v2eodfhfoafkknfaq4dvfpm3vf ReEncod
 ETbb-Bold-tlf-sc-t1--base ETbb-Bold "AutoEnc_hibu6umvrjtqrirvpvs25evi3c ReEncodeFont" <[etbb_hibu6u.enc <ETbb-Bold.pfb
 ETbb-Bold-tlf-sc-ly1--base ETbb-Bold "AutoEnc_kuig7zeiv5iolg6nn736gdpm7h ReEncodeFont" <[etbb_kuig7z.enc <ETbb-Bold.pfb
 ETbb-Bold-tlf-ts1--base ETbb-Bold "AutoEnc_bludla2t2nbjgt6v2mhnowpvfc ReEncodeFont" <[etbb_bludla.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-sup-ot1 ETbb-Bold "AutoEnc_ohvjcvc5bqqlbwbvbss6jzvdvg ReEncodeFont" <[etbb_ohvjcv.enc <ETbb-Bold.pfb
-ETbb-Bold-sup-t1--base ETbb-Bold "AutoEnc_3pfdgzsbueyunimviyizcdlq3b ReEncodeFont" <[etbb_3pfdgz.enc <ETbb-Bold.pfb
-ETbb-Bold-sup-ly1--base ETbb-Bold "AutoEnc_atf2m5uqgbwoyyy5ueppslzajb ReEncodeFont" <[etbb_atf2m5.enc <ETbb-Bold.pfb
 ETbb-Bold-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
@@ -20,23 +37,29 @@ ETbb-Bold-lf-sc-ot1--base ETbb-Bold "AutoEnc_gtayjyqjbvkxwi76vvo5bz5rsh ReEncode
 ETbb-Bold-lf-sc-t1--base ETbb-Bold "AutoEnc_x5rskwfdgrpeovvnp5dgzgax7e ReEncodeFont" <[etbb_x5rskw.enc <ETbb-Bold.pfb
 ETbb-Bold-lf-sc-ly1--base ETbb-Bold "AutoEnc_c6gjhmb3ta3czdt7nhimutsk5c ReEncodeFont" <[etbb_c6gjhm.enc <ETbb-Bold.pfb
 ETbb-Bold-lf-ts1--base ETbb-Bold "AutoEnc_w2blwaqr3viyqtflq3saritzvg ReEncodeFont" <[etbb_w2blwa.enc <ETbb-Bold.pfb
-ETbb-Bold-osf-ot1 ETbb-Bold "AutoEnc_3li7dqpy2izcpma72gvve2muqf ReEncodeFont" <[etbb_3li7dq.enc <ETbb-Bold.pfb
-ETbb-Bold-osf-t1--base ETbb-Bold "AutoEnc_hah5orya7ruvjmqzsfnwzilfbf ReEncodeFont" <[etbb_hah5or.enc <ETbb-Bold.pfb
-ETbb-Bold-osf-ly1--base ETbb-Bold "AutoEnc_33mftda5zpj2atc2k5o52aguyh ReEncodeFont" <[etbb_33mftd.enc <ETbb-Bold.pfb
-ETbb-Bold-osf-sc-ot1--base ETbb-Bold "AutoEnc_dcps7kztgw3wzbkeqywcdknetd ReEncodeFont" <[etbb_dcps7k.enc <ETbb-Bold.pfb
-ETbb-Bold-osf-sc-t1--base ETbb-Bold "AutoEnc_zxy3n5aiatzd3xjlhm2urzyfuc ReEncodeFont" <[etbb_zxy3n5.enc <ETbb-Bold.pfb
-ETbb-Bold-osf-sc-ly1--base ETbb-Bold "AutoEnc_sz3fgdxm5o6umjwa4dgutu666f ReEncodeFont" <[etbb_sz3fgd.enc <ETbb-Bold.pfb
-ETbb-Bold-osf-ts1--base ETbb-Bold "AutoEnc_w2blwaqr3viyqtflq3saritzvg ReEncodeFont" <[etbb_w2blwa.enc <ETbb-Bold.pfb
-ETbb-Bold-dnom-ot1 ETbb-Bold "AutoEnc_h4dyumvfz6ek2rcxjxry72wymd ReEncodeFont" <[etbb_h4dyum.enc <ETbb-Bold.pfb
-ETbb-Bold-dnom-t1--base ETbb-Bold "AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb_w52zjg.enc <ETbb-Bold.pfb
-ETbb-Bold-dnom-ly1--base ETbb-Bold "AutoEnc_mpvq56haezsrrjg72prw5fumwf ReEncodeFont" <[etbb_mpvq56.enc <ETbb-Bold.pfb
-ETbb-Bold-tosf-ot1 ETbb-Bold "AutoEnc_rt4krokhlnwam4wxhivtc42zod ReEncodeFont" <[etbb_rt4kro.enc <ETbb-Bold.pfb
-ETbb-Bold-tosf-t1--base ETbb-Bold "AutoEnc_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb_3ccbvp.enc <ETbb-Bold.pfb
-ETbb-Bold-tosf-ly1--base ETbb-Bold "AutoEnc_ybjyd4l7q3pzoonr2vgt7y7cye ReEncodeFont" <[etbb_ybjyd4.enc <ETbb-Bold.pfb
-ETbb-Bold-tosf-sc-ot1--base ETbb-Bold "AutoEnc_un2f5ft3vrvcnpf2fv5j434njb ReEncodeFont" <[etbb_un2f5f.enc <ETbb-Bold.pfb
-ETbb-Bold-tosf-sc-t1--base ETbb-Bold "AutoEnc_5325we5aho44lxbyegll2vl3dc ReEncodeFont" <[etbb_5325we.enc <ETbb-Bold.pfb
-ETbb-Bold-tosf-sc-ly1--base ETbb-Bold "AutoEnc_cpdyi3iny2nijyt7gl7sena5id ReEncodeFont" <[etbb_cpdyi3.enc <ETbb-Bold.pfb
-ETbb-Bold-tosf-ts1--base ETbb-Bold "AutoEnc_bludla2t2nbjgt6v2mhnowpvfc ReEncodeFont" <[etbb_bludla.enc <ETbb-Bold.pfb
+ETbb-BoldItalic-tosf-ot1 ETbb-BoldItalic "AutoEnc_rt4krokhlnwam4wxhivtc42zod ReEncodeFont" <[etbb_rt4kro.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-tosf-t1--base ETbb-BoldItalic "AutoEnc_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb_3ccbvp.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-tosf-ly1--base ETbb-BoldItalic "AutoEnc_cyyszv3tgoadb7habjipfqte7b ReEncodeFont" <[etbb_cyyszv.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-tosf-sc-ot1--base ETbb-BoldItalic "AutoEnc_un2f5ft3vrvcnpf2fv5j434njb ReEncodeFont" <[etbb_un2f5f.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-tosf-sc-t1--base ETbb-BoldItalic "AutoEnc_5325we5aho44lxbyegll2vl3dc ReEncodeFont" <[etbb_5325we.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-tosf-sc-ly1--base ETbb-BoldItalic "AutoEnc_imedjxssqsfkutdv3rq6n6nujc ReEncodeFont" <[etbb_imedjx.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-tosf-ts1--base ETbb-BoldItalic "AutoEnc_yx33tyntdblls2w4cy5uilargh ReEncodeFont" <[etbb_yx33ty.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-osf-ot1 ETbb-BoldItalic "AutoEnc_3li7dqpy2izcpma72gvve2muqf ReEncodeFont" <[etbb_3li7dq.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-osf-t1--base ETbb-BoldItalic "AutoEnc_hah5orya7ruvjmqzsfnwzilfbf ReEncodeFont" <[etbb_hah5or.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-osf-ly1--base ETbb-BoldItalic "AutoEnc_242knmbltpk57lyn3w752okimf ReEncodeFont" <[etbb_242knm.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-osf-sc-ot1--base ETbb-BoldItalic "AutoEnc_dcps7kztgw3wzbkeqywcdknetd ReEncodeFont" <[etbb_dcps7k.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-osf-sc-t1--base ETbb-BoldItalic "AutoEnc_zxy3n5aiatzd3xjlhm2urzyfuc ReEncodeFont" <[etbb_zxy3n5.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-osf-sc-ly1--base ETbb-BoldItalic "AutoEnc_6tax72yid4piwl3l7e6mpqevrf ReEncodeFont" <[etbb_6tax72.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-osf-ts1--base ETbb-BoldItalic "AutoEnc_6vun2rq6eccu4qmsiafrhz35wf ReEncodeFont" <[etbb_6vun2r.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-dnom-ot1 ETbb-BoldItalic "AutoEnc_h4dyumvfz6ek2rcxjxry72wymd ReEncodeFont" <[etbb_h4dyum.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-dnom-t1--base ETbb-BoldItalic "AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb_w52zjg.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-dnom-ly1--base ETbb-BoldItalic "AutoEnc_yiqwpuq7peloj5eprodwnynevc ReEncodeFont" <[etbb_yiqwpu.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-sup-ot1 ETbb-BoldItalic "AutoEnc_ea2dgh24m4p3kft426m6vb5nre ReEncodeFont" <[etbb_ea2dgh.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-sup-t1--base ETbb-BoldItalic "AutoEnc_s2dnn6rj7tbunhbchxk63iytpd ReEncodeFont" <[etbb_s2dnn6.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-sup-ly1--base ETbb-BoldItalic "AutoEnc_7t4ywj5n7dfcy72ielrltqzb7a ReEncodeFont" <[etbb_7t4ywj.enc <ETbb-BoldItalic.pfb
+ETbb-BoldItalic-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-tlf-ot1 ETbb-BoldItalic "AutoEnc_ihmnlry5rdqsk57rbbszezzogb ReEncodeFont" <[etbb_ihmnlr.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-tlf-t1--base ETbb-BoldItalic "AutoEnc_pvrda3ayd24l2jz24a3yz6f4kd ReEncodeFont" <[etbb_pvrda3.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-tlf-ly1--base ETbb-BoldItalic "AutoEnc_riohwxsior5lnnjjsjpbvpslke ReEncodeFont" <[etbb_riohwx.enc <ETbb-BoldItalic.pfb
@@ -44,12 +67,6 @@ ETbb-BoldItalic-tlf-sc-ot1--base ETbb-BoldItalic "AutoEnc_v2eodfhfoafkknfaq4dvfp
 ETbb-BoldItalic-tlf-sc-t1--base ETbb-BoldItalic "AutoEnc_hibu6umvrjtqrirvpvs25evi3c ReEncodeFont" <[etbb_hibu6u.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-tlf-sc-ly1--base ETbb-BoldItalic "AutoEnc_gkmjhd3seclagiouwe46zxr2nh ReEncodeFont" <[etbb_gkmjhd.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-tlf-ts1--base ETbb-BoldItalic "AutoEnc_yx33tyntdblls2w4cy5uilargh ReEncodeFont" <[etbb_yx33ty.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-sup-ot1 ETbb-BoldItalic "AutoEnc_ea2dgh24m4p3kft426m6vb5nre ReEncodeFont" <[etbb_ea2dgh.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-sup-t1--base ETbb-BoldItalic "AutoEnc_s2dnn6rj7tbunhbchxk63iytpd ReEncodeFont" <[etbb_s2dnn6.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-sup-ly1--base ETbb-BoldItalic "AutoEnc_7t4ywj5n7dfcy72ielrltqzb7a ReEncodeFont" <[etbb_7t4ywj.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-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
@@ -57,23 +74,29 @@ ETbb-BoldItalic-lf-sc-ot1--base ETbb-BoldItalic "AutoEnc_gtayjyqjbvkxwi76vvo5bz5
 ETbb-BoldItalic-lf-sc-t1--base ETbb-BoldItalic "AutoEnc_x5rskwfdgrpeovvnp5dgzgax7e ReEncodeFont" <[etbb_x5rskw.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-lf-sc-ly1--base ETbb-BoldItalic "AutoEnc_bowihunnspwduw2eofxbzcdp7b ReEncodeFont" <[etbb_bowihu.enc <ETbb-BoldItalic.pfb
 ETbb-BoldItalic-lf-ts1--base ETbb-BoldItalic "AutoEnc_6vun2rq6eccu4qmsiafrhz35wf ReEncodeFont" <[etbb_6vun2r.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-osf-ot1 ETbb-BoldItalic "AutoEnc_3li7dqpy2izcpma72gvve2muqf ReEncodeFont" <[etbb_3li7dq.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-osf-t1--base ETbb-BoldItalic "AutoEnc_hah5orya7ruvjmqzsfnwzilfbf ReEncodeFont" <[etbb_hah5or.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-osf-ly1--base ETbb-BoldItalic "AutoEnc_242knmbltpk57lyn3w752okimf ReEncodeFont" <[etbb_242knm.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-osf-sc-ot1--base ETbb-BoldItalic "AutoEnc_dcps7kztgw3wzbkeqywcdknetd ReEncodeFont" <[etbb_dcps7k.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-osf-sc-t1--base ETbb-BoldItalic "AutoEnc_zxy3n5aiatzd3xjlhm2urzyfuc ReEncodeFont" <[etbb_zxy3n5.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-osf-sc-ly1--base ETbb-BoldItalic "AutoEnc_6tax72yid4piwl3l7e6mpqevrf ReEncodeFont" <[etbb_6tax72.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-osf-ts1--base ETbb-BoldItalic "AutoEnc_6vun2rq6eccu4qmsiafrhz35wf ReEncodeFont" <[etbb_6vun2r.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-dnom-ot1 ETbb-BoldItalic "AutoEnc_h4dyumvfz6ek2rcxjxry72wymd ReEncodeFont" <[etbb_h4dyum.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-dnom-t1--base ETbb-BoldItalic "AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb_w52zjg.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-dnom-ly1--base ETbb-BoldItalic "AutoEnc_yiqwpuq7peloj5eprodwnynevc ReEncodeFont" <[etbb_yiqwpu.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-tosf-ot1 ETbb-BoldItalic "AutoEnc_rt4krokhlnwam4wxhivtc42zod ReEncodeFont" <[etbb_rt4kro.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-tosf-t1--base ETbb-BoldItalic "AutoEnc_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb_3ccbvp.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-tosf-ly1--base ETbb-BoldItalic "AutoEnc_cyyszv3tgoadb7habjipfqte7b ReEncodeFont" <[etbb_cyyszv.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-tosf-sc-ot1--base ETbb-BoldItalic "AutoEnc_un2f5ft3vrvcnpf2fv5j434njb ReEncodeFont" <[etbb_un2f5f.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-tosf-sc-t1--base ETbb-BoldItalic "AutoEnc_5325we5aho44lxbyegll2vl3dc ReEncodeFont" <[etbb_5325we.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-tosf-sc-ly1--base ETbb-BoldItalic "AutoEnc_imedjxssqsfkutdv3rq6n6nujc ReEncodeFont" <[etbb_imedjx.enc <ETbb-BoldItalic.pfb
-ETbb-BoldItalic-tosf-ts1--base ETbb-BoldItalic "AutoEnc_yx33tyntdblls2w4cy5uilargh ReEncodeFont" <[etbb_yx33ty.enc <ETbb-BoldItalic.pfb
+ETbb-Italic-tosf-ot1 ETbb-Italic "AutoEnc_rt4krokhlnwam4wxhivtc42zod ReEncodeFont" <[etbb_rt4kro.enc <ETbb-Italic.pfb
+ETbb-Italic-tosf-t1--base ETbb-Italic "AutoEnc_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb_3ccbvp.enc <ETbb-Italic.pfb
+ETbb-Italic-tosf-ly1--base ETbb-Italic "AutoEnc_xe5wuhzidgbvcpd4udlt7isypc ReEncodeFont" <[etbb_xe5wuh.enc <ETbb-Italic.pfb
+ETbb-Italic-tosf-sc-ot1--base ETbb-Italic "AutoEnc_whnzkzr322c66cgq4nlbs67x7d ReEncodeFont" <[etbb_whnzkz.enc <ETbb-Italic.pfb
+ETbb-Italic-tosf-sc-t1--base ETbb-Italic "AutoEnc_rwec2ltafusdbpjxc5bs7fdg3b ReEncodeFont" <[etbb_rwec2l.enc <ETbb-Italic.pfb
+ETbb-Italic-tosf-sc-ly1--base ETbb-Italic "AutoEnc_qmwyqz2zii3wt5czsrhsmdlqle ReEncodeFont" <[etbb_qmwyqz.enc <ETbb-Italic.pfb
+ETbb-Italic-tosf-ts1--base ETbb-Italic "AutoEnc_zfr6etjisovywe6xf6ccagxj5e ReEncodeFont" <[etbb_zfr6et.enc <ETbb-Italic.pfb
+ETbb-Italic-osf-ot1 ETbb-Italic "AutoEnc_3li7dqpy2izcpma72gvve2muqf ReEncodeFont" <[etbb_3li7dq.enc <ETbb-Italic.pfb
+ETbb-Italic-osf-t1--base ETbb-Italic "AutoEnc_hah5orya7ruvjmqzsfnwzilfbf ReEncodeFont" <[etbb_hah5or.enc <ETbb-Italic.pfb
+ETbb-Italic-osf-ly1--base ETbb-Italic "AutoEnc_m5kdwta2ya4v2cpfk2w7yaatjb ReEncodeFont" <[etbb_m5kdwt.enc <ETbb-Italic.pfb
+ETbb-Italic-osf-sc-ot1--base ETbb-Italic "AutoEnc_dz2qg3d3q3x6zjjkul4syetglf ReEncodeFont" <[etbb_dz2qg3.enc <ETbb-Italic.pfb
+ETbb-Italic-osf-sc-t1--base ETbb-Italic "AutoEnc_sp7p3ogzc33lxwuaxiyoy7i63e ReEncodeFont" <[etbb_sp7p3o.enc <ETbb-Italic.pfb
+ETbb-Italic-osf-sc-ly1--base ETbb-Italic "AutoEnc_fue2l2dyo4hhc3efyctqx2ll4c ReEncodeFont" <[etbb_fue2l2.enc <ETbb-Italic.pfb
+ETbb-Italic-osf-ts1--base ETbb-Italic "AutoEnc_y34kucs7id2vztdpuvalj5rvwd ReEncodeFont" <[etbb_y34kuc.enc <ETbb-Italic.pfb
+ETbb-Italic-dnom-ot1 ETbb-Italic "AutoEnc_h4dyumvfz6ek2rcxjxry72wymd ReEncodeFont" <[etbb_h4dyum.enc <ETbb-Italic.pfb
+ETbb-Italic-dnom-t1--base ETbb-Italic "AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb_w52zjg.enc <ETbb-Italic.pfb
+ETbb-Italic-dnom-ly1--base ETbb-Italic "AutoEnc_rzlqzq4dfqtplm3j7w5fz6domf ReEncodeFont" <[etbb_rzlqzq.enc <ETbb-Italic.pfb
+ETbb-Italic-sup-ot1 ETbb-Italic "AutoEnc_tif2ynv3fdnyajhtthl5l33lxb ReEncodeFont" <[etbb_tif2yn.enc <ETbb-Italic.pfb
+ETbb-Italic-sup-t1--base ETbb-Italic "AutoEnc_yjllohyiapvbznlcedbxnkm3sa ReEncodeFont" <[etbb_yjlloh.enc <ETbb-Italic.pfb
+ETbb-Italic-sup-ly1--base ETbb-Italic "AutoEnc_oynaqbx2tknlw3aeddaeveg26e ReEncodeFont" <[etbb_oynaqb.enc <ETbb-Italic.pfb
+ETbb-Italic-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-tlf-ot1 ETbb-Italic "AutoEnc_ihmnlry5rdqsk57rbbszezzogb ReEncodeFont" <[etbb_ihmnlr.enc <ETbb-Italic.pfb
 ETbb-Italic-tlf-t1--base ETbb-Italic "AutoEnc_pvrda3ayd24l2jz24a3yz6f4kd ReEncodeFont" <[etbb_pvrda3.enc <ETbb-Italic.pfb
 ETbb-Italic-tlf-ly1--base ETbb-Italic "AutoEnc_i5ezvitppcazvehmki6u25ne3h ReEncodeFont" <[etbb_i5ezvi.enc <ETbb-Italic.pfb
@@ -81,12 +104,6 @@ ETbb-Italic-tlf-sc-ot1--base ETbb-Italic "AutoEnc_3jmjatxposyckyyeodfflfb4zf ReE
 ETbb-Italic-tlf-sc-t1--base ETbb-Italic "AutoEnc_77pqsh35tfbpgcie3v2crjtyef ReEncodeFont" <[etbb_77pqsh.enc <ETbb-Italic.pfb
 ETbb-Italic-tlf-sc-ly1--base ETbb-Italic "AutoEnc_z6brcnoe5prjyyjcyzrsnkxmxe ReEncodeFont" <[etbb_z6brcn.enc <ETbb-Italic.pfb
 ETbb-Italic-tlf-ts1--base ETbb-Italic "AutoEnc_zfr6etjisovywe6xf6ccagxj5e ReEncodeFont" <[etbb_zfr6et.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-sup-ot1 ETbb-Italic "AutoEnc_tif2ynv3fdnyajhtthl5l33lxb ReEncodeFont" <[etbb_tif2yn.enc <ETbb-Italic.pfb
-ETbb-Italic-sup-t1--base ETbb-Italic "AutoEnc_yjllohyiapvbznlcedbxnkm3sa ReEncodeFont" <[etbb_yjlloh.enc <ETbb-Italic.pfb
-ETbb-Italic-sup-ly1--base ETbb-Italic "AutoEnc_oynaqbx2tknlw3aeddaeveg26e ReEncodeFont" <[etbb_oynaqb.enc <ETbb-Italic.pfb
 ETbb-Italic-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
@@ -94,23 +111,29 @@ ETbb-Italic-lf-sc-ot1--base ETbb-Italic "AutoEnc_ko4auenlxbrvzhbacuekbifdwd ReEn
 ETbb-Italic-lf-sc-t1--base ETbb-Italic "AutoEnc_2wngtzno6dnkbgy6u3wuotcora ReEncodeFont" <[etbb_2wngtz.enc <ETbb-Italic.pfb
 ETbb-Italic-lf-sc-ly1--base ETbb-Italic "AutoEnc_f7n52pgkdu3b46yojqf7dkhspc ReEncodeFont" <[etbb_f7n52p.enc <ETbb-Italic.pfb
 ETbb-Italic-lf-ts1--base ETbb-Italic "AutoEnc_y34kucs7id2vztdpuvalj5rvwd ReEncodeFont" <[etbb_y34kuc.enc <ETbb-Italic.pfb
-ETbb-Italic-osf-ot1 ETbb-Italic "AutoEnc_3li7dqpy2izcpma72gvve2muqf ReEncodeFont" <[etbb_3li7dq.enc <ETbb-Italic.pfb
-ETbb-Italic-osf-t1--base ETbb-Italic "AutoEnc_hah5orya7ruvjmqzsfnwzilfbf ReEncodeFont" <[etbb_hah5or.enc <ETbb-Italic.pfb
-ETbb-Italic-osf-ly1--base ETbb-Italic "AutoEnc_m5kdwta2ya4v2cpfk2w7yaatjb ReEncodeFont" <[etbb_m5kdwt.enc <ETbb-Italic.pfb
-ETbb-Italic-osf-sc-ot1--base ETbb-Italic "AutoEnc_dz2qg3d3q3x6zjjkul4syetglf ReEncodeFont" <[etbb_dz2qg3.enc <ETbb-Italic.pfb
-ETbb-Italic-osf-sc-t1--base ETbb-Italic "AutoEnc_sp7p3ogzc33lxwuaxiyoy7i63e ReEncodeFont" <[etbb_sp7p3o.enc <ETbb-Italic.pfb
-ETbb-Italic-osf-sc-ly1--base ETbb-Italic "AutoEnc_fue2l2dyo4hhc3efyctqx2ll4c ReEncodeFont" <[etbb_fue2l2.enc <ETbb-Italic.pfb
-ETbb-Italic-osf-ts1--base ETbb-Italic "AutoEnc_y34kucs7id2vztdpuvalj5rvwd ReEncodeFont" <[etbb_y34kuc.enc <ETbb-Italic.pfb
-ETbb-Italic-dnom-ot1 ETbb-Italic "AutoEnc_h4dyumvfz6ek2rcxjxry72wymd ReEncodeFont" <[etbb_h4dyum.enc <ETbb-Italic.pfb
-ETbb-Italic-dnom-t1--base ETbb-Italic "AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb_w52zjg.enc <ETbb-Italic.pfb
-ETbb-Italic-dnom-ly1--base ETbb-Italic "AutoEnc_rzlqzq4dfqtplm3j7w5fz6domf ReEncodeFont" <[etbb_rzlqzq.enc <ETbb-Italic.pfb
-ETbb-Italic-tosf-ot1 ETbb-Italic "AutoEnc_rt4krokhlnwam4wxhivtc42zod ReEncodeFont" <[etbb_rt4kro.enc <ETbb-Italic.pfb
-ETbb-Italic-tosf-t1--base ETbb-Italic "AutoEnc_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb_3ccbvp.enc <ETbb-Italic.pfb
-ETbb-Italic-tosf-ly1--base ETbb-Italic "AutoEnc_xe5wuhzidgbvcpd4udlt7isypc ReEncodeFont" <[etbb_xe5wuh.enc <ETbb-Italic.pfb
-ETbb-Italic-tosf-sc-ot1--base ETbb-Italic "AutoEnc_whnzkzr322c66cgq4nlbs67x7d ReEncodeFont" <[etbb_whnzkz.enc <ETbb-Italic.pfb
-ETbb-Italic-tosf-sc-t1--base ETbb-Italic "AutoEnc_rwec2ltafusdbpjxc5bs7fdg3b ReEncodeFont" <[etbb_rwec2l.enc <ETbb-Italic.pfb
-ETbb-Italic-tosf-sc-ly1--base ETbb-Italic "AutoEnc_qmwyqz2zii3wt5czsrhsmdlqle ReEncodeFont" <[etbb_qmwyqz.enc <ETbb-Italic.pfb
-ETbb-Italic-tosf-ts1--base ETbb-Italic "AutoEnc_zfr6etjisovywe6xf6ccagxj5e ReEncodeFont" <[etbb_zfr6et.enc <ETbb-Italic.pfb
+ETbb-Regular-tosf-ot1 ETbb-Regular "AutoEnc_nfh2owxdg6o6hn6aumhzqgw4xe ReEncodeFont" <[etbb_nfh2ow.enc <ETbb-Regular.pfb
+ETbb-Regular-tosf-t1--base ETbb-Regular "AutoEnc_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb_3ccbvp.enc <ETbb-Regular.pfb
+ETbb-Regular-tosf-ly1--base ETbb-Regular "AutoEnc_ybjyd4l7q3pzoonr2vgt7y7cye ReEncodeFont" <[etbb_ybjyd4.enc <ETbb-Regular.pfb
+ETbb-Regular-tosf-sc-ot1--base ETbb-Regular "AutoEnc_na6tk5osakq2zemkf5qfxhpzie ReEncodeFont" <[etbb_na6tk5.enc <ETbb-Regular.pfb
+ETbb-Regular-tosf-sc-t1--base ETbb-Regular "AutoEnc_rwec2ltafusdbpjxc5bs7fdg3b ReEncodeFont" <[etbb_rwec2l.enc <ETbb-Regular.pfb
+ETbb-Regular-tosf-sc-ly1--base ETbb-Regular "AutoEnc_22apnozoce6wprtbuf6ihvsd5b ReEncodeFont" <[etbb_22apno.enc <ETbb-Regular.pfb
+ETbb-Regular-tosf-ts1--base ETbb-Regular "AutoEnc_nmcbzq4sgpjqihlgrfjsupvbaf ReEncodeFont" <[etbb_nmcbzq.enc <ETbb-Regular.pfb
+ETbb-Regular-osf-ot1 ETbb-Regular "AutoEnc_r34xpuqbjubisgsjxlr74lrpqd ReEncodeFont" <[etbb_r34xpu.enc <ETbb-Regular.pfb
+ETbb-Regular-osf-t1--base ETbb-Regular "AutoEnc_hah5orya7ruvjmqzsfnwzilfbf ReEncodeFont" <[etbb_hah5or.enc <ETbb-Regular.pfb
+ETbb-Regular-osf-ly1--base ETbb-Regular "AutoEnc_33mftda5zpj2atc2k5o52aguyh ReEncodeFont" <[etbb_33mftd.enc <ETbb-Regular.pfb
+ETbb-Regular-osf-sc-ot1--base ETbb-Regular "AutoEnc_yhvmm4p7ob5occ6mmnesxbgljh ReEncodeFont" <[etbb_yhvmm4.enc <ETbb-Regular.pfb
+ETbb-Regular-osf-sc-t1--base ETbb-Regular "AutoEnc_sp7p3ogzc33lxwuaxiyoy7i63e ReEncodeFont" <[etbb_sp7p3o.enc <ETbb-Regular.pfb
+ETbb-Regular-osf-sc-ly1--base ETbb-Regular "AutoEnc_yzujze46wjghaaaz6ede3o5zpg ReEncodeFont" <[etbb_yzujze.enc <ETbb-Regular.pfb
+ETbb-Regular-osf-ts1--base ETbb-Regular "AutoEnc_2mysj3r5ge4vrkh7fk26pe4rbd ReEncodeFont" <[etbb_2mysj3.enc <ETbb-Regular.pfb
+ETbb-Regular-dnom-ot1 ETbb-Regular "AutoEnc_uoncjtwnmhcjmejtj3u7v6bsxh ReEncodeFont" <[etbb_uoncjt.enc <ETbb-Regular.pfb
+ETbb-Regular-dnom-t1--base ETbb-Regular "AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb_w52zjg.enc <ETbb-Regular.pfb
+ETbb-Regular-dnom-ly1--base ETbb-Regular "AutoEnc_mpvq56haezsrrjg72prw5fumwf ReEncodeFont" <[etbb_mpvq56.enc <ETbb-Regular.pfb
+ETbb-Regular-sup-ot1 ETbb-Regular "AutoEnc_dep6cdmobxdewjybmud7kefdcf ReEncodeFont" <[etbb_dep6cd.enc <ETbb-Regular.pfb
+ETbb-Regular-sup-t1--base ETbb-Regular "AutoEnc_sk3nrpgzyacs2cd4rfqahjbzdc ReEncodeFont" <[etbb_sk3nrp.enc <ETbb-Regular.pfb
+ETbb-Regular-sup-ly1--base ETbb-Regular "AutoEnc_7pzsmkr2zp4z2jzsqyz5xypura ReEncodeFont" <[etbb_7pzsmk.enc <ETbb-Regular.pfb
+ETbb-Regular-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-tlf-ot1 ETbb-Regular "AutoEnc_e3m4fzaal3fm6lwih762ck4hoh ReEncodeFont" <[etbb_e3m4fz.enc <ETbb-Regular.pfb
 ETbb-Regular-tlf-t1--base ETbb-Regular "AutoEnc_pvrda3ayd24l2jz24a3yz6f4kd ReEncodeFont" <[etbb_pvrda3.enc <ETbb-Regular.pfb
 ETbb-Regular-tlf-ly1--base ETbb-Regular "AutoEnc_elsw3hdxi5xivsxqghfqivctad ReEncodeFont" <[etbb_elsw3h.enc <ETbb-Regular.pfb
@@ -118,12 +141,6 @@ ETbb-Regular-tlf-sc-ot1--base ETbb-Regular "AutoEnc_vmkycpf7ajyvncqs3krblmkupe R
 ETbb-Regular-tlf-sc-t1--base ETbb-Regular "AutoEnc_77pqsh35tfbpgcie3v2crjtyef ReEncodeFont" <[etbb_77pqsh.enc <ETbb-Regular.pfb
 ETbb-Regular-tlf-sc-ly1--base ETbb-Regular "AutoEnc_lchj55yasnnqx5ykwctrzateoh ReEncodeFont" <[etbb_lchj55.enc <ETbb-Regular.pfb
 ETbb-Regular-tlf-ts1--base ETbb-Regular "AutoEnc_nmcbzq4sgpjqihlgrfjsupvbaf ReEncodeFont" <[etbb_nmcbzq.enc <ETbb-Regular.pfb
-ETbb-Regular-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-sup-ot1 ETbb-Regular "AutoEnc_dep6cdmobxdewjybmud7kefdcf ReEncodeFont" <[etbb_dep6cd.enc <ETbb-Regular.pfb
-ETbb-Regular-sup-t1--base ETbb-Regular "AutoEnc_sk3nrpgzyacs2cd4rfqahjbzdc ReEncodeFont" <[etbb_sk3nrp.enc <ETbb-Regular.pfb
-ETbb-Regular-sup-ly1--base ETbb-Regular "AutoEnc_7pzsmkr2zp4z2jzsqyz5xypura ReEncodeFont" <[etbb_7pzsmk.enc <ETbb-Regular.pfb
 ETbb-Regular-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
@@ -131,56 +148,39 @@ ETbb-Regular-lf-sc-ot1--base ETbb-Regular "AutoEnc_5cjnk55s6lighj2fknbv2zorpf Re
 ETbb-Regular-lf-sc-t1--base ETbb-Regular "AutoEnc_2wngtzno6dnkbgy6u3wuotcora ReEncodeFont" <[etbb_2wngtz.enc <ETbb-Regular.pfb
 ETbb-Regular-lf-sc-ly1--base ETbb-Regular "AutoEnc_cuqhrji6wzmpdmxr5b7kf5n6ha ReEncodeFont" <[etbb_cuqhrj.enc <ETbb-Regular.pfb
 ETbb-Regular-lf-ts1--base ETbb-Regular "AutoEnc_2mysj3r5ge4vrkh7fk26pe4rbd ReEncodeFont" <[etbb_2mysj3.enc <ETbb-Regular.pfb
-ETbb-Regular-osf-ot1 ETbb-Regular "AutoEnc_r34xpuqbjubisgsjxlr74lrpqd ReEncodeFont" <[etbb_r34xpu.enc <ETbb-Regular.pfb
-ETbb-Regular-osf-t1--base ETbb-Regular "AutoEnc_hah5orya7ruvjmqzsfnwzilfbf ReEncodeFont" <[etbb_hah5or.enc <ETbb-Regular.pfb
-ETbb-Regular-osf-ly1--base ETbb-Regular "AutoEnc_33mftda5zpj2atc2k5o52aguyh ReEncodeFont" <[etbb_33mftd.enc <ETbb-Regular.pfb
-ETbb-Regular-osf-sc-ot1--base ETbb-Regular "AutoEnc_yhvmm4p7ob5occ6mmnesxbgljh ReEncodeFont" <[etbb_yhvmm4.enc <ETbb-Regular.pfb
-ETbb-Regular-osf-sc-t1--base ETbb-Regular "AutoEnc_sp7p3ogzc33lxwuaxiyoy7i63e ReEncodeFont" <[etbb_sp7p3o.enc <ETbb-Regular.pfb
-ETbb-Regular-osf-sc-ly1--base ETbb-Regular "AutoEnc_yzujze46wjghaaaz6ede3o5zpg ReEncodeFont" <[etbb_yzujze.enc <ETbb-Regular.pfb
-ETbb-Regular-osf-ts1--base ETbb-Regular "AutoEnc_2mysj3r5ge4vrkh7fk26pe4rbd ReEncodeFont" <[etbb_2mysj3.enc <ETbb-Regular.pfb
-ETbb-Regular-dnom-ot1 ETbb-Regular "AutoEnc_uoncjtwnmhcjmejtj3u7v6bsxh ReEncodeFont" <[etbb_uoncjt.enc <ETbb-Regular.pfb
-ETbb-Regular-dnom-t1--base ETbb-Regular "AutoEnc_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb_w52zjg.enc <ETbb-Regular.pfb
-ETbb-Regular-dnom-ly1--base ETbb-Regular "AutoEnc_mpvq56haezsrrjg72prw5fumwf ReEncodeFont" <[etbb_mpvq56.enc <ETbb-Regular.pfb
-ETbb-Regular-tosf-ot1 ETbb-Regular "AutoEnc_nfh2owxdg6o6hn6aumhzqgw4xe ReEncodeFont" <[etbb_nfh2ow.enc <ETbb-Regular.pfb
-ETbb-Regular-tosf-t1--base ETbb-Regular "AutoEnc_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb_3ccbvp.enc <ETbb-Regular.pfb
-ETbb-Regular-tosf-ly1--base ETbb-Regular "AutoEnc_ybjyd4l7q3pzoonr2vgt7y7cye ReEncodeFont" <[etbb_ybjyd4.enc <ETbb-Regular.pfb
-ETbb-Regular-tosf-sc-ot1--base ETbb-Regular "AutoEnc_na6tk5osakq2zemkf5qfxhpzie ReEncodeFont" <[etbb_na6tk5.enc <ETbb-Regular.pfb
-ETbb-Regular-tosf-sc-t1--base ETbb-Regular "AutoEnc_rwec2ltafusdbpjxc5bs7fdg3b ReEncodeFont" <[etbb_rwec2l.enc <ETbb-Regular.pfb
-ETbb-Regular-tosf-sc-ly1--base ETbb-Regular "AutoEnc_22apnozoce6wprtbuf6ihvsd5b ReEncodeFont" <[etbb_22apno.enc <ETbb-Regular.pfb
-ETbb-Regular-tosf-ts1--base ETbb-Regular "AutoEnc_nmcbzq4sgpjqihlgrfjsupvbaf ReEncodeFont" <[etbb_nmcbzq.enc <ETbb-Regular.pfb
+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-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-dnom-t1--base ETbb-Bold "AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb1_w52zjg.enc <ETbb-Bold.pfb
 Etbb1-Bold-tlf-t1--base ETbb-Bold "AutoEnc1_pvrda3ayd24l2jz24a3yz6f4kd ReEncodeFont" <[etbb1_pvrda3.enc <ETbb-Bold.pfb
 Etbb1-Bold-tlf-sc-t1--base ETbb-Bold "AutoEnc1_hibu6umvrjtqrirvpvs25evi3c ReEncodeFont" <[etbb1_hibu6u.enc <ETbb-Bold.pfb
 Etbb1-Bold-lf-t1--base ETbb-Bold "AutoEnc1_eqc2ac2qcg4bxjlkwezu334h4f ReEncodeFont" <[etbb1_eqc2ac.enc <ETbb-Bold.pfb
 Etbb1-Bold-lf-sc-t1--base ETbb-Bold "AutoEnc1_x5rskwfdgrpeovvnp5dgzgax7e ReEncodeFont" <[etbb1_x5rskw.enc <ETbb-Bold.pfb
-Etbb1-Bold-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-dnom-t1--base ETbb-Bold "AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb1_w52zjg.enc <ETbb-Bold.pfb
-Etbb1-Bold-tosf-t1--base ETbb-Bold "AutoEnc1_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb1_3ccbvp.enc <ETbb-Bold.pfb
-Etbb1-Bold-tosf-sc-t1--base ETbb-Bold "AutoEnc1_5325we5aho44lxbyegll2vl3dc ReEncodeFont" <[etbb1_5325we.enc <ETbb-Bold.pfb
+Etbb1-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-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-dnom-t1--base ETbb-BoldItalic "AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb1_w52zjg.enc <ETbb-BoldItalic.pfb
 Etbb1-BoldItalic-tlf-t1--base ETbb-BoldItalic "AutoEnc1_pvrda3ayd24l2jz24a3yz6f4kd ReEncodeFont" <[etbb1_pvrda3.enc <ETbb-BoldItalic.pfb
 Etbb1-BoldItalic-tlf-sc-t1--base ETbb-BoldItalic "AutoEnc1_hibu6umvrjtqrirvpvs25evi3c ReEncodeFont" <[etbb1_hibu6u.enc <ETbb-BoldItalic.pfb
 Etbb1-BoldItalic-lf-t1--base ETbb-BoldItalic "AutoEnc1_eqc2ac2qcg4bxjlkwezu334h4f ReEncodeFont" <[etbb1_eqc2ac.enc <ETbb-BoldItalic.pfb
 Etbb1-BoldItalic-lf-sc-t1--base ETbb-BoldItalic "AutoEnc1_x5rskwfdgrpeovvnp5dgzgax7e ReEncodeFont" <[etbb1_x5rskw.enc <ETbb-BoldItalic.pfb
-Etbb1-BoldItalic-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-dnom-t1--base ETbb-BoldItalic "AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb1_w52zjg.enc <ETbb-BoldItalic.pfb
-Etbb1-BoldItalic-tosf-t1--base ETbb-BoldItalic "AutoEnc1_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb1_3ccbvp.enc <ETbb-BoldItalic.pfb
-Etbb1-BoldItalic-tosf-sc-t1--base ETbb-BoldItalic "AutoEnc1_5325we5aho44lxbyegll2vl3dc ReEncodeFont" <[etbb1_5325we.enc <ETbb-BoldItalic.pfb
+Etbb1-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-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-dnom-t1--base ETbb-Italic "AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb1_w52zjg.enc <ETbb-Italic.pfb
 Etbb1-Italic-tlf-t1--base ETbb-Italic "AutoEnc1_pvrda3ayd24l2jz24a3yz6f4kd ReEncodeFont" <[etbb1_pvrda3.enc <ETbb-Italic.pfb
 Etbb1-Italic-tlf-sc-t1--base ETbb-Italic "AutoEnc1_77pqsh35tfbpgcie3v2crjtyef ReEncodeFont" <[etbb1_77pqsh.enc <ETbb-Italic.pfb
 Etbb1-Italic-lf-t1--base ETbb-Italic "AutoEnc1_eqc2ac2qcg4bxjlkwezu334h4f ReEncodeFont" <[etbb1_eqc2ac.enc <ETbb-Italic.pfb
 Etbb1-Italic-lf-sc-t1--base ETbb-Italic "AutoEnc1_2wngtzno6dnkbgy6u3wuotcora ReEncodeFont" <[etbb1_2wngtz.enc <ETbb-Italic.pfb
-Etbb1-Italic-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-dnom-t1--base ETbb-Italic "AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb1_w52zjg.enc <ETbb-Italic.pfb
-Etbb1-Italic-tosf-t1--base ETbb-Italic "AutoEnc1_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb1_3ccbvp.enc <ETbb-Italic.pfb
-Etbb1-Italic-tosf-sc-t1--base ETbb-Italic "AutoEnc1_rwec2ltafusdbpjxc5bs7fdg3b ReEncodeFont" <[etbb1_rwec2l.enc <ETbb-Italic.pfb
+Etbb1-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-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-dnom-t1--base ETbb-Regular "AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb1_w52zjg.enc <ETbb-Regular.pfb
 Etbb1-Regular-tlf-t1--base ETbb-Regular "AutoEnc1_pvrda3ayd24l2jz24a3yz6f4kd ReEncodeFont" <[etbb1_pvrda3.enc <ETbb-Regular.pfb
 Etbb1-Regular-tlf-sc-t1--base ETbb-Regular "AutoEnc1_77pqsh35tfbpgcie3v2crjtyef ReEncodeFont" <[etbb1_77pqsh.enc <ETbb-Regular.pfb
 Etbb1-Regular-lf-t1--base ETbb-Regular "AutoEnc1_eqc2ac2qcg4bxjlkwezu334h4f ReEncodeFont" <[etbb1_eqc2ac.enc <ETbb-Regular.pfb
 Etbb1-Regular-lf-sc-t1--base ETbb-Regular "AutoEnc1_2wngtzno6dnkbgy6u3wuotcora ReEncodeFont" <[etbb1_2wngtz.enc <ETbb-Regular.pfb
-Etbb1-Regular-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-dnom-t1--base ETbb-Regular "AutoEnc1_w52zjgu7nmeze3qvhdhxibv7bh ReEncodeFont" <[etbb1_w52zjg.enc <ETbb-Regular.pfb
-Etbb1-Regular-tosf-t1--base ETbb-Regular "AutoEnc1_3ccbvpb2mahh6euinpg3u7qqze ReEncodeFont" <[etbb1_3ccbvp.enc <ETbb-Regular.pfb
-Etbb1-Regular-tosf-sc-t1--base ETbb-Regular "AutoEnc1_rwec2ltafusdbpjxc5bs7fdg3b ReEncodeFont" <[etbb1_rwec2l.enc <ETbb-Regular.pfb
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 ca7c574288a..7e4d4de4adf 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 6acf0b34f3f..d0646bdf9ae 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 72c0b3bb493..06b40b78f8c 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 6cd25a0b052..efaa735f9ed 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/type1/public/etbb/ETbb-Bold.pfb b/Master/texmf-dist/fonts/type1/public/etbb/ETbb-Bold.pfb
index 0436284eaf5..b1b548e8b3f 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 e429915b88c..b76a54ea504 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 68b7ba83164..a8bc599b060 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 445772e4366..ef04fee5035 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/tex/latex/etbb/ETbb.sty b/Master/texmf-dist/tex/latex/etbb/ETbb.sty
index 2a07a8e05ec..d08e27032bd 100644
--- a/Master/texmf-dist/tex/latex/etbb/ETbb.sty
+++ b/Master/texmf-dist/tex/latex/etbb/ETbb.sty
@@ -1,7 +1,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.02}
-\def\filedate{2020/05/15}
+\def\fileversion{1.01}
+\def\filedate{2020/05/03}
 \ProvidesPackage{ETbb}
     [\filedate\space v\fileversion.  Style file for ETbb.]
 
@@ -25,18 +25,8 @@
         \fontfigurestyle{inferior}\selectfont}
     \DeclareTextFontCommand{\textin}{\infigures}
     \let\textinferior\textin
-    \fa@naming@exception{figures}{{denominators}{proportional}}{Dnom}
-    \fa@naming@exception{figures}{{denominators}{tabular}}{Dnom}
-    \def\defigures{\@nomath\defigures
-        \fontfigurestyle{denominators}\selectfont}
-    \DeclareTextFontCommand{\textde}{\defigures}
-	\let\denomfigures=\defigures
-    \let\textdenom\textde
-	
-\providecommand*{\textfrac}[3][\ETbb@raisefrac]{%
-\tx@getL{##2}\tx@getF{##3}\leavevmode\raise ##1\hbox{\textsu{##2}\tx@Nk%
-\kern\ETbb@foresolidus%
-\textfractionsolidus\tx@Dk\kern\ETbb@aftsolidus\textde{##3}}}
+    \providecommand*{\textfrac}[3][\ETbb@raisefrac]{%
+    \raise ##1 \hbox{\textsu{##2}\kern \ETbb@foresolidus \textfractionsolidus\kern \ETbb@aftsolidus \textin{##3}}}
 
 }{}
 
@@ -61,65 +51,9 @@
 \newif\if@ETbb@sharpS
 \newif\if@ETbb@sups
 \newif\if@ETbb@scosf
-% fraction macros
-\def\ETbb@foresolidus{-.05em}
-\def\ETbb@aftsolidus{-.08em}
-\def\ETbb@raisefrac{0em} %{.111em}
-%
-\def\tx@getF#1{% get first item in argument string
-\expandafter\ifblank\expandafter{#1}{\relax}{\expandafter\tx@@getF #1\@nil}}
-\def\tx@@getF#1#2\@nil{% get first item in argument string
-\tx@addDkern{#1}}
-%
-\def\tx@getL#1{%
-\expandafter\ifblank\expandafter{#1}{\relax}{\expandafter\tx@@getL #1\@nil}}
-	
-\def\tx@@getL#1#2\@nil{%
-\ifblank{#2}{\tx@addNkern{#1}}{\tx@@getL #2\@nil}}
-%
-\newcommand*{\tx@addNkern}[1]{% # 1 should be a single digit
-\def\tx@Nk{}%
-\ifcase#1\relax%
-\or %1 
-\def\tx@Nk{\kern-.01em}%
-\or % 2
-\def\tx@Nk{\kern.02em}% 2
-\or % 3
-\or % 4
-\def\tx@Nk{\kern-.01em}%
-\or % 5
-\or % 6
-\or % 7
-\def\tx@Nk{\kern-.08em}%
-\or % 8
-\or % 9
-\def\tx@Nk{\kern-.03em}%
-\fi%
-}
-\newcommand*{\tx@addDkern}[1]{% # 1 should be a single digit
-\def\tx@Dk{}%
-\ifcase#1\relax%
-\or%
-\def\tx@Dk{\kern.01em}% 1
-\or%
-\def\tx@Dk{\kern.02em}% 2
-\or % 3
-\or % 4
-\def\tx@Dk{\kern-.03em}%
-\or % 5
-\def\tx@Dk{\kern.03em}%
-\or % 6
-\or % 7
-\def\tx@Dk{\kern.05em}%
-\or % 8
-\or % 9
-\def\tx@Dk{\kern.04em}%
-\fi%
-}
-
-%\def\ETbb@foresolidus{-.03em}
-%\def\ETbb@aftsolidus{.02em}
-%\def\ETbb@raisefrac{.111em}
+\def\ETbb@foresolidus{-.03em}
+\def\ETbb@aftsolidus{.02em}
+\def\ETbb@raisefrac{.111em}
 \DeclareOptionX{foresolidus}{\gdef\ETbb@foresolidus{#1}}
 \DeclareOptionX{aftsolidus}{\gdef\ETbb@aftsolidus{#1}}
 \DeclareOptionX{raisefrac}{\gdef\ETbb@raisefrac{#1}}
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Dnom.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Dnom.fd
index 59a34e96726..462aa054235 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/05/14
+%% Generated by autoinst on 2020/06/17
 %%
 \ProvidesFile{LY1ETbb-Dnom.fd}
-    [2020/05/14 (autoinst)  Font definitions for LY1/ETbb-Dnom.]
+    [2020/06/17 (autoinst)  Font definitions for LY1/ETbb-Dnom.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{LY1}{ETbb-Dnom}{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-dnom-ly1
+\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-dnom-ly1
+\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{sl}{
-      <-> ssub * ETbb-Dnom/bold/it
+\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{sl}{
+      <-> ssub * ETbb-Dnom/regular/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-dnom-ly1
+\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-dnom-ly1
+\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{regular}{sl}{
-      <-> ssub * ETbb-Dnom/regular/it
+\DeclareFontShape{LY1}{ETbb-Dnom}{bold}{sl}{
+      <-> ssub * ETbb-Dnom/bold/it
 }{}
 
 %
@@ -55,14 +55,14 @@
 
 %   m --> regular
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{m}{n}{
-      <-> alias * ETbb-Dnom/regular/n
-}{}
-
 \DeclareFontShape{LY1}{ETbb-Dnom}{m}{it}{
       <-> alias * ETbb-Dnom/regular/it
 }{}
 
+\DeclareFontShape{LY1}{ETbb-Dnom}{m}{n}{
+      <-> alias * ETbb-Dnom/regular/n
+}{}
+
 \DeclareFontShape{LY1}{ETbb-Dnom}{m}{sl}{
       <-> alias * ETbb-Dnom/regular/sl
 }{}
@@ -70,26 +70,26 @@
 
 %   b --> bold
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{b}{it}{
-      <-> alias * ETbb-Dnom/bold/it
-}{}
-
 \DeclareFontShape{LY1}{ETbb-Dnom}{b}{sl}{
       <-> alias * ETbb-Dnom/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{b}{n}{
-      <-> alias * ETbb-Dnom/bold/n
+\DeclareFontShape{LY1}{ETbb-Dnom}{b}{it}{
+      <-> alias * ETbb-Dnom/bold/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Dnom}{bx}{it}{
-      <-> ssub * ETbb-Dnom/b/it
+\DeclareFontShape{LY1}{ETbb-Dnom}{b}{n}{
+      <-> alias * ETbb-Dnom/bold/n
 }{}
 
 \DeclareFontShape{LY1}{ETbb-Dnom}{bx}{sl}{
       <-> ssub * ETbb-Dnom/b/sl
 }{}
 
+\DeclareFontShape{LY1}{ETbb-Dnom}{bx}{it}{
+      <-> ssub * ETbb-Dnom/b/it
+}{}
+
 \DeclareFontShape{LY1}{ETbb-Dnom}{bx}{n}{
       <-> ssub * ETbb-Dnom/b/n
 }{}
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Inf.fd
index d6671e2fc51..fe4adcdb3bd 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/05/14
+%% Generated by autoinst on 2020/06/17
 %%
 \ProvidesFile{LY1ETbb-Inf.fd}
-    [2020/05/14 (autoinst)  Font definitions for LY1/ETbb-Inf.]
+    [2020/06/17 (autoinst)  Font definitions for LY1/ETbb-Inf.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{LY1}{ETbb-Inf}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{ETbb-Inf}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-inf-ly1
+\DeclareFontShape{LY1}{ETbb-Inf}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-inf-ly1
+\DeclareFontShape{LY1}{ETbb-Inf}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{regular}{sl}{
-      <-> ssub * ETbb-Inf/regular/it
+\DeclareFontShape{LY1}{ETbb-Inf}{bold}{sl}{
+      <-> ssub * ETbb-Inf/bold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{LY1}{ETbb-Inf}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-inf-ly1
+\DeclareFontShape{LY1}{ETbb-Inf}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-inf-ly1
+\DeclareFontShape{LY1}{ETbb-Inf}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{bold}{sl}{
-      <-> ssub * ETbb-Inf/bold/it
+\DeclareFontShape{LY1}{ETbb-Inf}{regular}{sl}{
+      <-> ssub * ETbb-Inf/regular/it
 }{}
 
 %
@@ -55,16 +55,16 @@
 
 %   m --> regular
 
-\DeclareFontShape{LY1}{ETbb-Inf}{m}{sl}{
-      <-> alias * ETbb-Inf/regular/sl
+\DeclareFontShape{LY1}{ETbb-Inf}{m}{n}{
+      <-> alias * ETbb-Inf/regular/n
 }{}
 
 \DeclareFontShape{LY1}{ETbb-Inf}{m}{it}{
       <-> alias * ETbb-Inf/regular/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Inf}{m}{n}{
-      <-> alias * ETbb-Inf/regular/n
+\DeclareFontShape{LY1}{ETbb-Inf}{m}{sl}{
+      <-> alias * ETbb-Inf/regular/sl
 }{}
 
 
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-LF.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-LF.fd
index cc953da870a..a770ff4953f 100644
--- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-LF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/14
+%% Generated by autoinst on 2020/06/17
 %%
 \ProvidesFile{LY1ETbb-LF.fd}
-    [2020/05/14 (autoinst)  Font definitions for LY1/ETbb-LF.]
+    [2020/06/17 (autoinst)  Font definitions for LY1/ETbb-LF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,6 +22,10 @@
 
 %   ----  bold  ----
 
+\DeclareFontShape{LY1}{ETbb-LF}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-lf-ly1
+}{}
+
 \DeclareFontShape{LY1}{ETbb-LF}{bold}{scit}{
       <-> \ETbb@@scale ETbb-BoldItalic-lf-sc-ly1
 }{}
@@ -30,67 +34,53 @@
       <-> \ETbb@@scale ETbb-Bold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{bold}{}{
-      <-0> \ETbb@@scale ETbb-Bold-lf-ly1
-      <0-> \ETbb@@scale ETbb-BoldItalic-lf-ly1
-}{}
-
 \DeclareFontShape{LY1}{ETbb-LF}{bold}{sc}{
       <-> \ETbb@@scale ETbb-Bold-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-lf-ly1
+\DeclareFontShape{LY1}{ETbb-LF}{bold}{scsl}{
+      <-> ssub * ETbb-LF/bold/scit
 }{}
 
 \DeclareFontShape{LY1}{ETbb-LF}{bold}{sl}{
       <-> ssub * ETbb-LF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{bold}{scsl}{
-      <-> ssub * ETbb-LF/bold/scit
-}{}
-
 
 %   ----  regular  ----
 
-\DeclareFontShape{LY1}{ETbb-LF}{regular}{}{
-      <-0> \ETbb@@scale ETbb-Italic-lf-ly1
-      <0-> \ETbb@@scale ETbb-Regular-lf-ly1
-}{}
-
 \DeclareFontShape{LY1}{ETbb-LF}{regular}{n}{
       <-> \ETbb@@scale ETbb-Regular-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb-Italic-lf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-LF}{regular}{sc}{
+      <-> \ETbb@@scale ETbb-Regular-lf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-LF}{regular}{it}{
       <-> \ETbb@@scale ETbb-Italic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb-Regular-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{ETbb-LF}{regular}{sl}{
-      <-> ssub * ETbb-LF/regular/it
+\DeclareFontShape{LY1}{ETbb-LF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb-Italic-lf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-LF}{regular}{scsl}{
       <-> ssub * ETbb-LF/regular/scit
 }{}
 
+\DeclareFontShape{LY1}{ETbb-LF}{regular}{sl}{
+      <-> ssub * ETbb-LF/regular/it
+}{}
+
 %
 %  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   m --> regular
 
-\DeclareFontShape{LY1}{ETbb-LF}{m}{}{
-      <-> alias * ETbb-LF/regular/
+\DeclareFontShape{LY1}{ETbb-LF}{m}{sl}{
+      <-> alias * ETbb-LF/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{ETbb-LF}{m}{scsl}{
@@ -101,37 +91,29 @@
       <-> alias * ETbb-LF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{m}{scit}{
-      <-> alias * ETbb-LF/regular/scit
+\DeclareFontShape{LY1}{ETbb-LF}{m}{sc}{
+      <-> alias * ETbb-LF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{ETbb-LF}{m}{it}{
       <-> alias * ETbb-LF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{m}{sc}{
-      <-> alias * ETbb-LF/regular/sc
-}{}
-
-\DeclareFontShape{LY1}{ETbb-LF}{m}{sl}{
-      <-> alias * ETbb-LF/regular/sl
+\DeclareFontShape{LY1}{ETbb-LF}{m}{scit}{
+      <-> alias * ETbb-LF/regular/scit
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{LY1}{ETbb-LF}{b}{}{
-      <-> alias * ETbb-LF/bold/
+\DeclareFontShape{LY1}{ETbb-LF}{b}{sl}{
+      <-> alias * ETbb-LF/bold/sl
 }{}
 
 \DeclareFontShape{LY1}{ETbb-LF}{b}{scsl}{
       <-> alias * ETbb-LF/bold/scsl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{b}{scit}{
-      <-> alias * ETbb-LF/bold/scit
-}{}
-
 \DeclareFontShape{LY1}{ETbb-LF}{b}{n}{
       <-> alias * ETbb-LF/bold/n
 }{}
@@ -140,40 +122,36 @@
       <-> alias * ETbb-LF/bold/sc
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{b}{sl}{
-      <-> alias * ETbb-LF/bold/sl
-}{}
-
 \DeclareFontShape{LY1}{ETbb-LF}{b}{it}{
       <-> alias * ETbb-LF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{bx}{sc}{
-      <-> ssub * ETbb-LF/b/sc
+\DeclareFontShape{LY1}{ETbb-LF}{b}{scit}{
+      <-> alias * ETbb-LF/bold/scit
 }{}
 
 \DeclareFontShape{LY1}{ETbb-LF}{bx}{sl}{
       <-> ssub * ETbb-LF/b/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{bx}{it}{
-      <-> ssub * ETbb-LF/b/it
+\DeclareFontShape{LY1}{ETbb-LF}{bx}{scsl}{
+      <-> ssub * ETbb-LF/b/scsl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{bx}{}{
-      <-> ssub * ETbb-LF/b/
+\DeclareFontShape{LY1}{ETbb-LF}{bx}{n}{
+      <-> ssub * ETbb-LF/b/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{bx}{scsl}{
-      <-> ssub * ETbb-LF/b/scsl
+\DeclareFontShape{LY1}{ETbb-LF}{bx}{sc}{
+      <-> ssub * ETbb-LF/b/sc
 }{}
 
 \DeclareFontShape{LY1}{ETbb-LF}{bx}{scit}{
       <-> ssub * ETbb-LF/b/scit
 }{}
 
-\DeclareFontShape{LY1}{ETbb-LF}{bx}{n}{
-      <-> ssub * ETbb-LF/b/n
+\DeclareFontShape{LY1}{ETbb-LF}{bx}{it}{
+      <-> ssub * ETbb-LF/b/it
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-OsF.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-OsF.fd
index 8692bfddfd1..57d2c03a699 100644
--- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-OsF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/14
+%% Generated by autoinst on 2020/06/17
 %%
 \ProvidesFile{LY1ETbb-OsF.fd}
-    [2020/05/14 (autoinst)  Font definitions for LY1/ETbb-OsF.]
+    [2020/06/17 (autoinst)  Font definitions for LY1/ETbb-OsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,154 +22,132 @@
 
 %   ----  regular  ----
 
-\DeclareFontShape{LY1}{ETbb-OsF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-osf-ly1
+\DeclareFontShape{LY1}{ETbb-OsF}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-osf-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-OsF}{regular}{scit}{
       <-> \ETbb@@scale ETbb-Italic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{regular}{}{
-      <-0> \ETbb@@scale ETbb-Italic-osf-ly1
-      <0-> \ETbb@@scale ETbb-Regular-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{ETbb-OsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-osf-ly1
-}{}
-
 \DeclareFontShape{LY1}{ETbb-OsF}{regular}{sc}{
       <-> \ETbb@@scale ETbb-Regular-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{regular}{sl}{
-      <-> ssub * ETbb-OsF/regular/it
+\DeclareFontShape{LY1}{ETbb-OsF}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-osf-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-OsF}{regular}{scsl}{
       <-> ssub * ETbb-OsF/regular/scit
 }{}
 
+\DeclareFontShape{LY1}{ETbb-OsF}{regular}{sl}{
+      <-> ssub * ETbb-OsF/regular/it
+}{}
+
 
 %   ----  bold  ----
 
-\DeclareFontShape{LY1}{ETbb-OsF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-osf-ly1
+\DeclareFontShape{LY1}{ETbb-OsF}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-osf-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-OsF}{bold}{sc}{
       <-> \ETbb@@scale ETbb-Bold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{bold}{}{
-      <-0> \ETbb@@scale ETbb-Bold-osf-ly1
-      <0-> \ETbb@@scale ETbb-BoldItalic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{ETbb-OsF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-osf-ly1
-}{}
-
 \DeclareFontShape{LY1}{ETbb-OsF}{bold}{scit}{
       <-> \ETbb@@scale ETbb-BoldItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{bold}{sl}{
-      <-> ssub * ETbb-OsF/bold/it
+\DeclareFontShape{LY1}{ETbb-OsF}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-osf-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-OsF}{bold}{scsl}{
       <-> ssub * ETbb-OsF/bold/scit
 }{}
 
+\DeclareFontShape{LY1}{ETbb-OsF}{bold}{sl}{
+      <-> ssub * ETbb-OsF/bold/it
+}{}
+
 %
 %  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   m --> regular
 
-\DeclareFontShape{LY1}{ETbb-OsF}{m}{scit}{
-      <-> alias * ETbb-OsF/regular/scit
+\DeclareFontShape{LY1}{ETbb-OsF}{m}{sc}{
+      <-> alias * ETbb-OsF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{ETbb-OsF}{m}{n}{
       <-> alias * ETbb-OsF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{m}{scsl}{
-      <-> alias * ETbb-OsF/regular/scsl
+\DeclareFontShape{LY1}{ETbb-OsF}{m}{it}{
+      <-> alias * ETbb-OsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{m}{}{
-      <-> alias * ETbb-OsF/regular/
+\DeclareFontShape{LY1}{ETbb-OsF}{m}{scit}{
+      <-> alias * ETbb-OsF/regular/scit
 }{}
 
 \DeclareFontShape{LY1}{ETbb-OsF}{m}{sl}{
       <-> alias * ETbb-OsF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{m}{sc}{
-      <-> alias * ETbb-OsF/regular/sc
-}{}
-
-\DeclareFontShape{LY1}{ETbb-OsF}{m}{it}{
-      <-> alias * ETbb-OsF/regular/it
+\DeclareFontShape{LY1}{ETbb-OsF}{m}{scsl}{
+      <-> alias * ETbb-OsF/regular/scsl
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{LY1}{ETbb-OsF}{b}{it}{
-      <-> alias * ETbb-OsF/bold/it
+\DeclareFontShape{LY1}{ETbb-OsF}{b}{scsl}{
+      <-> alias * ETbb-OsF/bold/scsl
 }{}
 
 \DeclareFontShape{LY1}{ETbb-OsF}{b}{sl}{
       <-> alias * ETbb-OsF/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{b}{sc}{
-      <-> alias * ETbb-OsF/bold/sc
-}{}
-
-\DeclareFontShape{LY1}{ETbb-OsF}{b}{}{
-      <-> alias * ETbb-OsF/bold/
+\DeclareFontShape{LY1}{ETbb-OsF}{b}{scit}{
+      <-> alias * ETbb-OsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{b}{scsl}{
-      <-> alias * ETbb-OsF/bold/scsl
+\DeclareFontShape{LY1}{ETbb-OsF}{b}{it}{
+      <-> alias * ETbb-OsF/bold/it
 }{}
 
 \DeclareFontShape{LY1}{ETbb-OsF}{b}{n}{
       <-> alias * ETbb-OsF/bold/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{b}{scit}{
-      <-> alias * ETbb-OsF/bold/scit
-}{}
-
-\DeclareFontShape{LY1}{ETbb-OsF}{bx}{n}{
-      <-> ssub * ETbb-OsF/b/n
-}{}
-
-\DeclareFontShape{LY1}{ETbb-OsF}{bx}{scit}{
-      <-> ssub * ETbb-OsF/b/scit
+\DeclareFontShape{LY1}{ETbb-OsF}{b}{sc}{
+      <-> alias * ETbb-OsF/bold/sc
 }{}
 
 \DeclareFontShape{LY1}{ETbb-OsF}{bx}{scsl}{
       <-> ssub * ETbb-OsF/b/scsl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{bx}{}{
-      <-> ssub * ETbb-OsF/b/
+\DeclareFontShape{LY1}{ETbb-OsF}{bx}{sl}{
+      <-> ssub * ETbb-OsF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{ETbb-OsF}{bx}{scit}{
+      <-> ssub * ETbb-OsF/b/scit
 }{}
 
 \DeclareFontShape{LY1}{ETbb-OsF}{bx}{it}{
       <-> ssub * ETbb-OsF/b/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-OsF}{bx}{sl}{
-      <-> ssub * ETbb-OsF/b/sl
+\DeclareFontShape{LY1}{ETbb-OsF}{bx}{n}{
+      <-> ssub * ETbb-OsF/b/n
 }{}
 
 \DeclareFontShape{LY1}{ETbb-OsF}{bx}{sc}{
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-Sup.fd
index c8adfdbb344..350f84e969a 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/05/14
+%% Generated by autoinst on 2020/06/17
 %%
 \ProvidesFile{LY1ETbb-Sup.fd}
-    [2020/05/14 (autoinst)  Font definitions for LY1/ETbb-Sup.]
+    [2020/06/17 (autoinst)  Font definitions for LY1/ETbb-Sup.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -37,14 +37,14 @@
 
 %   ----  regular  ----
 
-\DeclareFontShape{LY1}{ETbb-Sup}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-sup-ly1
-}{}
-
 \DeclareFontShape{LY1}{ETbb-Sup}{regular}{it}{
       <-> \ETbb@@scale ETbb-Italic-sup-ly1
 }{}
 
+\DeclareFontShape{LY1}{ETbb-Sup}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-sup-ly1
+}{}
+
 \DeclareFontShape{LY1}{ETbb-Sup}{regular}{sl}{
       <-> ssub * ETbb-Sup/regular/it
 }{}
@@ -70,28 +70,28 @@
 
 %   b --> bold
 
-\DeclareFontShape{LY1}{ETbb-Sup}{b}{sl}{
-      <-> alias * ETbb-Sup/bold/sl
+\DeclareFontShape{LY1}{ETbb-Sup}{b}{n}{
+      <-> alias * ETbb-Sup/bold/n
 }{}
 
 \DeclareFontShape{LY1}{ETbb-Sup}{b}{it}{
       <-> alias * ETbb-Sup/bold/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Sup}{b}{n}{
-      <-> alias * ETbb-Sup/bold/n
+\DeclareFontShape{LY1}{ETbb-Sup}{b}{sl}{
+      <-> alias * ETbb-Sup/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Sup}{bx}{sl}{
-      <-> ssub * ETbb-Sup/b/sl
+\DeclareFontShape{LY1}{ETbb-Sup}{bx}{n}{
+      <-> ssub * ETbb-Sup/b/n
 }{}
 
 \DeclareFontShape{LY1}{ETbb-Sup}{bx}{it}{
       <-> ssub * ETbb-Sup/b/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-Sup}{bx}{n}{
-      <-> ssub * ETbb-Sup/b/n
+\DeclareFontShape{LY1}{ETbb-Sup}{bx}{sl}{
+      <-> ssub * ETbb-Sup/b/sl
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TLF.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TLF.fd
index a0a8068de98..17597335044 100644
--- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TLF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/14
+%% Generated by autoinst on 2020/06/17
 %%
 \ProvidesFile{LY1ETbb-TLF.fd}
-    [2020/05/14 (autoinst)  Font definitions for LY1/ETbb-TLF.]
+    [2020/06/17 (autoinst)  Font definitions for LY1/ETbb-TLF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,158 +22,136 @@
 
 %   ----  regular  ----
 
-\DeclareFontShape{LY1}{ETbb-TLF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb-Regular-tlf-sc-ly1
-}{}
-
 \DeclareFontShape{LY1}{ETbb-TLF}{regular}{it}{
       <-> \ETbb@@scale ETbb-Italic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{regular}{}{
-      <-0> \ETbb@@scale ETbb-Italic-tlf-ly1
-      <0-> \ETbb@@scale ETbb-Regular-tlf-ly1
-}{}
-
 \DeclareFontShape{LY1}{ETbb-TLF}{regular}{scit}{
       <-> \ETbb@@scale ETbb-Italic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-tlf-ly1
+\DeclareFontShape{LY1}{ETbb-TLF}{regular}{sc}{
+      <-> \ETbb@@scale ETbb-Regular-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{regular}{sl}{
-      <-> ssub * ETbb-TLF/regular/it
+\DeclareFontShape{LY1}{ETbb-TLF}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-tlf-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TLF}{regular}{scsl}{
       <-> ssub * ETbb-TLF/regular/scit
 }{}
 
+\DeclareFontShape{LY1}{ETbb-TLF}{regular}{sl}{
+      <-> ssub * ETbb-TLF/regular/it
+}{}
 
-%   ----  bold  ----
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tlf-sc-ly1
-}{}
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-tlf-ly1
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bold}{}{
-      <-0> \ETbb@@scale ETbb-Bold-tlf-ly1
-      <0-> \ETbb@@scale ETbb-BoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tlf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TLF}{bold}{sc}{
       <-> \ETbb@@scale ETbb-Bold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{ETbb-TLF}{bold}{sl}{
-      <-> ssub * ETbb-TLF/bold/it
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-tlf-ly1
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TLF}{bold}{scsl}{
       <-> ssub * ETbb-TLF/bold/scit
 }{}
 
+\DeclareFontShape{LY1}{ETbb-TLF}{bold}{sl}{
+      <-> ssub * ETbb-TLF/bold/it
+}{}
+
 %
 %  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   m --> regular
 
-\DeclareFontShape{LY1}{ETbb-TLF}{m}{}{
-      <-> alias * ETbb-TLF/regular/
+\DeclareFontShape{LY1}{ETbb-TLF}{m}{sl}{
+      <-> alias * ETbb-TLF/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TLF}{m}{scsl}{
       <-> alias * ETbb-TLF/regular/scsl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{m}{n}{
-      <-> alias * ETbb-TLF/regular/n
+\DeclareFontShape{LY1}{ETbb-TLF}{m}{sc}{
+      <-> alias * ETbb-TLF/regular/sc
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{m}{scit}{
-      <-> alias * ETbb-TLF/regular/scit
+\DeclareFontShape{LY1}{ETbb-TLF}{m}{n}{
+      <-> alias * ETbb-TLF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TLF}{m}{it}{
       <-> alias * ETbb-TLF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{m}{sl}{
-      <-> alias * ETbb-TLF/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{ETbb-TLF}{m}{sc}{
-      <-> alias * ETbb-TLF/regular/sc
+\DeclareFontShape{LY1}{ETbb-TLF}{m}{scit}{
+      <-> alias * ETbb-TLF/regular/scit
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{LY1}{ETbb-TLF}{b}{n}{
-      <-> alias * ETbb-TLF/bold/n
-}{}
-
-\DeclareFontShape{LY1}{ETbb-TLF}{b}{scit}{
-      <-> alias * ETbb-TLF/bold/scit
-}{}
-
 \DeclareFontShape{LY1}{ETbb-TLF}{b}{scsl}{
       <-> alias * ETbb-TLF/bold/scsl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{b}{}{
-      <-> alias * ETbb-TLF/bold/
+\DeclareFontShape{LY1}{ETbb-TLF}{b}{sl}{
+      <-> alias * ETbb-TLF/bold/sl
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TLF}{b}{it}{
       <-> alias * ETbb-TLF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{b}{sl}{
-      <-> alias * ETbb-TLF/bold/sl
+\DeclareFontShape{LY1}{ETbb-TLF}{b}{scit}{
+      <-> alias * ETbb-TLF/bold/scit
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TLF}{b}{sc}{
       <-> alias * ETbb-TLF/bold/sc
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bx}{sc}{
-      <-> ssub * ETbb-TLF/b/sc
+\DeclareFontShape{LY1}{ETbb-TLF}{b}{n}{
+      <-> alias * ETbb-TLF/bold/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bx}{sl}{
-      <-> ssub * ETbb-TLF/b/sl
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{n}{
+      <-> ssub * ETbb-TLF/b/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bx}{it}{
-      <-> ssub * ETbb-TLF/b/it
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{sc}{
+      <-> ssub * ETbb-TLF/b/sc
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bx}{scsl}{
-      <-> ssub * ETbb-TLF/b/scsl
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{scit}{
+      <-> ssub * ETbb-TLF/b/scit
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bx}{}{
-      <-> ssub * ETbb-TLF/b/
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{it}{
+      <-> ssub * ETbb-TLF/b/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bx}{scit}{
-      <-> ssub * ETbb-TLF/b/scit
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{sl}{
+      <-> ssub * ETbb-TLF/b/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TLF}{bx}{n}{
-      <-> ssub * ETbb-TLF/b/n
+\DeclareFontShape{LY1}{ETbb-TLF}{bx}{scsl}{
+      <-> ssub * ETbb-TLF/b/scsl
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TOsF.fd b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TOsF.fd
index d1d8b5b3ec4..3148df82039 100644
--- a/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/LY1ETbb-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/14
+%% Generated by autoinst on 2020/06/17
 %%
 \ProvidesFile{LY1ETbb-TOsF.fd}
-    [2020/05/14 (autoinst)  Font definitions for LY1/ETbb-TOsF.]
+    [2020/06/17 (autoinst)  Font definitions for LY1/ETbb-TOsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,67 +20,57 @@
 \DeclareFontFamily{LY1}{ETbb-TOsF}{}
 
 
-%   ----  regular  ----
-
-\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-tosf-ly1
-}{}
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb-Regular-tosf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{sc}{
+      <-> \ETbb@@scale ETbb-Bold-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-tosf-ly1
+\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb-Italic-tosf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{}{
-      <-0> \ETbb@@scale ETbb-Italic-tosf-ly1
-      <0-> \ETbb@@scale ETbb-Regular-tosf-ly1
+\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{sl}{
-      <-> ssub * ETbb-TOsF/regular/it
+\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{scsl}{
+      <-> ssub * ETbb-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{scsl}{
-      <-> ssub * ETbb-TOsF/regular/scit
+\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{sl}{
+      <-> ssub * ETbb-TOsF/bold/it
 }{}
 
 
-%   ----  bold  ----
-
-\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tosf-sc-ly1
-}{}
+%   ----  regular  ----
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-tosf-ly1
+\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{}{
-      <-0> \ETbb@@scale ETbb-Bold-tosf-ly1
-      <0-> \ETbb@@scale ETbb-BoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{sc}{
+      <-> \ETbb@@scale ETbb-Regular-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{sc}{
-      <-> \ETbb@@scale ETbb-Bold-tosf-sc-ly1
+\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb-Italic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{sl}{
-      <-> ssub * ETbb-TOsF/bold/it
+\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{scsl}{
+      <-> ssub * ETbb-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{bold}{scsl}{
-      <-> ssub * ETbb-TOsF/bold/scit
+\DeclareFontShape{LY1}{ETbb-TOsF}{regular}{sl}{
+      <-> ssub * ETbb-TOsF/regular/it
 }{}
 
 %
@@ -89,91 +79,79 @@
 
 %   m --> regular
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{m}{it}{
-      <-> alias * ETbb-TOsF/regular/it
-}{}
-
 \DeclareFontShape{LY1}{ETbb-TOsF}{m}{sl}{
       <-> alias * ETbb-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{m}{sc}{
-      <-> alias * ETbb-TOsF/regular/sc
+\DeclareFontShape{LY1}{ETbb-TOsF}{m}{scsl}{
+      <-> alias * ETbb-TOsF/regular/scsl
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TOsF}{m}{n}{
       <-> alias * ETbb-TOsF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{m}{scit}{
-      <-> alias * ETbb-TOsF/regular/scit
+\DeclareFontShape{LY1}{ETbb-TOsF}{m}{sc}{
+      <-> alias * ETbb-TOsF/regular/sc
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{m}{scsl}{
-      <-> alias * ETbb-TOsF/regular/scsl
+\DeclareFontShape{LY1}{ETbb-TOsF}{m}{scit}{
+      <-> alias * ETbb-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{m}{}{
-      <-> alias * ETbb-TOsF/regular/
+\DeclareFontShape{LY1}{ETbb-TOsF}{m}{it}{
+      <-> alias * ETbb-TOsF/regular/it
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{b}{sl}{
-      <-> alias * ETbb-TOsF/bold/sl
-}{}
-
 \DeclareFontShape{LY1}{ETbb-TOsF}{b}{sc}{
       <-> alias * ETbb-TOsF/bold/sc
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{b}{it}{
-      <-> alias * ETbb-TOsF/bold/it
-}{}
-
-\DeclareFontShape{LY1}{ETbb-TOsF}{b}{}{
-      <-> alias * ETbb-TOsF/bold/
-}{}
-
-\DeclareFontShape{LY1}{ETbb-TOsF}{b}{scsl}{
-      <-> alias * ETbb-TOsF/bold/scsl
+\DeclareFontShape{LY1}{ETbb-TOsF}{b}{n}{
+      <-> alias * ETbb-TOsF/bold/n
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TOsF}{b}{scit}{
       <-> alias * ETbb-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{b}{n}{
-      <-> alias * ETbb-TOsF/bold/n
+\DeclareFontShape{LY1}{ETbb-TOsF}{b}{it}{
+      <-> alias * ETbb-TOsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{sc}{
-      <-> ssub * ETbb-TOsF/b/sc
+\DeclareFontShape{LY1}{ETbb-TOsF}{b}{sl}{
+      <-> alias * ETbb-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{ETbb-TOsF}{b}{scsl}{
+      <-> alias * ETbb-TOsF/bold/scsl
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TOsF}{bx}{sl}{
       <-> ssub * ETbb-TOsF/b/sl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{it}{
-      <-> ssub * ETbb-TOsF/b/it
+\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{scsl}{
+      <-> ssub * ETbb-TOsF/b/scsl
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{scit}{
-      <-> ssub * ETbb-TOsF/b/scit
+\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{sc}{
+      <-> ssub * ETbb-TOsF/b/sc
 }{}
 
 \DeclareFontShape{LY1}{ETbb-TOsF}{bx}{n}{
       <-> ssub * ETbb-TOsF/b/n
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{scsl}{
-      <-> ssub * ETbb-TOsF/b/scsl
+\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{scit}{
+      <-> ssub * ETbb-TOsF/b/scit
 }{}
 
-\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{}{
-      <-> ssub * ETbb-TOsF/b/
+\DeclareFontShape{LY1}{ETbb-TOsF}{bx}{it}{
+      <-> ssub * ETbb-TOsF/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 add9c091089..5b9b001017a 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/05/14
+%% Generated by autoinst on 2020/06/17
 %%
 \ProvidesFile{OT1ETbb-Dnom.fd}
-    [2020/05/14 (autoinst)  Font definitions for OT1/ETbb-Dnom.]
+    [2020/06/17 (autoinst)  Font definitions for OT1/ETbb-Dnom.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,14 @@
 
 %   ----  bold  ----
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-dnom-ot1
-}{}
-
 \DeclareFontShape{OT1}{ETbb-Dnom}{bold}{n}{
       <-> \ETbb@@scale ETbb-Bold-dnom-ot1
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Dnom}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-dnom-ot1
+}{}
+
 \DeclareFontShape{OT1}{ETbb-Dnom}{bold}{sl}{
       <-> ssub * ETbb-Dnom/bold/it
 }{}
@@ -37,14 +37,14 @@
 
 %   ----  regular  ----
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-dnom-ot1
-}{}
-
 \DeclareFontShape{OT1}{ETbb-Dnom}{regular}{it}{
       <-> \ETbb@@scale ETbb-Italic-dnom-ot1
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Dnom}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-dnom-ot1
+}{}
+
 \DeclareFontShape{OT1}{ETbb-Dnom}{regular}{sl}{
       <-> ssub * ETbb-Dnom/regular/it
 }{}
@@ -55,6 +55,10 @@
 
 %   m --> regular
 
+\DeclareFontShape{OT1}{ETbb-Dnom}{m}{it}{
+      <-> alias * ETbb-Dnom/regular/it
+}{}
+
 \DeclareFontShape{OT1}{ETbb-Dnom}{m}{n}{
       <-> alias * ETbb-Dnom/regular/n
 }{}
@@ -63,27 +67,19 @@
       <-> alias * ETbb-Dnom/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{m}{it}{
-      <-> alias * ETbb-Dnom/regular/it
-}{}
-
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{b}{sl}{
-      <-> alias * ETbb-Dnom/bold/sl
+\DeclareFontShape{OT1}{ETbb-Dnom}{b}{n}{
+      <-> alias * ETbb-Dnom/bold/n
 }{}
 
 \DeclareFontShape{OT1}{ETbb-Dnom}{b}{it}{
       <-> alias * ETbb-Dnom/bold/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Dnom}{b}{n}{
-      <-> alias * ETbb-Dnom/bold/n
-}{}
-
-\DeclareFontShape{OT1}{ETbb-Dnom}{bx}{n}{
-      <-> ssub * ETbb-Dnom/b/n
+\DeclareFontShape{OT1}{ETbb-Dnom}{b}{sl}{
+      <-> alias * ETbb-Dnom/bold/sl
 }{}
 
 \DeclareFontShape{OT1}{ETbb-Dnom}{bx}{sl}{
@@ -94,4 +90,8 @@
       <-> ssub * ETbb-Dnom/b/it
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Dnom}{bx}{n}{
+      <-> ssub * ETbb-Dnom/b/n
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Inf.fd
index 27aab4ece92..6a95c35a725 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/05/14
+%% Generated by autoinst on 2020/06/17
 %%
 \ProvidesFile{OT1ETbb-Inf.fd}
-    [2020/05/14 (autoinst)  Font definitions for OT1/ETbb-Inf.]
+    [2020/06/17 (autoinst)  Font definitions for OT1/ETbb-Inf.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{OT1}{ETbb-Inf}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{ETbb-Inf}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-inf-ot1
+\DeclareFontShape{OT1}{ETbb-Inf}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-inf-ot1
+\DeclareFontShape{OT1}{ETbb-Inf}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{regular}{sl}{
-      <-> ssub * ETbb-Inf/regular/it
+\DeclareFontShape{OT1}{ETbb-Inf}{bold}{sl}{
+      <-> ssub * ETbb-Inf/bold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{ETbb-Inf}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-inf-ot1
+\DeclareFontShape{OT1}{ETbb-Inf}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-inf-ot1
+\DeclareFontShape{OT1}{ETbb-Inf}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{bold}{sl}{
-      <-> ssub * ETbb-Inf/bold/it
+\DeclareFontShape{OT1}{ETbb-Inf}{regular}{sl}{
+      <-> ssub * ETbb-Inf/regular/it
 }{}
 
 %
@@ -55,10 +55,6 @@
 
 %   m --> regular
 
-\DeclareFontShape{OT1}{ETbb-Inf}{m}{n}{
-      <-> alias * ETbb-Inf/regular/n
-}{}
-
 \DeclareFontShape{OT1}{ETbb-Inf}{m}{sl}{
       <-> alias * ETbb-Inf/regular/sl
 }{}
@@ -67,6 +63,10 @@
       <-> alias * ETbb-Inf/regular/it
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Inf}{m}{n}{
+      <-> alias * ETbb-Inf/regular/n
+}{}
+
 
 %   b --> bold
 
@@ -86,12 +86,12 @@
       <-> ssub * ETbb-Inf/b/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Inf}{bx}{sl}{
-      <-> ssub * ETbb-Inf/b/sl
-}{}
-
 \DeclareFontShape{OT1}{ETbb-Inf}{bx}{it}{
       <-> ssub * ETbb-Inf/b/it
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Inf}{bx}{sl}{
+      <-> ssub * ETbb-Inf/b/sl
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-LF.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-LF.fd
index 72514bd1be1..e2ea1709c82 100644
--- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-LF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/14
+%% Generated by autoinst on 2020/06/17
 %%
 \ProvidesFile{OT1ETbb-LF.fd}
-    [2020/05/14 (autoinst)  Font definitions for OT1/ETbb-LF.]
+    [2020/06/17 (autoinst)  Font definitions for OT1/ETbb-LF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,67 +20,57 @@
 \DeclareFontFamily{OT1}{ETbb-LF}{}
 
 
-%   ----  regular  ----
-
-\DeclareFontShape{OT1}{ETbb-LF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-lf-ot1
-}{}
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{ETbb-LF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb-Regular-lf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{regular}{}{
-      <-0> \ETbb@@scale ETbb-Italic-lf-ot1
-      <0-> \ETbb@@scale ETbb-Regular-lf-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{bold}{sc}{
+      <-> \ETbb@@scale ETbb-Bold-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-lf-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb-Italic-lf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb-BoldItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{regular}{sl}{
-      <-> ssub * ETbb-LF/regular/it
+\DeclareFontShape{OT1}{ETbb-LF}{bold}{scsl}{
+      <-> ssub * ETbb-LF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{regular}{scsl}{
-      <-> ssub * ETbb-LF/regular/scit
+\DeclareFontShape{OT1}{ETbb-LF}{bold}{sl}{
+      <-> ssub * ETbb-LF/bold/it
 }{}
 
 
-%   ----  bold  ----
-
-\DeclareFontShape{OT1}{ETbb-LF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-lf-ot1
-}{}
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{ETbb-LF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb-BoldItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{bold}{}{
-      <-0> \ETbb@@scale ETbb-Bold-lf-ot1
-      <0-> \ETbb@@scale ETbb-BoldItalic-lf-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb-Italic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-lf-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{bold}{sc}{
-      <-> \ETbb@@scale ETbb-Bold-lf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{sc}{
+      <-> \ETbb@@scale ETbb-Regular-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{bold}{sl}{
-      <-> ssub * ETbb-LF/bold/it
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{scsl}{
+      <-> ssub * ETbb-LF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{bold}{scsl}{
-      <-> ssub * ETbb-LF/bold/scit
+\DeclareFontShape{OT1}{ETbb-LF}{regular}{sl}{
+      <-> ssub * ETbb-LF/regular/it
 }{}
 
 %
@@ -93,28 +83,24 @@
       <-> alias * ETbb-LF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{m}{sc}{
-      <-> alias * ETbb-LF/regular/sc
-}{}
-
-\DeclareFontShape{OT1}{ETbb-LF}{m}{sl}{
-      <-> alias * ETbb-LF/regular/sl
+\DeclareFontShape{OT1}{ETbb-LF}{m}{scit}{
+      <-> alias * ETbb-LF/regular/scit
 }{}
 
 \DeclareFontShape{OT1}{ETbb-LF}{m}{n}{
       <-> alias * ETbb-LF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{m}{scit}{
-      <-> alias * ETbb-LF/regular/scit
+\DeclareFontShape{OT1}{ETbb-LF}{m}{sc}{
+      <-> alias * ETbb-LF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{ETbb-LF}{m}{scsl}{
       <-> alias * ETbb-LF/regular/scsl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{m}{}{
-      <-> alias * ETbb-LF/regular/
+\DeclareFontShape{OT1}{ETbb-LF}{m}{sl}{
+      <-> alias * ETbb-LF/regular/sl
 }{}
 
 
@@ -124,56 +110,48 @@
       <-> alias * ETbb-LF/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{b}{sc}{
-      <-> alias * ETbb-LF/bold/sc
+\DeclareFontShape{OT1}{ETbb-LF}{b}{scsl}{
+      <-> alias * ETbb-LF/bold/scsl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{b}{it}{
-      <-> alias * ETbb-LF/bold/it
+\DeclareFontShape{OT1}{ETbb-LF}{b}{n}{
+      <-> alias * ETbb-LF/bold/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{b}{}{
-      <-> alias * ETbb-LF/bold/
+\DeclareFontShape{OT1}{ETbb-LF}{b}{sc}{
+      <-> alias * ETbb-LF/bold/sc
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{b}{scsl}{
-      <-> alias * ETbb-LF/bold/scsl
+\DeclareFontShape{OT1}{ETbb-LF}{b}{it}{
+      <-> alias * ETbb-LF/bold/it
 }{}
 
 \DeclareFontShape{OT1}{ETbb-LF}{b}{scit}{
       <-> alias * ETbb-LF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{b}{n}{
-      <-> alias * ETbb-LF/bold/n
-}{}
-
 \DeclareFontShape{OT1}{ETbb-LF}{bx}{it}{
       <-> ssub * ETbb-LF/b/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{bx}{sc}{
-      <-> ssub * ETbb-LF/b/sc
+\DeclareFontShape{OT1}{ETbb-LF}{bx}{scit}{
+      <-> ssub * ETbb-LF/b/scit
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{bx}{sl}{
-      <-> ssub * ETbb-LF/b/sl
+\DeclareFontShape{OT1}{ETbb-LF}{bx}{sc}{
+      <-> ssub * ETbb-LF/b/sc
 }{}
 
 \DeclareFontShape{OT1}{ETbb-LF}{bx}{n}{
       <-> ssub * ETbb-LF/b/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-LF}{bx}{scit}{
-      <-> ssub * ETbb-LF/b/scit
-}{}
-
-\DeclareFontShape{OT1}{ETbb-LF}{bx}{}{
-      <-> ssub * ETbb-LF/b/
-}{}
-
 \DeclareFontShape{OT1}{ETbb-LF}{bx}{scsl}{
       <-> ssub * ETbb-LF/b/scsl
 }{}
 
+\DeclareFontShape{OT1}{ETbb-LF}{bx}{sl}{
+      <-> ssub * ETbb-LF/b/sl
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-OsF.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-OsF.fd
index 35c9ffcd90a..80b3e42dca2 100644
--- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-OsF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/14
+%% Generated by autoinst on 2020/06/17
 %%
 \ProvidesFile{OT1ETbb-OsF.fd}
-    [2020/05/14 (autoinst)  Font definitions for OT1/ETbb-OsF.]
+    [2020/06/17 (autoinst)  Font definitions for OT1/ETbb-OsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,6 +22,10 @@
 
 %   ----  bold  ----
 
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-osf-ot1
+}{}
+
 \DeclareFontShape{OT1}{ETbb-OsF}{bold}{sc}{
       <-> \ETbb@@scale ETbb-Bold-osf-sc-ot1
 }{}
@@ -30,34 +34,21 @@
       <-> \ETbb@@scale ETbb-BoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{bold}{}{
-      <-0> \ETbb@@scale ETbb-Bold-osf-ot1
-      <0-> \ETbb@@scale ETbb-BoldItalic-osf-ot1
-}{}
-
 \DeclareFontShape{OT1}{ETbb-OsF}{bold}{scit}{
       <-> \ETbb@@scale ETbb-BoldItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-osf-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{bold}{scsl}{
+      <-> ssub * ETbb-OsF/bold/scit
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{bold}{sl}{
       <-> ssub * ETbb-OsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{bold}{scsl}{
-      <-> ssub * ETbb-OsF/bold/scit
-}{}
-
 
 %   ----  regular  ----
 
-\DeclareFontShape{OT1}{ETbb-OsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-osf-ot1
-}{}
-
 \DeclareFontShape{OT1}{ETbb-OsF}{regular}{sc}{
       <-> \ETbb@@scale ETbb-Regular-osf-sc-ot1
 }{}
@@ -66,96 +57,87 @@
       <-> \ETbb@@scale ETbb-Regular-osf-ot1
 }{}
 
+\DeclareFontShape{OT1}{ETbb-OsF}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-osf-ot1
+}{}
+
 \DeclareFontShape{OT1}{ETbb-OsF}{regular}{scit}{
       <-> \ETbb@@scale ETbb-Italic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{regular}{}{
-      <-0> \ETbb@@scale ETbb-Italic-osf-ot1
-      <0-> \ETbb@@scale ETbb-Regular-osf-ot1
+\DeclareFontShape{OT1}{ETbb-OsF}{regular}{scsl}{
+      <-> ssub * ETbb-OsF/regular/scit
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{regular}{sl}{
       <-> ssub * ETbb-OsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{regular}{scsl}{
-      <-> ssub * ETbb-OsF/regular/scit
-}{}
-
 %
 %  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   m --> regular
 
-\DeclareFontShape{OT1}{ETbb-OsF}{m}{sc}{
-      <-> alias * ETbb-OsF/regular/sc
-}{}
-
 \DeclareFontShape{OT1}{ETbb-OsF}{m}{sl}{
       <-> alias * ETbb-OsF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{m}{it}{
-      <-> alias * ETbb-OsF/regular/it
+\DeclareFontShape{OT1}{ETbb-OsF}{m}{scsl}{
+      <-> alias * ETbb-OsF/regular/scsl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{m}{scit}{
-      <-> alias * ETbb-OsF/regular/scit
+\DeclareFontShape{OT1}{ETbb-OsF}{m}{sc}{
+      <-> alias * ETbb-OsF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{m}{n}{
       <-> alias * ETbb-OsF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{m}{scsl}{
-      <-> alias * ETbb-OsF/regular/scsl
+\DeclareFontShape{OT1}{ETbb-OsF}{m}{it}{
+      <-> alias * ETbb-OsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{m}{}{
-      <-> alias * ETbb-OsF/regular/
+\DeclareFontShape{OT1}{ETbb-OsF}{m}{scit}{
+      <-> alias * ETbb-OsF/regular/scit
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{sc}{
-      <-> alias * ETbb-OsF/bold/sc
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{n}{
+      <-> alias * ETbb-OsF/bold/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{sl}{
-      <-> alias * ETbb-OsF/bold/sl
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{sc}{
+      <-> alias * ETbb-OsF/bold/sc
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{b}{it}{
       <-> alias * ETbb-OsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{}{
-      <-> alias * ETbb-OsF/bold/
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{scit}{
+      <-> alias * ETbb-OsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{scsl}{
-      <-> alias * ETbb-OsF/bold/scsl
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{sl}{
+      <-> alias * ETbb-OsF/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{scit}{
-      <-> alias * ETbb-OsF/bold/scit
+\DeclareFontShape{OT1}{ETbb-OsF}{b}{scsl}{
+      <-> alias * ETbb-OsF/bold/scsl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{b}{n}{
-      <-> alias * ETbb-OsF/bold/n
+\DeclareFontShape{OT1}{ETbb-OsF}{bx}{scsl}{
+      <-> ssub * ETbb-OsF/b/scsl
 }{}
 
 \DeclareFontShape{OT1}{ETbb-OsF}{bx}{sl}{
       <-> ssub * ETbb-OsF/b/sl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{bx}{sc}{
-      <-> ssub * ETbb-OsF/b/sc
-}{}
-
 \DeclareFontShape{OT1}{ETbb-OsF}{bx}{it}{
       <-> ssub * ETbb-OsF/b/it
 }{}
@@ -164,16 +146,12 @@
       <-> ssub * ETbb-OsF/b/scit
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{bx}{n}{
-      <-> ssub * ETbb-OsF/b/n
-}{}
-
-\DeclareFontShape{OT1}{ETbb-OsF}{bx}{scsl}{
-      <-> ssub * ETbb-OsF/b/scsl
+\DeclareFontShape{OT1}{ETbb-OsF}{bx}{sc}{
+      <-> ssub * ETbb-OsF/b/sc
 }{}
 
-\DeclareFontShape{OT1}{ETbb-OsF}{bx}{}{
-      <-> ssub * ETbb-OsF/b/
+\DeclareFontShape{OT1}{ETbb-OsF}{bx}{n}{
+      <-> ssub * ETbb-OsF/b/n
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-Sup.fd
index a82c1d5567d..5ed909160c1 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/05/14
+%% Generated by autoinst on 2020/06/17
 %%
 \ProvidesFile{OT1ETbb-Sup.fd}
-    [2020/05/14 (autoinst)  Font definitions for OT1/ETbb-Sup.]
+    [2020/06/17 (autoinst)  Font definitions for OT1/ETbb-Sup.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,14 @@
 
 %   ----  regular  ----
 
-\DeclareFontShape{OT1}{ETbb-Sup}{regular}{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}{
+      <-> \ETbb@@scale ETbb-Italic-sup-ot1
+}{}
+
 \DeclareFontShape{OT1}{ETbb-Sup}{regular}{sl}{
       <-> ssub * ETbb-Sup/regular/it
 }{}
@@ -55,10 +55,6 @@
 
 %   m --> regular
 
-\DeclareFontShape{OT1}{ETbb-Sup}{m}{n}{
-      <-> alias * ETbb-Sup/regular/n
-}{}
-
 \DeclareFontShape{OT1}{ETbb-Sup}{m}{sl}{
       <-> alias * ETbb-Sup/regular/sl
 }{}
@@ -67,13 +63,13 @@
       <-> alias * ETbb-Sup/regular/it
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Sup}{m}{n}{
+      <-> alias * ETbb-Sup/regular/n
+}{}
+
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{ETbb-Sup}{b}{it}{
-      <-> alias * ETbb-Sup/bold/it
-}{}
-
 \DeclareFontShape{OT1}{ETbb-Sup}{b}{sl}{
       <-> alias * ETbb-Sup/bold/sl
 }{}
@@ -82,14 +78,18 @@
       <-> alias * ETbb-Sup/bold/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-Sup}{bx}{n}{
-      <-> ssub * ETbb-Sup/b/n
+\DeclareFontShape{OT1}{ETbb-Sup}{b}{it}{
+      <-> alias * ETbb-Sup/bold/it
 }{}
 
 \DeclareFontShape{OT1}{ETbb-Sup}{bx}{sl}{
       <-> ssub * ETbb-Sup/b/sl
 }{}
 
+\DeclareFontShape{OT1}{ETbb-Sup}{bx}{n}{
+      <-> ssub * ETbb-Sup/b/n
+}{}
+
 \DeclareFontShape{OT1}{ETbb-Sup}{bx}{it}{
       <-> ssub * ETbb-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TLF.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TLF.fd
index a0b451c08a6..a4b6d8384a9 100644
--- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TLF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/14
+%% Generated by autoinst on 2020/06/17
 %%
 \ProvidesFile{OT1ETbb-TLF.fd}
-    [2020/05/14 (autoinst)  Font definitions for OT1/ETbb-TLF.]
+    [2020/06/17 (autoinst)  Font definitions for OT1/ETbb-TLF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,67 +20,57 @@
 \DeclareFontFamily{OT1}{ETbb-TLF}{}
 
 
-%   ----  bold  ----
-
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{}{
-      <-0> \ETbb@@scale ETbb-Bold-tlf-ot1
-      <0-> \ETbb@@scale ETbb-BoldItalic-tlf-ot1
-}{}
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-tlf-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{sc}{
+      <-> \ETbb@@scale ETbb-Regular-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{sc}{
-      <-> \ETbb@@scale ETbb-Bold-tlf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb-Italic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{sl}{
-      <-> ssub * ETbb-TLF/bold/it
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{scsl}{
+      <-> ssub * ETbb-TLF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bold}{scsl}{
-      <-> ssub * ETbb-TLF/bold/scit
+\DeclareFontShape{OT1}{ETbb-TLF}{regular}{sl}{
+      <-> ssub * ETbb-TLF/regular/it
 }{}
 
 
-%   ----  regular  ----
-
-\DeclareFontShape{OT1}{ETbb-TLF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-tlf-ot1
-}{}
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{ETbb-TLF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb-Regular-tlf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{regular}{}{
-      <-0> \ETbb@@scale ETbb-Italic-tlf-ot1
-      <0-> \ETbb@@scale ETbb-Regular-tlf-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{sc}{
+      <-> \ETbb@@scale ETbb-Bold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-tlf-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb-Italic-tlf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{regular}{sl}{
-      <-> ssub * ETbb-TLF/regular/it
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{scsl}{
+      <-> ssub * ETbb-TLF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{regular}{scsl}{
-      <-> ssub * ETbb-TLF/regular/scit
+\DeclareFontShape{OT1}{ETbb-TLF}{bold}{sl}{
+      <-> ssub * ETbb-TLF/bold/it
 }{}
 
 %
@@ -89,16 +79,12 @@
 
 %   m --> regular
 
-\DeclareFontShape{OT1}{ETbb-TLF}{m}{}{
-      <-> alias * ETbb-TLF/regular/
-}{}
-
 \DeclareFontShape{OT1}{ETbb-TLF}{m}{scsl}{
       <-> alias * ETbb-TLF/regular/scsl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{m}{n}{
-      <-> alias * ETbb-TLF/regular/n
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{sl}{
+      <-> alias * ETbb-TLF/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TLF}{m}{scit}{
@@ -109,71 +95,63 @@
       <-> alias * ETbb-TLF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{m}{sc}{
-      <-> alias * ETbb-TLF/regular/sc
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{n}{
+      <-> alias * ETbb-TLF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{m}{sl}{
-      <-> alias * ETbb-TLF/regular/sl
+\DeclareFontShape{OT1}{ETbb-TLF}{m}{sc}{
+      <-> alias * ETbb-TLF/regular/sc
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{ETbb-TLF}{b}{n}{
-      <-> alias * ETbb-TLF/bold/n
-}{}
-
-\DeclareFontShape{OT1}{ETbb-TLF}{b}{scit}{
-      <-> alias * ETbb-TLF/bold/scit
+\DeclareFontShape{OT1}{ETbb-TLF}{b}{sl}{
+      <-> alias * ETbb-TLF/bold/sl
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TLF}{b}{scsl}{
       <-> alias * ETbb-TLF/bold/scsl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{b}{}{
-      <-> alias * ETbb-TLF/bold/
-}{}
-
-\DeclareFontShape{OT1}{ETbb-TLF}{b}{it}{
-      <-> alias * ETbb-TLF/bold/it
-}{}
-
-\DeclareFontShape{OT1}{ETbb-TLF}{b}{sl}{
-      <-> alias * ETbb-TLF/bold/sl
+\DeclareFontShape{OT1}{ETbb-TLF}{b}{n}{
+      <-> alias * ETbb-TLF/bold/n
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TLF}{b}{sc}{
       <-> alias * ETbb-TLF/bold/sc
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bx}{sc}{
-      <-> ssub * ETbb-TLF/b/sc
+\DeclareFontShape{OT1}{ETbb-TLF}{b}{scit}{
+      <-> alias * ETbb-TLF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{ETbb-TLF}{b}{it}{
+      <-> alias * ETbb-TLF/bold/it
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TLF}{bx}{sl}{
       <-> ssub * ETbb-TLF/b/sl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bx}{it}{
-      <-> ssub * ETbb-TLF/b/it
+\DeclareFontShape{OT1}{ETbb-TLF}{bx}{scsl}{
+      <-> ssub * ETbb-TLF/b/scsl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bx}{scit}{
-      <-> ssub * ETbb-TLF/b/scit
+\DeclareFontShape{OT1}{ETbb-TLF}{bx}{sc}{
+      <-> ssub * ETbb-TLF/b/sc
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TLF}{bx}{n}{
       <-> ssub * ETbb-TLF/b/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bx}{}{
-      <-> ssub * ETbb-TLF/b/
+\DeclareFontShape{OT1}{ETbb-TLF}{bx}{scit}{
+      <-> ssub * ETbb-TLF/b/scit
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TLF}{bx}{scsl}{
-      <-> ssub * ETbb-TLF/b/scsl
+\DeclareFontShape{OT1}{ETbb-TLF}{bx}{it}{
+      <-> ssub * ETbb-TLF/b/it
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TOsF.fd b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TOsF.fd
index 08b18ae3fc6..fcf8e780206 100644
--- a/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/etbb/OT1ETbb-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/05/14
+%% Generated by autoinst on 2020/06/17
 %%
 \ProvidesFile{OT1ETbb-TOsF.fd}
-    [2020/05/14 (autoinst)  Font definitions for OT1/ETbb-TOsF.]
+    [2020/06/17 (autoinst)  Font definitions for OT1/ETbb-TOsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,67 +20,57 @@
 \DeclareFontFamily{OT1}{ETbb-TOsF}{}
 
 
-%   ----  bold  ----
-
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tosf-ot1
-}{}
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{sc}{
-      <-> \ETbb@@scale ETbb-Bold-tosf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{}{
-      <-0> \ETbb@@scale ETbb-Bold-tosf-ot1
-      <0-> \ETbb@@scale ETbb-BoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{scit}{
+      <-> \ETbb@@scale ETbb-Italic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-tosf-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{sc}{
+      <-> \ETbb@@scale ETbb-Regular-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scit}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{sl}{
-      <-> ssub * ETbb-TOsF/bold/it
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{scsl}{
+      <-> ssub * ETbb-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scsl}{
-      <-> ssub * ETbb-TOsF/bold/scit
+\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{sl}{
+      <-> ssub * ETbb-TOsF/regular/it
 }{}
 
 
-%   ----  regular  ----
-
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{sc}{
-      <-> \ETbb@@scale ETbb-Regular-tosf-sc-ot1
-}{}
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-tosf-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{scit}{
-      <-> \ETbb@@scale ETbb-Italic-tosf-sc-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scit}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-tosf-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{sc}{
+      <-> \ETbb@@scale ETbb-Bold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{}{
-      <-0> \ETbb@@scale ETbb-Italic-tosf-ot1
-      <0-> \ETbb@@scale ETbb-Regular-tosf-ot1
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{sl}{
-      <-> ssub * ETbb-TOsF/regular/it
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{scsl}{
+      <-> ssub * ETbb-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{regular}{scsl}{
-      <-> ssub * ETbb-TOsF/regular/scit
+\DeclareFontShape{OT1}{ETbb-TOsF}{bold}{sl}{
+      <-> ssub * ETbb-TOsF/bold/it
 }{}
 
 %
@@ -89,91 +79,79 @@
 
 %   m --> regular
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{m}{}{
-      <-> alias * ETbb-TOsF/regular/
-}{}
-
 \DeclareFontShape{OT1}{ETbb-TOsF}{m}{scsl}{
       <-> alias * ETbb-TOsF/regular/scsl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{m}{n}{
-      <-> alias * ETbb-TOsF/regular/n
-}{}
-
-\DeclareFontShape{OT1}{ETbb-TOsF}{m}{scit}{
-      <-> alias * ETbb-TOsF/regular/scit
+\DeclareFontShape{OT1}{ETbb-TOsF}{m}{sl}{
+      <-> alias * ETbb-TOsF/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TOsF}{m}{it}{
       <-> alias * ETbb-TOsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{m}{sl}{
-      <-> alias * ETbb-TOsF/regular/sl
+\DeclareFontShape{OT1}{ETbb-TOsF}{m}{scit}{
+      <-> alias * ETbb-TOsF/regular/scit
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TOsF}{m}{sc}{
       <-> alias * ETbb-TOsF/regular/sc
 }{}
 
+\DeclareFontShape{OT1}{ETbb-TOsF}{m}{n}{
+      <-> alias * ETbb-TOsF/regular/n
+}{}
 
-%   b --> bold
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{b}{}{
-      <-> alias * ETbb-TOsF/bold/
-}{}
+%   b --> bold
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{b}{scsl}{
-      <-> alias * ETbb-TOsF/bold/scsl
+\DeclareFontShape{OT1}{ETbb-TOsF}{b}{it}{
+      <-> alias * ETbb-TOsF/bold/it
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TOsF}{b}{scit}{
       <-> alias * ETbb-TOsF/bold/scit
 }{}
 
+\DeclareFontShape{OT1}{ETbb-TOsF}{b}{sc}{
+      <-> alias * ETbb-TOsF/bold/sc
+}{}
+
 \DeclareFontShape{OT1}{ETbb-TOsF}{b}{n}{
       <-> alias * ETbb-TOsF/bold/n
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{b}{sl}{
-      <-> alias * ETbb-TOsF/bold/sl
+\DeclareFontShape{OT1}{ETbb-TOsF}{b}{scsl}{
+      <-> alias * ETbb-TOsF/bold/scsl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{b}{sc}{
-      <-> alias * ETbb-TOsF/bold/sc
+\DeclareFontShape{OT1}{ETbb-TOsF}{b}{sl}{
+      <-> alias * ETbb-TOsF/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{b}{it}{
-      <-> alias * ETbb-TOsF/bold/it
+\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{n}{
+      <-> ssub * ETbb-TOsF/b/n
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TOsF}{bx}{sc}{
       <-> ssub * ETbb-TOsF/b/sc
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{sl}{
-      <-> ssub * ETbb-TOsF/b/sl
+\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{scit}{
+      <-> ssub * ETbb-TOsF/b/scit
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TOsF}{bx}{it}{
       <-> ssub * ETbb-TOsF/b/it
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{scit}{
-      <-> ssub * ETbb-TOsF/b/scit
-}{}
-
-\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{n}{
-      <-> ssub * ETbb-TOsF/b/n
+\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{sl}{
+      <-> ssub * ETbb-TOsF/b/sl
 }{}
 
 \DeclareFontShape{OT1}{ETbb-TOsF}{bx}{scsl}{
       <-> ssub * ETbb-TOsF/b/scsl
 }{}
 
-\DeclareFontShape{OT1}{ETbb-TOsF}{bx}{}{
-      <-> ssub * ETbb-TOsF/b/
-}{}
-
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Dnom.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Dnom.fd
index 89f2bcf6879..b385ca97faa 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/05/14
+%% Generated by autoinst on 2020/06/17
 %%
 \ProvidesFile{T1ETbb-Dnom.fd}
-    [2020/05/14 (autoinst)  Font definitions for T1/ETbb-Dnom.]
+    [2020/06/17 (autoinst)  Font definitions for T1/ETbb-Dnom.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,14 @@
 
 %   ----  regular  ----
 
-\DeclareFontShape{T1}{ETbb-Dnom}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-dnom-t1
-}{}
-
 \DeclareFontShape{T1}{ETbb-Dnom}{regular}{it}{
       <-> \ETbb@@scale ETbb-Italic-dnom-t1
 }{}
 
+\DeclareFontShape{T1}{ETbb-Dnom}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-dnom-t1
+}{}
+
 \DeclareFontShape{T1}{ETbb-Dnom}{regular}{sl}{
       <-> ssub * ETbb-Dnom/regular/it
 }{}
@@ -59,14 +59,14 @@
       <-> alias * ETbb-Dnom/regular/n
 }{}
 
-\DeclareFontShape{T1}{ETbb-Dnom}{m}{sl}{
-      <-> alias * ETbb-Dnom/regular/sl
-}{}
-
 \DeclareFontShape{T1}{ETbb-Dnom}{m}{it}{
       <-> alias * ETbb-Dnom/regular/it
 }{}
 
+\DeclareFontShape{T1}{ETbb-Dnom}{m}{sl}{
+      <-> alias * ETbb-Dnom/regular/sl
+}{}
+
 
 %   b --> bold
 
@@ -74,22 +74,22 @@
       <-> alias * ETbb-Dnom/bold/n
 }{}
 
-\DeclareFontShape{T1}{ETbb-Dnom}{b}{sl}{
-      <-> alias * ETbb-Dnom/bold/sl
-}{}
-
 \DeclareFontShape{T1}{ETbb-Dnom}{b}{it}{
       <-> alias * ETbb-Dnom/bold/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Dnom}{bx}{n}{
-      <-> ssub * ETbb-Dnom/b/n
+\DeclareFontShape{T1}{ETbb-Dnom}{b}{sl}{
+      <-> alias * ETbb-Dnom/bold/sl
 }{}
 
 \DeclareFontShape{T1}{ETbb-Dnom}{bx}{sl}{
       <-> ssub * ETbb-Dnom/b/sl
 }{}
 
+\DeclareFontShape{T1}{ETbb-Dnom}{bx}{n}{
+      <-> ssub * ETbb-Dnom/b/n
+}{}
+
 \DeclareFontShape{T1}{ETbb-Dnom}{bx}{it}{
       <-> ssub * ETbb-Dnom/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Inf.fd
index d82dc35b1f1..310cb45c2af 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/05/14
+%% Generated by autoinst on 2020/06/17
 %%
 \ProvidesFile{T1ETbb-Inf.fd}
-    [2020/05/14 (autoinst)  Font definitions for T1/ETbb-Inf.]
+    [2020/06/17 (autoinst)  Font definitions for T1/ETbb-Inf.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -55,43 +55,43 @@
 
 %   m --> regular
 
-\DeclareFontShape{T1}{ETbb-Inf}{m}{sl}{
-      <-> alias * ETbb-Inf/regular/sl
+\DeclareFontShape{T1}{ETbb-Inf}{m}{n}{
+      <-> alias * ETbb-Inf/regular/n
 }{}
 
 \DeclareFontShape{T1}{ETbb-Inf}{m}{it}{
       <-> alias * ETbb-Inf/regular/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{m}{n}{
-      <-> alias * ETbb-Inf/regular/n
+\DeclareFontShape{T1}{ETbb-Inf}{m}{sl}{
+      <-> alias * ETbb-Inf/regular/sl
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{T1}{ETbb-Inf}{b}{n}{
-      <-> alias * ETbb-Inf/bold/n
-}{}
-
 \DeclareFontShape{T1}{ETbb-Inf}{b}{sl}{
       <-> alias * ETbb-Inf/bold/sl
 }{}
 
+\DeclareFontShape{T1}{ETbb-Inf}{b}{n}{
+      <-> alias * ETbb-Inf/bold/n
+}{}
+
 \DeclareFontShape{T1}{ETbb-Inf}{b}{it}{
       <-> alias * ETbb-Inf/bold/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{bx}{sl}{
-      <-> ssub * ETbb-Inf/b/sl
+\DeclareFontShape{T1}{ETbb-Inf}{bx}{n}{
+      <-> ssub * ETbb-Inf/b/n
 }{}
 
 \DeclareFontShape{T1}{ETbb-Inf}{bx}{it}{
       <-> ssub * ETbb-Inf/b/it
 }{}
 
-\DeclareFontShape{T1}{ETbb-Inf}{bx}{n}{
-      <-> ssub * ETbb-Inf/b/n
+\DeclareFontShape{T1}{ETbb-Inf}{bx}{sl}{
+      <-> ssub * ETbb-Inf/b/sl
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd b/Master/texmf-dist/tex/latex/etbb/T1ETbb-Sup.fd
index 9c43559762f..11dbfdfb6d6 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/05/14
+%% Generated by autoinst on 2020/06/17
 %%
 \ProvidesFile{T1ETbb-Sup.fd}
-    [2020/05/14 (autoinst)  Font definitions for T1/ETbb-Sup.]
+    [2020/06/17 (autoinst)  Font definitions for T1/ETbb-Sup.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{T1}{ETbb-Sup}{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{T1}{ETbb-Sup}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-sup-t1
+\DeclareFontShape{T1}{ETbb-Sup}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-sup-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Sup}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-sup-t1
+\DeclareFontShape{T1}{ETbb-Sup}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Sup}{bold}{sl}{
-      <-> ssub * ETbb-Sup/bold/it
+\DeclareFontShape{T1}{ETbb-Sup}{regular}{sl}{
+      <-> ssub * ETbb-Sup/regular/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{T1}{ETbb-Sup}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-sup-t1
+\DeclareFontShape{T1}{ETbb-Sup}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Sup}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-sup-t1
+\DeclareFontShape{T1}{ETbb-Sup}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{ETbb-Sup}{regular}{sl}{
-      <-> ssub * ETbb-Sup/regular/it
+\DeclareFontShape{T1}{ETbb-Sup}{bold}{sl}{
+      <-> ssub * ETbb-Sup/bold/it
 }{}
 
 %
@@ -70,6 +70,10 @@
 
 %   b --> bold
 
+\DeclareFontShape{T1}{ETbb-Sup}{b}{n}{
+      <-> alias * ETbb-Sup/bold/n
+}{}
+
 \DeclareFontShape{T1}{ETbb-Sup}{b}{it}{
       <-> alias * ETbb-Sup/bold/it
 }{}
@@ -78,14 +82,6 @@
       <-> alias * ETbb-Sup/bold/sl
 }{}
 
-\DeclareFontShape{T1}{ETbb-Sup}{b}{n}{
-      <-> alias * ETbb-Sup/bold/n
-}{}
-
-\DeclareFontShape{T1}{ETbb-Sup}{bx}{it}{
-      <-> ssub * ETbb-Sup/b/it
-}{}
-
 \DeclareFontShape{T1}{ETbb-Sup}{bx}{sl}{
       <-> ssub * ETbb-Sup/b/sl
 }{}
@@ -94,4 +90,8 @@
       <-> ssub * ETbb-Sup/b/n
 }{}
 
+\DeclareFontShape{T1}{ETbb-Sup}{bx}{it}{
+      <-> ssub * ETbb-Sup/b/it
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-LF.fd
index e74653824d2..ac642cf4345 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/05/14
+%% Generated by autoinst on 2020/06/17
 %%
 \ProvidesFile{TS1ETbb-LF.fd}
-    [2020/05/14 (autoinst)  Font definitions for TS1/ETbb-LF.]
+    [2020/06/17 (autoinst)  Font definitions for TS1/ETbb-LF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{TS1}{ETbb-LF}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{TS1}{ETbb-LF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-lf-ts1
+\DeclareFontShape{TS1}{ETbb-LF}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-lf-ts1
+\DeclareFontShape{TS1}{ETbb-LF}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{regular}{sl}{
-      <-> ssub * ETbb-LF/regular/it
+\DeclareFontShape{TS1}{ETbb-LF}{bold}{sl}{
+      <-> ssub * ETbb-LF/bold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{TS1}{ETbb-LF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-lf-ts1
+\DeclareFontShape{TS1}{ETbb-LF}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-lf-ts1
+\DeclareFontShape{TS1}{ETbb-LF}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{bold}{sl}{
-      <-> ssub * ETbb-LF/bold/it
+\DeclareFontShape{TS1}{ETbb-LF}{regular}{sl}{
+      <-> ssub * ETbb-LF/regular/it
 }{}
 
 %
@@ -55,10 +55,6 @@
 
 %   m --> regular
 
-\DeclareFontShape{TS1}{ETbb-LF}{m}{n}{
-      <-> alias * ETbb-LF/regular/n
-}{}
-
 \DeclareFontShape{TS1}{ETbb-LF}{m}{sl}{
       <-> alias * ETbb-LF/regular/sl
 }{}
@@ -67,29 +63,33 @@
       <-> alias * ETbb-LF/regular/it
 }{}
 
+\DeclareFontShape{TS1}{ETbb-LF}{m}{n}{
+      <-> alias * ETbb-LF/regular/n
+}{}
 
-%   b --> bold
 
-\DeclareFontShape{TS1}{ETbb-LF}{b}{it}{
-      <-> alias * ETbb-LF/bold/it
-}{}
+%   b --> bold
 
 \DeclareFontShape{TS1}{ETbb-LF}{b}{sl}{
       <-> alias * ETbb-LF/bold/sl
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{b}{n}{
-      <-> alias * ETbb-LF/bold/n
+\DeclareFontShape{TS1}{ETbb-LF}{b}{it}{
+      <-> alias * ETbb-LF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-LF}{bx}{n}{
-      <-> ssub * ETbb-LF/b/n
+\DeclareFontShape{TS1}{ETbb-LF}{b}{n}{
+      <-> alias * ETbb-LF/bold/n
 }{}
 
 \DeclareFontShape{TS1}{ETbb-LF}{bx}{sl}{
       <-> ssub * ETbb-LF/b/sl
 }{}
 
+\DeclareFontShape{TS1}{ETbb-LF}{bx}{n}{
+      <-> ssub * ETbb-LF/b/n
+}{}
+
 \DeclareFontShape{TS1}{ETbb-LF}{bx}{it}{
       <-> ssub * ETbb-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-OsF.fd
index 231704d1662..5ba8debfa2b 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/05/14
+%% Generated by autoinst on 2020/06/17
 %%
 \ProvidesFile{TS1ETbb-OsF.fd}
-    [2020/05/14 (autoinst)  Font definitions for TS1/ETbb-OsF.]
+    [2020/06/17 (autoinst)  Font definitions for TS1/ETbb-OsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -22,14 +22,14 @@
 
 %   ----  regular  ----
 
-\DeclareFontShape{TS1}{ETbb-OsF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-osf-ts1
-}{}
-
 \DeclareFontShape{TS1}{ETbb-OsF}{regular}{it}{
       <-> \ETbb@@scale ETbb-Italic-osf-ts1
 }{}
 
+\DeclareFontShape{TS1}{ETbb-OsF}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-osf-ts1
+}{}
+
 \DeclareFontShape{TS1}{ETbb-OsF}{regular}{sl}{
       <-> ssub * ETbb-OsF/regular/it
 }{}
@@ -59,21 +59,17 @@
       <-> alias * ETbb-OsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-OsF}{m}{sl}{
-      <-> alias * ETbb-OsF/regular/sl
-}{}
-
 \DeclareFontShape{TS1}{ETbb-OsF}{m}{n}{
       <-> alias * ETbb-OsF/regular/n
 }{}
 
+\DeclareFontShape{TS1}{ETbb-OsF}{m}{sl}{
+      <-> alias * ETbb-OsF/regular/sl
+}{}
+
 
 %   b --> bold
 
-\DeclareFontShape{TS1}{ETbb-OsF}{b}{it}{
-      <-> alias * ETbb-OsF/bold/it
-}{}
-
 \DeclareFontShape{TS1}{ETbb-OsF}{b}{sl}{
       <-> alias * ETbb-OsF/bold/sl
 }{}
@@ -82,8 +78,8 @@
       <-> alias * ETbb-OsF/bold/n
 }{}
 
-\DeclareFontShape{TS1}{ETbb-OsF}{bx}{sl}{
-      <-> ssub * ETbb-OsF/b/sl
+\DeclareFontShape{TS1}{ETbb-OsF}{b}{it}{
+      <-> alias * ETbb-OsF/bold/it
 }{}
 
 \DeclareFontShape{TS1}{ETbb-OsF}{bx}{it}{
@@ -94,4 +90,8 @@
       <-> ssub * ETbb-OsF/b/n
 }{}
 
+\DeclareFontShape{TS1}{ETbb-OsF}{bx}{sl}{
+      <-> ssub * ETbb-OsF/b/sl
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TLF.fd
index 5ceaf5c4b11..b961918e15e 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/05/14
+%% Generated by autoinst on 2020/06/17
 %%
 \ProvidesFile{TS1ETbb-TLF.fd}
-    [2020/05/14 (autoinst)  Font definitions for TS1/ETbb-TLF.]
+    [2020/06/17 (autoinst)  Font definitions for TS1/ETbb-TLF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -55,14 +55,14 @@
 
 %   m --> regular
 
-\DeclareFontShape{TS1}{ETbb-TLF}{m}{n}{
-      <-> alias * ETbb-TLF/regular/n
-}{}
-
 \DeclareFontShape{TS1}{ETbb-TLF}{m}{it}{
       <-> alias * ETbb-TLF/regular/it
 }{}
 
+\DeclareFontShape{TS1}{ETbb-TLF}{m}{n}{
+      <-> alias * ETbb-TLF/regular/n
+}{}
+
 \DeclareFontShape{TS1}{ETbb-TLF}{m}{sl}{
       <-> alias * ETbb-TLF/regular/sl
 }{}
@@ -70,6 +70,10 @@
 
 %   b --> bold
 
+\DeclareFontShape{TS1}{ETbb-TLF}{b}{sl}{
+      <-> alias * ETbb-TLF/bold/sl
+}{}
+
 \DeclareFontShape{TS1}{ETbb-TLF}{b}{n}{
       <-> alias * ETbb-TLF/bold/n
 }{}
@@ -78,18 +82,14 @@
       <-> alias * ETbb-TLF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TLF}{b}{sl}{
-      <-> alias * ETbb-TLF/bold/sl
+\DeclareFontShape{TS1}{ETbb-TLF}{bx}{sl}{
+      <-> ssub * ETbb-TLF/b/sl
 }{}
 
 \DeclareFontShape{TS1}{ETbb-TLF}{bx}{it}{
       <-> ssub * ETbb-TLF/b/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TLF}{bx}{sl}{
-      <-> ssub * ETbb-TLF/b/sl
-}{}
-
 \DeclareFontShape{TS1}{ETbb-TLF}{bx}{n}{
       <-> ssub * ETbb-TLF/b/n
 }{}
diff --git a/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd b/Master/texmf-dist/tex/latex/etbb/TS1ETbb-TOsF.fd
index da2222b985e..d733dddaf40 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/05/14
+%% Generated by autoinst on 2020/06/17
 %%
 \ProvidesFile{TS1ETbb-TOsF.fd}
-    [2020/05/14 (autoinst)  Font definitions for TS1/ETbb-TOsF.]
+    [2020/06/17 (autoinst)  Font definitions for TS1/ETbb-TOsF.]
 
 \ifcsname s@fct@alias\endcsname\else
 \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,33 +20,33 @@
 \DeclareFontFamily{TS1}{ETbb-TOsF}{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{n}{
-      <-> \ETbb@@scale ETbb-Bold-tosf-ts1
+\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{n}{
+      <-> \ETbb@@scale ETbb-Regular-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{it}{
-      <-> \ETbb@@scale ETbb-BoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{it}{
+      <-> \ETbb@@scale ETbb-Italic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{sl}{
-      <-> ssub * ETbb-TOsF/bold/it
+\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{sl}{
+      <-> ssub * ETbb-TOsF/regular/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{it}{
-      <-> \ETbb@@scale ETbb-Italic-tosf-ts1
+\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{n}{
+      <-> \ETbb@@scale ETbb-Bold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{n}{
-      <-> \ETbb@@scale ETbb-Regular-tosf-ts1
+\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{it}{
+      <-> \ETbb@@scale ETbb-BoldItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{regular}{sl}{
-      <-> ssub * ETbb-TOsF/regular/it
+\DeclareFontShape{TS1}{ETbb-TOsF}{bold}{sl}{
+      <-> ssub * ETbb-TOsF/bold/it
 }{}
 
 %
@@ -55,6 +55,10 @@
 
 %   m --> regular
 
+\DeclareFontShape{TS1}{ETbb-TOsF}{m}{sl}{
+      <-> alias * ETbb-TOsF/regular/sl
+}{}
+
 \DeclareFontShape{TS1}{ETbb-TOsF}{m}{n}{
       <-> alias * ETbb-TOsF/regular/n
 }{}
@@ -63,13 +67,13 @@
       <-> alias * ETbb-TOsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{m}{sl}{
-      <-> alias * ETbb-TOsF/regular/sl
-}{}
-
 
 %   b --> bold
 
+\DeclareFontShape{TS1}{ETbb-TOsF}{b}{it}{
+      <-> alias * ETbb-TOsF/bold/it
+}{}
+
 \DeclareFontShape{TS1}{ETbb-TOsF}{b}{n}{
       <-> alias * ETbb-TOsF/bold/n
 }{}
@@ -78,14 +82,6 @@
       <-> alias * ETbb-TOsF/bold/sl
 }{}
 
-\DeclareFontShape{TS1}{ETbb-TOsF}{b}{it}{
-      <-> alias * ETbb-TOsF/bold/it
-}{}
-
-\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{sl}{
-      <-> ssub * ETbb-TOsF/b/sl
-}{}
-
 \DeclareFontShape{TS1}{ETbb-TOsF}{bx}{it}{
       <-> ssub * ETbb-TOsF/b/it
 }{}
@@ -94,4 +90,8 @@
       <-> ssub * ETbb-TOsF/b/n
 }{}
 
+\DeclareFontShape{TS1}{ETbb-TOsF}{bx}{sl}{
+      <-> ssub * ETbb-TOsF/b/sl
+}{}
+
 \endinput
author	Karl Berry <karl@freefriends.org>	2020-06-18 21:06:14 +0000
committer	Karl Berry <karl@freefriends.org>	2020-06-18 21:06:14 +0000
commit	facf46d872098b35fbd393700c4e0bb95a0ae88e (patch)
tree	29b66b8caafe41d587efc09233d73d15dcc34e8a /Master
parent	aed702b27ffb03affb98da23fd42f790c3067e46 (diff)