ebgaramond

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

504 files changed, 4677 insertions, 1669 deletions

diff --git a/Master/texmf-dist/doc/fonts/ebgaramond/README b/Master/texmf-dist/doc/fonts/ebgaramond/README
index e60acce6166..55368ec9ef7 100644
--- a/Master/texmf-dist/doc/fonts/ebgaramond/README
+++ b/Master/texmf-dist/doc/fonts/ebgaramond/README
@@ -1,5 +1,5 @@
 This is the README for the ebgaramond package, version 
-2018-11-30.
+2019-04-07.
 
 This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
 support for the EB Garamond family of fonts, designed by
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_23xtno.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_23xtno.enc
index 92804f3176a..20f0cc9869b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_23xtno.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_23xtno.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_23xtnovqxod3edsnez3ckhvjda
-% Encoding created by otftotfm on Fri Nov 30 07:45:02 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:10 2019
 % Command line follows encoding
 /AutoEnc_23xtnovqxod3edsnez3ckhvjda [
 %00
@@ -61,5 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=pnum EBGaramond-Bold.otf
-% EBGaramond-Bold-osf-ly1'
+% --feature=liga --feature=onum --feature=pnum EBGaramond-Regular.otf
+% EBGaramond-Regular-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_2xdej5.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_2xdej5.enc
index 6f76a2ee6a9..322f9f194dc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_2xdej5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_2xdej5.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_2xdej53vfkjumr6wkun3igxjtf
-% Encoding created by otftotfm on Fri Nov 30 07:45:03 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:10 2019
 % Command line follows encoding
 /AutoEnc_2xdej53vfkjumr6wkun3igxjtf [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall EBGaramond-Bold.otf
-% EBGaramond-Bold-osf-sc-ly1'
+% --unicoding=germandbls =: SSsmall EBGaramond-Regular.otf
+% EBGaramond-Regular-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_3e4qg2.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_3e4qg2.enc
index 14d177091bf..9bfaab8bcee 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_3e4qg2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_3e4qg2.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_3e4qg265j6ebr4p4pe7kwxf2tf
-% Encoding created by otftotfm on Fri Nov 30 07:45:01 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:09 2019
 % Command line follows encoding
 /AutoEnc_3e4qg265j6ebr4p4pe7kwxf2tf [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
 % --feature=kern --feature=liga --feature=onum --feature=swsh --feature=tnum
-% --include-alternates=*.swash --feature=aalt EBGaramond-Bold.otf
-% EBGaramond-Bold-tosf-swash-t1'
+% --include-alternates=*.swash --feature=aalt EBGaramond-Regular.otf
+% EBGaramond-Regular-tosf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_47dl7g.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_47dl7g.enc
index 25f098e1d45..2942d087868 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_47dl7g.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_47dl7g.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_47dl7gl2zcuwieqidajvjqlu7b
-% Encoding created by otftotfm on Fri Nov 30 07:45:08 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:13 2019
 % Command line follows encoding
 /AutoEnc_47dl7gl2zcuwieqidajvjqlu7b [
 %00
@@ -62,4 +62,4 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=case
 % --feature=kern --feature=liga --feature=lnum --feature=tnum
-% EBGaramond-ExtraBoldItalic.otf EBGaramond-ExtraBoldItalic-tlf-titling-ly1'
+% EBGaramond-Italic.otf EBGaramond-Italic-tlf-titling-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_54ujiw.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_54ujiw.enc
index 959cef3ec07..fc05ba20101 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_54ujiw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_54ujiw.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_54ujiwtzv6tvhvfi6tvpkznylc
-% Encoding created by otftotfm on Fri Nov 30 07:44:51 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:05 2019
 % Command line follows encoding
 /AutoEnc_54ujiwtzv6tvhvfi6tvpkznylc [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall EBGaramond-Bold.otf
-% EBGaramond-Bold-tlf-sc-ly1'
+% --unicoding=germandbls =: SSsmall EBGaramond-Regular.otf
+% EBGaramond-Regular-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_5tyv6c.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_5tyv6c.enc
index b6309d594bc..1c2e606ad03 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_5tyv6c.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_5tyv6c.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_5tyv6cssgdji45lwui2by7br4e
-% Encoding created by otftotfm on Fri Nov 30 07:45:14 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:17 2019
 % Command line follows encoding
 /AutoEnc_5tyv6cssgdji45lwui2by7br4e [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
 % --feature=kern --feature=liga --feature=onum --feature=swsh --feature=tnum
-% --include-alternates=*.swash --feature=aalt EBGaramond-ExtraBoldItalic.otf
-% EBGaramond-ExtraBoldItalic-tosf-swash-t1'
+% --include-alternates=*.swash --feature=aalt EBGaramond-Italic.otf
+% EBGaramond-Italic-tosf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_5vgwa5.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_5vgwa5.enc
index 25df3f14344..732bb4ccb10 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_5vgwa5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_5vgwa5.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_5vgwa5l3cgabvwoexj6dqg4sfc
-% Encoding created by otftotfm on Fri Nov 30 07:45:15 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:17 2019
 % Command line follows encoding
 /AutoEnc_5vgwa5l3cgabvwoexj6dqg4sfc [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
 % --feature=kern --feature=liga --feature=onum --feature=swsh --feature=tnum
-% --include-alternates=*.swash --feature=aalt EBGaramond-ExtraBoldItalic.otf
-% EBGaramond-ExtraBoldItalic-tosf-swash-ly1'
+% --include-alternates=*.swash --feature=aalt EBGaramond-Italic.otf
+% EBGaramond-Italic-tosf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_6napgq.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_6napgq.enc
index 6eac1546058..69bb537f322 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_6napgq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_6napgq.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_6napgq6etqab6jxvgs7tt46mpf
-% Encoding created by otftotfm on Fri Nov 30 07:44:57 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:08 2019
 % Command line follows encoding
 /AutoEnc_6napgq6etqab6jxvgs7tt46mpf [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=swsh
-% --include-alternates=*.swash --feature=aalt EBGaramond-Bold.otf
-% EBGaramond-Bold-lf-swash-ly1'
+% --include-alternates=*.swash --feature=aalt EBGaramond-Regular.otf
+% EBGaramond-Regular-lf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_7o6wgg.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_7o6wgg.enc
index 8988e8bc1ba..4fdee0c7187 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_7o6wgg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_7o6wgg.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_7o6wggmtb7dgdzshbotsm6ev6e
-% Encoding created by otftotfm on Fri Nov 30 07:45:06 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:12 2019
 % Command line follows encoding
 /AutoEnc_7o6wggmtb7dgdzshbotsm6ev6e [
 %00
@@ -62,5 +62,4 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
 % --feature=lnum --feature=swsh --feature=tnum --include-alternates=*.swash
-% --feature=aalt EBGaramond-ExtraBoldItalic.otf
-% EBGaramond-ExtraBoldItalic-tlf-swash-ot1'
+% --feature=aalt EBGaramond-Italic.otf EBGaramond-Italic-tlf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_7zbjeb.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_7zbjeb.enc
index e4b0d1c8966..ec45686fc39 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_7zbjeb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_7zbjeb.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_7zbjebv47f5uy63yxgbxijljze
-% Encoding created by otftotfm on Fri Nov 30 07:44:59 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:09 2019
 % Command line follows encoding
 /AutoEnc_7zbjebv47f5uy63yxgbxijljze [
 %00
@@ -61,5 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=onum --feature=tnum EBGaramond-Bold.otf
-% EBGaramond-Bold-tosf-t1'
+% --feature=liga --feature=onum --feature=tnum EBGaramond-Regular.otf
+% EBGaramond-Regular-tosf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_a253pk.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_a253pk.enc
index b71621d04fe..1fc80b8d6d3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_a253pk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_a253pk.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_a253pkmthtvztt2cy25s6mg7ne
-% Encoding created by otftotfm on Fri Nov 30 07:45:02 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:10 2019
 % Command line follows encoding
 /AutoEnc_a253pkmthtvztt2cy25s6mg7ne [
 %00
@@ -61,5 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=onum --feature=pnum EBGaramond-Bold.otf
-% EBGaramond-Bold-osf-t1'
+% --feature=liga --feature=onum --feature=pnum EBGaramond-Regular.otf
+% EBGaramond-Regular-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_abyljl.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_abyljl.enc
index a9af33af3b4..aa94f4c8d00 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_abyljl.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_abyljl.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_abyljl7ktazwzcff7pualhlsce
-% Encoding created by otftotfm on Fri Nov 30 07:44:50 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:04 2019
 % Command line follows encoding
 /AutoEnc_abyljl7ktazwzcff7pualhlsce [
 %00
@@ -61,4 +61,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
-% --feature=tnum EBGaramond-Bold.otf EBGaramond-Bold-tlf-ot1'
+% --feature=tnum EBGaramond-Regular.otf EBGaramond-Regular-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ao6kf7.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ao6kf7.enc
index c21c3db8d4c..3724df426f6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ao6kf7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ao6kf7.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ao6kf7czm3kxufroii6io2txyb
-% Encoding created by otftotfm on Fri Nov 30 07:50:28 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:06 2019
 % Command line follows encoding
 /AutoEnc_ao6kf7czm3kxufroii6io2txyb [
 %00
@@ -61,5 +61,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=sinf
-% --ligkern=* {KL} * EBGaramond-BoldItalic.otf
-% EBGaramond-BoldItalic-inf-ot1'
+% --ligkern=* {KL} * EBGaramond-Regular.otf EBGaramond-Regular-inf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_bszlvl.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_bszlvl.enc
index 46573a376c2..66505436c42 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_bszlvl.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_bszlvl.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_bszlvlk6bkouv7yc5pd5xqbgld
-% Encoding created by otftotfm on Fri Nov 30 07:44:54 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:06 2019
 % Command line follows encoding
 /AutoEnc_bszlvlk6bkouv7yc5pd5xqbgld [
 %00
@@ -61,5 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=sups --ligkern=* {KL} * EBGaramond-Bold.otf
-% EBGaramond-Bold-sup-t1'
+% --feature=liga --feature=sups --ligkern=* {KL} * EBGaramond-Regular.otf
+% EBGaramond-Regular-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_byuyni.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_byuyni.enc
index fed61c1ac58..c642c8e6697 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_byuyni.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_byuyni.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_byuynix5r46fcpi7yc7qekcpbh
-% Encoding created by otftotfm on Fri Nov 30 07:45:03 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:10 2019
 % Command line follows encoding
 /AutoEnc_byuynix5r46fcpi7yc7qekcpbh [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall EBGaramond-Bold.otf
-% EBGaramond-Bold-osf-sc-t1'
+% --unicoding=germandbls =: SSsmall EBGaramond-Regular.otf
+% EBGaramond-Regular-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_c4ggco.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_c4ggco.enc
index d08222e9ebd..d3a95532688 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_c4ggco.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_c4ggco.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_c4ggcorthinbys2wmpe4bwpsqg
-% Encoding created by otftotfm on Fri Nov 30 07:45:12 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:16 2019
 % Command line follows encoding
 /AutoEnc_c4ggcorthinbys2wmpe4bwpsqg [
 %00
@@ -61,5 +61,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
-% --feature=tnum EBGaramond-ExtraBoldItalic.otf
-% EBGaramond-ExtraBoldItalic-tosf-ot1'
+% --feature=tnum EBGaramond-Italic.otf EBGaramond-Italic-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_cjjoj4.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_cjjoj4.enc
index 57cd2935f64..cc6039dae5f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_cjjoj4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_cjjoj4.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_cjjoj4mzlh573qpscv7zdqq5pc
-% Encoding created by otftotfm on Fri Nov 30 07:45:05 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:11 2019
 % Command line follows encoding
 /AutoEnc_cjjoj4mzlh573qpscv7zdqq5pc [
 %00
@@ -61,5 +61,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
-% --feature=tnum EBGaramond-ExtraBoldItalic.otf
-% EBGaramond-ExtraBoldItalic-tlf-ot1'
+% --feature=tnum EBGaramond-Italic.otf EBGaramond-Italic-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_dmjlse.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_dmjlse.enc
index f7df5c8e9c8..f282e8b333a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_dmjlse.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_dmjlse.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_dmjlsehjhqubkrychxdeweizch
-% Encoding created by otftotfm on Fri Nov 30 07:44:52 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:05 2019
 % Command line follows encoding
 /AutoEnc_dmjlsehjhqubkrychxdeweizch [
 %00
@@ -62,4 +62,4 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
 % --feature=lnum --feature=swsh --feature=tnum --include-alternates=*.swash
-% --feature=aalt EBGaramond-Bold.otf EBGaramond-Bold-tlf-swash-ot1'
+% --feature=aalt EBGaramond-Regular.otf EBGaramond-Regular-tlf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_doset5.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_doset5.enc
index efaf84a0aac..7247b2007ee 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_doset5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_doset5.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_doset5jni7ptstijeczbezqvvd
-% Encoding created by otftotfm on Fri Nov 30 07:45:08 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:13 2019
 % Command line follows encoding
 /AutoEnc_doset5jni7ptstijeczbezqvvd [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
 % --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl EBGaramond-ExtraBoldItalic.otf
-% EBGaramond-ExtraBoldItalic-tlf-ts1'
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl EBGaramond-Italic.otf
+% EBGaramond-Italic-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_dto4r5.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_dto4r5.enc
index 418de20c10e..4ac75ddf180 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_dto4r5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_dto4r5.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_dto4r5hkfdywrp623q2mbc3u3g
-% Encoding created by otftotfm on Fri Nov 30 07:45:05 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:11 2019
 % Command line follows encoding
 /AutoEnc_dto4r5hkfdywrp623q2mbc3u3g [
 %00
@@ -61,5 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=tnum
-% EBGaramond-ExtraBoldItalic.otf EBGaramond-ExtraBoldItalic-tlf-ly1'
+% --feature=liga --feature=lnum --feature=tnum EBGaramond-Italic.otf
+% EBGaramond-Italic-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_e3brkz.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_e3brkz.enc
index 7cbfcefafa1..113dc070a35 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_e3brkz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_e3brkz.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_e3brkzvtzp2dmfzg7e54unqplf
-% Encoding created by otftotfm on Fri Nov 30 07:45:07 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:12 2019
 % Command line follows encoding
 /AutoEnc_e3brkzvtzp2dmfzg7e54unqplf [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
 % --feature=kern --feature=liga --feature=lnum --feature=swsh --feature=tnum
-% --include-alternates=*.swash --feature=aalt EBGaramond-ExtraBoldItalic.otf
-% EBGaramond-ExtraBoldItalic-tlf-swash-ly1'
+% --include-alternates=*.swash --feature=aalt EBGaramond-Italic.otf
+% EBGaramond-Italic-tlf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_egoty6.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_egoty6.enc
index 0c070f0cc4c..4e63431805e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_egoty6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_egoty6.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_egoty6wpchcoxueschnlw73q6d
-% Encoding created by otftotfm on Fri Nov 30 07:45:03 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:10 2019
 % Command line follows encoding
 /AutoEnc_egoty6wpchcoxueschnlw73q6d [
 %00
@@ -62,4 +62,4 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
 % --feature=pnum --feature=smcp --unicoding=germandbls =: SSsmall
-% EBGaramond-Bold.otf EBGaramond-Bold-osf-sc-ot1'
+% EBGaramond-Regular.otf EBGaramond-Regular-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_fjpe6p.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_fjpe6p.enc
index 0d3210ded23..51bf38787a2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_fjpe6p.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_fjpe6p.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_fjpe6p45raoyul6jro4b6sespb
-% Encoding created by otftotfm on Fri Nov 30 07:45:17 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:18 2019
 % Command line follows encoding
 /AutoEnc_fjpe6p45raoyul6jro4b6sespb [
 %00
@@ -62,5 +62,4 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
 % --feature=onum --feature=pnum --feature=swsh --include-alternates=*.swash
-% --feature=aalt EBGaramond-ExtraBoldItalic.otf
-% EBGaramond-ExtraBoldItalic-osf-swash-ot1'
+% --feature=aalt EBGaramond-Italic.otf EBGaramond-Italic-osf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_hlpoev.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_hlpoev.enc
index 5aface512d7..f32d37e63b8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_hlpoev.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_hlpoev.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_hlpoevvpzwoif6oa4heawahthf
-% Encoding created by otftotfm on Fri Nov 30 07:45:09 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:14 2019
 % Command line follows encoding
 /AutoEnc_hlpoevvpzwoif6oa4heawahthf [
 %00
@@ -61,5 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=pnum
-% EBGaramond-ExtraBoldItalic.otf EBGaramond-ExtraBoldItalic-lf-ly1'
+% --feature=liga --feature=lnum --feature=pnum EBGaramond-Italic.otf
+% EBGaramond-Italic-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ioh3dp.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ioh3dp.enc
index fc69d295f9d..b2fa6e96805 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ioh3dp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ioh3dp.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ioh3dpo5o56gxrlonlq4ni3eyd
-% Encoding created by otftotfm on Fri Nov 30 07:45:01 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:10 2019
 % Command line follows encoding
 /AutoEnc_ioh3dpo5o56gxrlonlq4ni3eyd [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
 % --feature=kern --feature=liga --feature=onum --feature=swsh --feature=tnum
-% --include-alternates=*.swash --feature=aalt EBGaramond-Bold.otf
-% EBGaramond-Bold-tosf-swash-ly1'
+% --include-alternates=*.swash --feature=aalt EBGaramond-Regular.otf
+% EBGaramond-Regular-tosf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_izfhxe.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_izfhxe.enc
index a718c10a38f..0faf6ba001d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_izfhxe.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_izfhxe.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_izfhxe343lr4odwp7tsz42dm6b
-% Encoding created by otftotfm on Fri Nov 30 07:45:11 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:15 2019
 % Command line follows encoding
 /AutoEnc_izfhxe343lr4odwp7tsz42dm6b [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=swsh
-% --include-alternates=*.swash --feature=aalt EBGaramond-ExtraBoldItalic.otf
-% EBGaramond-ExtraBoldItalic-lf-swash-t1'
+% --include-alternates=*.swash --feature=aalt EBGaramond-Italic.otf
+% EBGaramond-Italic-lf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_j2gtbm.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_j2gtbm.enc
index 17c189aff1c..44f90a13a5e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_j2gtbm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_j2gtbm.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_j2gtbmvgspjsuvuvqshaglweuf
-% Encoding created by otftotfm on Fri Nov 30 07:45:11 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:15 2019
 % Command line follows encoding
 /AutoEnc_j2gtbmvgspjsuvuvqshaglweuf [
 %00
@@ -62,5 +62,4 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
 % --feature=lnum --feature=pnum --feature=swsh --include-alternates=*.swash
-% --feature=aalt EBGaramond-ExtraBoldItalic.otf
-% EBGaramond-ExtraBoldItalic-lf-swash-ot1'
+% --feature=aalt EBGaramond-Italic.otf EBGaramond-Italic-lf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_j2xr5d.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_j2xr5d.enc
index 8f39692589a..adfcbdb421b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_j2xr5d.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_j2xr5d.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_j2xr5dq6tgxurfw6n4h7uu2xxg
-% Encoding created by otftotfm on Fri Nov 30 07:44:59 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:09 2019
 % Command line follows encoding
 /AutoEnc_j2xr5dq6tgxurfw6n4h7uu2xxg [
 %00
@@ -61,5 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=tnum EBGaramond-Bold.otf
-% EBGaramond-Bold-tosf-ly1'
+% --feature=liga --feature=onum --feature=tnum EBGaramond-Regular.otf
+% EBGaramond-Regular-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_j66zy6.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_j66zy6.enc
index 211c414221b..5809e5a5b37 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_j66zy6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_j66zy6.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_j66zy62stilrgvoep4apdi3znb
-% Encoding created by otftotfm on Fri Nov 30 07:45:14 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:16 2019
 % Command line follows encoding
 /AutoEnc_j66zy62stilrgvoep4apdi3znb [
 %00
@@ -62,5 +62,4 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
 % --feature=onum --feature=swsh --feature=tnum --include-alternates=*.swash
-% --feature=aalt EBGaramond-ExtraBoldItalic.otf
-% EBGaramond-ExtraBoldItalic-tosf-swash-ot1'
+% --feature=aalt EBGaramond-Italic.otf EBGaramond-Italic-tosf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_jedt67.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_jedt67.enc
index 3b5d323b8b5..661ef35b2e7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_jedt67.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_jedt67.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_jedt67oelb6rdrfkeehbyf76yc
-% Encoding created by otftotfm on Fri Nov 30 07:45:07 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:12 2019
 % Command line follows encoding
 /AutoEnc_jedt67oelb6rdrfkeehbyf76yc [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
 % --feature=kern --feature=liga --feature=lnum --feature=swsh --feature=tnum
-% --include-alternates=*.swash --feature=aalt EBGaramond-ExtraBoldItalic.otf
-% EBGaramond-ExtraBoldItalic-tlf-swash-t1'
+% --include-alternates=*.swash --feature=aalt EBGaramond-Italic.otf
+% EBGaramond-Italic-tlf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_joewos.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_joewos.enc
index 0874cb8ad36..70c7e886832 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_joewos.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_joewos.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_joewosxhna5pwkrt2zs5xfsd5e
-% Encoding created by otftotfm on Fri Nov 30 07:45:13 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:16 2019
 % Command line follows encoding
 /AutoEnc_joewosxhna5pwkrt2zs5xfsd5e [
 %00
@@ -61,5 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=onum --feature=tnum
-% EBGaramond-ExtraBoldItalic.otf EBGaramond-ExtraBoldItalic-tosf-t1'
+% --feature=liga --feature=onum --feature=tnum EBGaramond-Italic.otf
+% EBGaramond-Italic-tosf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_jyhls2.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_jyhls2.enc
index d1b9c44f5f6..9abbb011afb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_jyhls2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_jyhls2.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_jyhls2hpbu2hzgel7zzhv7frgh
-% Encoding created by otftotfm on Fri Nov 30 07:45:00 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:09 2019
 % Command line follows encoding
 /AutoEnc_jyhls2hpbu2hzgel7zzhv7frgh [
 %00
@@ -62,4 +62,4 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
 % --feature=onum --feature=swsh --feature=tnum --include-alternates=*.swash
-% --feature=aalt EBGaramond-Bold.otf EBGaramond-Bold-tosf-swash-ot1'
+% --feature=aalt EBGaramond-Regular.otf EBGaramond-Regular-tosf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_kfeykp.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_kfeykp.enc
index 3ea098a514d..22558c1cbf3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_kfeykp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_kfeykp.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_kfeykpdkdkfgcmiob2alq76d6b
-% Encoding created by otftotfm on Fri Nov 30 07:50:28 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:06 2019
 % Command line follows encoding
 /AutoEnc_kfeykpdkdkfgcmiob2alq76d6b [
 %00
@@ -61,5 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=sinf --ligkern=* {KL} * EBGaramond-BoldItalic.otf
-% EBGaramond-BoldItalic-inf-t1'
+% --feature=liga --feature=sinf --ligkern=* {KL} * EBGaramond-Regular.otf
+% EBGaramond-Regular-inf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ld6df2.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ld6df2.enc
index 9bec1ef2afe..a421f5d8bb1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ld6df2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ld6df2.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ld6df2x7jielfy7kpphsipzgeb
-% Encoding created by otftotfm on Fri Nov 30 07:44:54 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:06 2019
 % Command line follows encoding
 /AutoEnc_ld6df2x7jielfy7kpphsipzgeb [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
 % --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl EBGaramond-Bold.otf
-% EBGaramond-Bold-tlf-ts1'
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl EBGaramond-Regular.otf
+% EBGaramond-Regular-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_liamow.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_liamow.enc
index d8302c9209c..69a6912ef6a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_liamow.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_liamow.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_liamowwj6bkl6mtj7xyoefkgke
-% Encoding created by otftotfm on Fri Nov 30 08:10:37 2018
+% Encoding created by otftotfm on Sun Apr  7 10:30:48 2019
 % Command line follows encoding
 /AutoEnc_liamowwj6bkl6mtj7xyoefkgke [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_lvcw6s.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_lvcw6s.enc
index e05bac0c01a..82647f6b088 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_lvcw6s.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_lvcw6s.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_lvcw6s3b76hfhdwvawjigeyj4f
-% Encoding created by otftotfm on Fri Nov 30 07:45:13 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:16 2019
 % Command line follows encoding
 /AutoEnc_lvcw6s3b76hfhdwvawjigeyj4f [
 %00
@@ -61,5 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=tnum
-% EBGaramond-ExtraBoldItalic.otf EBGaramond-ExtraBoldItalic-tosf-ly1'
+% --feature=liga --feature=onum --feature=tnum EBGaramond-Italic.otf
+% EBGaramond-Italic-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_m26xaf.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_m26xaf.enc
index 73aef2653e3..8572cc45fb2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_m26xaf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_m26xaf.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_m26xaf4sayh4v43g2oxpc5fvfd
-% Encoding created by otftotfm on Fri Nov 30 07:44:51 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:04 2019
 % Command line follows encoding
 /AutoEnc_m26xaf4sayh4v43g2oxpc5fvfd [
 %00
@@ -61,5 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=tnum EBGaramond-Bold.otf
-% EBGaramond-Bold-tlf-ly1'
+% --feature=liga --feature=lnum --feature=tnum EBGaramond-Regular.otf
+% EBGaramond-Regular-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_mj3jkq.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_mj3jkq.enc
index f9cddffe4e3..1e68b904f7a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_mj3jkq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_mj3jkq.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_mj3jkqegiifwkp7tg5srucvlef
-% Encoding created by otftotfm on Fri Nov 30 07:44:50 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:04 2019
 % Command line follows encoding
 /AutoEnc_mj3jkqegiifwkp7tg5srucvlef [
 %00
@@ -61,5 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=lnum --feature=tnum EBGaramond-Bold.otf
-% EBGaramond-Bold-tlf-t1'
+% --feature=liga --feature=lnum --feature=tnum EBGaramond-Regular.otf
+% EBGaramond-Regular-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_mnvma6.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_mnvma6.enc
index 10e8cd365f0..93efd5df055 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_mnvma6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_mnvma6.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_mnvma6c2scz5splrrrlgnwdtzc
-% Encoding created by otftotfm on Fri Nov 30 07:45:04 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:11 2019
 % Command line follows encoding
 /AutoEnc_mnvma6c2scz5splrrrlgnwdtzc [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=swsh
-% --include-alternates=*.swash --feature=aalt EBGaramond-Bold.otf
-% EBGaramond-Bold-osf-swash-ly1'
+% --include-alternates=*.swash --feature=aalt EBGaramond-Regular.otf
+% EBGaramond-Regular-osf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_muwakt.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_muwakt.enc
index 62e653291da..93a561b48fa 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_muwakt.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_muwakt.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_muwakt4d7zffh35b2q6vpr7ucg
-% Encoding created by otftotfm on Fri Nov 30 07:50:28 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:06 2019
 % Command line follows encoding
 /AutoEnc_muwakt4d7zffh35b2q6vpr7ucg [
 %00
@@ -61,5 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=sinf --ligkern=* {KL} * EBGaramond-BoldItalic.otf
-% EBGaramond-BoldItalic-inf-ly1'
+% --feature=liga --feature=sinf --ligkern=* {KL} * EBGaramond-Regular.otf
+% EBGaramond-Regular-inf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_mvrjgh.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_mvrjgh.enc
index 4a26f59966a..97c61ee1210 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_mvrjgh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_mvrjgh.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_mvrjgh5lp7hs4pp6ibvztkssbg
-% Encoding created by otftotfm on Fri Nov 30 07:45:17 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:18 2019
 % Command line follows encoding
 /AutoEnc_mvrjgh5lp7hs4pp6ibvztkssbg [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=swsh
-% --include-alternates=*.swash --feature=aalt EBGaramond-ExtraBoldItalic.otf
-% EBGaramond-ExtraBoldItalic-osf-swash-ly1'
+% --include-alternates=*.swash --feature=aalt EBGaramond-Italic.otf
+% EBGaramond-Italic-osf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_nhfy4v.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_nhfy4v.enc
index 7ab2cfcc873..e2d19e072ad 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_nhfy4v.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_nhfy4v.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_nhfy4vcyskj4jwrirusa4olqia
-% Encoding created by otftotfm on Fri Nov 30 07:45:00 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:09 2019
 % Command line follows encoding
 /AutoEnc_nhfy4vcyskj4jwrirusa4olqia [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall EBGaramond-Bold.otf
-% EBGaramond-Bold-tosf-sc-t1'
+% --unicoding=germandbls =: SSsmall EBGaramond-Regular.otf
+% EBGaramond-Regular-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_noegxq.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_noegxq.enc
index dc9191497a7..76e51bf1ff4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_noegxq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_noegxq.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_noegxq6wd4gmgm3wclekae5l7c
-% Encoding created by otftotfm on Fri Nov 30 07:45:07 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:12 2019
 % Command line follows encoding
 /AutoEnc_noegxq6wd4gmgm3wclekae5l7c [
 %00
@@ -61,5 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=case --feature=kern --feature=liga
-% --feature=lnum --feature=tnum EBGaramond-ExtraBoldItalic.otf
-% EBGaramond-ExtraBoldItalic-tlf-titling-ot1'
+% --feature=lnum --feature=tnum EBGaramond-Italic.otf
+% EBGaramond-Italic-tlf-titling-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_nxqm35.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_nxqm35.enc
index 2ff552efb6e..af713acc2f3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_nxqm35.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_nxqm35.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_nxqm357krn5asjgj4l52s7fwme
-% Encoding created by otftotfm on Fri Nov 30 07:45:02 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:10 2019
 % Command line follows encoding
 /AutoEnc_nxqm357krn5asjgj4l52s7fwme [
 %00
@@ -61,4 +61,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
-% --feature=pnum EBGaramond-Bold.otf EBGaramond-Bold-osf-ot1'
+% --feature=pnum EBGaramond-Regular.otf EBGaramond-Regular-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ob4q4u.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ob4q4u.enc
index 54e66d2ea5d..b66e6222f5d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ob4q4u.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ob4q4u.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ob4q4uwnlaqyztqz2q3odaf6zc
-% Encoding created by otftotfm on Fri Nov 30 07:44:54 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:07 2019
 % Command line follows encoding
 /AutoEnc_ob4q4uwnlaqyztqz2q3odaf6zc [
 %00
@@ -61,5 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=sups --ligkern=* {KL} * EBGaramond-Bold.otf
-% EBGaramond-Bold-sup-ly1'
+% --feature=liga --feature=sups --ligkern=* {KL} * EBGaramond-Regular.otf
+% EBGaramond-Regular-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_oge4ze.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_oge4ze.enc
index c5381f07e6c..5442b7c12a0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_oge4ze.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_oge4ze.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_oge4zeph4qgrf2eqipj4avd4uf
-% Encoding created by otftotfm on Fri Nov 30 07:44:54 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:06 2019
 % Command line follows encoding
 /AutoEnc_oge4zeph4qgrf2eqipj4avd4uf [
 %00
@@ -61,4 +61,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=sups
-% --ligkern=* {KL} * EBGaramond-Bold.otf EBGaramond-Bold-sup-ot1'
+% --ligkern=* {KL} * EBGaramond-Regular.otf EBGaramond-Regular-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ontdi6.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ontdi6.enc
index d47ee44e32c..ebe92f3244a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ontdi6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ontdi6.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ontdi6jpylpknbkaf3n2ljk6xh
-% Encoding created by otftotfm on Fri Nov 30 07:45:15 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:17 2019
 % Command line follows encoding
 /AutoEnc_ontdi6jpylpknbkaf3n2ljk6xh [
 %00
@@ -61,5 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=onum --feature=pnum
-% EBGaramond-ExtraBoldItalic.otf EBGaramond-ExtraBoldItalic-osf-t1'
+% --feature=liga --feature=onum --feature=pnum EBGaramond-Italic.otf
+% EBGaramond-Italic-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_pnjcqf.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_pnjcqf.enc
index 920125c1414..fa3b9f2c7b6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_pnjcqf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_pnjcqf.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_pnjcqfp4hcsltp7rqnhqbb2xmb
-% Encoding created by otftotfm on Fri Nov 30 07:45:00 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:09 2019
 % Command line follows encoding
 /AutoEnc_pnjcqfp4hcsltp7rqnhqbb2xmb [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall EBGaramond-Bold.otf
-% EBGaramond-Bold-tosf-sc-ly1'
+% --unicoding=germandbls =: SSsmall EBGaramond-Regular.otf
+% EBGaramond-Regular-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ptk5md.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ptk5md.enc
index 5af995183b8..6e3d81831b6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ptk5md.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_ptk5md.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_ptk5mdcvitdzngtmcofsfhbteh
-% Encoding created by otftotfm on Fri Nov 30 07:45:17 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:18 2019
 % Command line follows encoding
 /AutoEnc_ptk5mdcvitdzngtmcofsfhbteh [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=swsh
-% --include-alternates=*.swash --feature=aalt EBGaramond-ExtraBoldItalic.otf
-% EBGaramond-ExtraBoldItalic-osf-swash-t1'
+% --include-alternates=*.swash --feature=aalt EBGaramond-Italic.otf
+% EBGaramond-Italic-osf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_qckgoz.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_qckgoz.enc
index 217ad8f0dd0..70382456cb5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_qckgoz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_qckgoz.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_qckgozlkzjupumu2bsotgllzze
-% Encoding created by otftotfm on Fri Nov 30 07:44:56 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:07 2019
 % Command line follows encoding
 /AutoEnc_qckgozlkzjupumu2bsotgllzze [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall EBGaramond-Bold.otf
-% EBGaramond-Bold-lf-sc-ly1'
+% --unicoding=germandbls =: SSsmall EBGaramond-Regular.otf
+% EBGaramond-Regular-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_qip76a.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_qip76a.enc
index a3d7f9258bf..8294b16be53 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_qip76a.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_qip76a.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_qip76aljekhkapltnlznjm26tg
-% Encoding created by otftotfm on Fri Nov 30 07:44:56 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:07 2019
 % Command line follows encoding
 /AutoEnc_qip76aljekhkapltnlznjm26tg [
 %00
@@ -62,4 +62,4 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
 % --feature=pnum --feature=smcp --unicoding=germandbls =: SSsmall
-% EBGaramond-Bold.otf EBGaramond-Bold-lf-sc-ot1'
+% EBGaramond-Regular.otf EBGaramond-Regular-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_qnljit.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_qnljit.enc
index e9d19b4b062..5a0a14b79e4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_qnljit.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_qnljit.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_qnljitgqyb2s65dexixymiibaa
-% Encoding created by otftotfm on Fri Nov 30 07:45:16 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:17 2019
 % Command line follows encoding
 /AutoEnc_qnljitgqyb2s65dexixymiibaa [
 %00
@@ -61,5 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=pnum
-% EBGaramond-ExtraBoldItalic.otf EBGaramond-ExtraBoldItalic-osf-ly1'
+% --feature=liga --feature=onum --feature=pnum EBGaramond-Italic.otf
+% EBGaramond-Italic-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_qnvfe4.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_qnvfe4.enc
index dad79a9d1e6..0dc68098d59 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_qnvfe4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_qnvfe4.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_qnvfe4fijcsnkkj3bzt4y4wygd
-% Encoding created by otftotfm on Fri Nov 30 07:44:52 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:05 2019
 % Command line follows encoding
 /AutoEnc_qnvfe4fijcsnkkj3bzt4y4wygd [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
 % --feature=kern --feature=liga --feature=lnum --feature=swsh --feature=tnum
-% --include-alternates=*.swash --feature=aalt EBGaramond-Bold.otf
-% EBGaramond-Bold-tlf-swash-ly1'
+% --include-alternates=*.swash --feature=aalt EBGaramond-Regular.otf
+% EBGaramond-Regular-tlf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_rbkzlu.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_rbkzlu.enc
index 401d6e3442c..c46e8c035f4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_rbkzlu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_rbkzlu.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_rbkzluvbsijxcubauk4dxo24od
-% Encoding created by otftotfm on Fri Nov 30 07:44:57 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:07 2019
 % Command line follows encoding
 /AutoEnc_rbkzluvbsijxcubauk4dxo24od [
 %00
@@ -62,4 +62,4 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
 % --feature=lnum --feature=pnum --feature=swsh --include-alternates=*.swash
-% --feature=aalt EBGaramond-Bold.otf EBGaramond-Bold-lf-swash-ot1'
+% --feature=aalt EBGaramond-Regular.otf EBGaramond-Regular-lf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_rs3zoq.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_rs3zoq.enc
index 69dd9359cd3..5e3e84e1121 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_rs3zoq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_rs3zoq.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_rs3zoq2p2wr5xazf3giqkujald
-% Encoding created by otftotfm on Fri Nov 30 07:44:59 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:08 2019
 % Command line follows encoding
 /AutoEnc_rs3zoq2p2wr5xazf3giqkujald [
 %00
@@ -61,4 +61,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
-% --feature=tnum EBGaramond-Bold.otf EBGaramond-Bold-tosf-ot1'
+% --feature=tnum EBGaramond-Regular.otf EBGaramond-Regular-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_s7tpqt.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_s7tpqt.enc
index 2c53efddf9b..f5b27619c38 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_s7tpqt.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_s7tpqt.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_s7tpqtebt7fpaobhsv7o6g6p3d
-% Encoding created by otftotfm on Fri Nov 30 07:44:51 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:04 2019
 % Command line follows encoding
 /AutoEnc_s7tpqtebt7fpaobhsv7o6g6p3d [
 %00
@@ -62,4 +62,4 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
 % --feature=smcp --feature=tnum --unicoding=germandbls =: SSsmall
-% EBGaramond-Bold.otf EBGaramond-Bold-tlf-sc-ot1'
+% EBGaramond-Regular.otf EBGaramond-Regular-tlf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_slocg6.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_slocg6.enc
index 5103a94cc23..79dc95c08e7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_slocg6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_slocg6.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_slocg6iashfkchrd7dvhgvyphh
-% Encoding created by otftotfm on Fri Nov 30 07:45:14 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:16 2019
 % Command line follows encoding
 /AutoEnc_slocg6iashfkchrd7dvhgvyphh [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall EBGaramond-ExtraBoldItalic.otf
-% EBGaramond-ExtraBoldItalic-tosf-sc-ly1'
+% --unicoding=germandbls =: SSsmall EBGaramond-Italic.otf
+% EBGaramond-Italic-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_t4t3wm.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_t4t3wm.enc
index fb2d3ad5454..89d50575705 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_t4t3wm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_t4t3wm.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_t4t3wmxarqpqo4t5vwiyucfrpa
-% Encoding created by otftotfm on Fri Nov 30 07:45:03 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:11 2019
 % Command line follows encoding
 /AutoEnc_t4t3wmxarqpqo4t5vwiyucfrpa [
 %00
@@ -62,4 +62,4 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
 % --feature=onum --feature=pnum --feature=swsh --include-alternates=*.swash
-% --feature=aalt EBGaramond-Bold.otf EBGaramond-Bold-osf-swash-ot1'
+% --feature=aalt EBGaramond-Regular.otf EBGaramond-Regular-osf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_tbwoon.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_tbwoon.enc
index 51b631175cf..5b2d014b1d8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_tbwoon.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_tbwoon.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_tbwoonnbhlwtlye7tm73jktpib
-% Encoding created by otftotfm on Fri Nov 30 07:44:52 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:05 2019
 % Command line follows encoding
 /AutoEnc_tbwoonnbhlwtlye7tm73jktpib [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
 % --feature=kern --feature=liga --feature=lnum --feature=swsh --feature=tnum
-% --include-alternates=*.swash --feature=aalt EBGaramond-Bold.otf
-% EBGaramond-Bold-tlf-swash-t1'
+% --include-alternates=*.swash --feature=aalt EBGaramond-Regular.otf
+% EBGaramond-Regular-tlf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_uj47dd.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_uj47dd.enc
index 9a5a9324da8..93a4205d0c0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_uj47dd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_uj47dd.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_uj47dd2cdpqks5burrjhiwibgc
-% Encoding created by otftotfm on Fri Nov 30 07:44:53 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:06 2019
 % Command line follows encoding
 /AutoEnc_uj47dd2cdpqks5burrjhiwibgc [
 %00
@@ -62,4 +62,4 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=case
 % --feature=kern --feature=liga --feature=lnum --feature=tnum
-% EBGaramond-Bold.otf EBGaramond-Bold-tlf-titling-ly1'
+% EBGaramond-Regular.otf EBGaramond-Regular-tlf-titling-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_uxrhpx.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_uxrhpx.enc
index ac8517def29..10abafe13f8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_uxrhpx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_uxrhpx.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_uxrhpxwyh3rtb7wdsbfy3dpeba
-% Encoding created by otftotfm on Fri Nov 30 07:45:11 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:15 2019
 % Command line follows encoding
 /AutoEnc_uxrhpxwyh3rtb7wdsbfy3dpeba [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=swsh
-% --include-alternates=*.swash --feature=aalt EBGaramond-ExtraBoldItalic.otf
-% EBGaramond-ExtraBoldItalic-lf-swash-ly1'
+% --include-alternates=*.swash --feature=aalt EBGaramond-Italic.otf
+% EBGaramond-Italic-lf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_vqv3w3.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_vqv3w3.enc
index b0a42ee7668..ad289cfeb30 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_vqv3w3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_vqv3w3.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_vqv3w3jddu2yz2dnmvvx2bbzrd
-% Encoding created by otftotfm on Fri Nov 30 07:44:59 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:09 2019
 % Command line follows encoding
 /AutoEnc_vqv3w3jddu2yz2dnmvvx2bbzrd [
 %00
@@ -62,4 +62,4 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
 % --feature=smcp --feature=tnum --unicoding=germandbls =: SSsmall
-% EBGaramond-Bold.otf EBGaramond-Bold-tosf-sc-ot1'
+% EBGaramond-Regular.otf EBGaramond-Regular-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_wsnb7l.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_wsnb7l.enc
index 004aab7916e..5bf833f2de1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_wsnb7l.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_wsnb7l.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_wsnb7le2poeyznztvx6b35j2ob
-% Encoding created by otftotfm on Fri Nov 30 07:44:53 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:05 2019
 % Command line follows encoding
 /AutoEnc_wsnb7le2poeyznztvx6b35j2ob [
 %00
@@ -61,5 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=case --feature=kern --feature=liga
-% --feature=lnum --feature=tnum EBGaramond-Bold.otf
-% EBGaramond-Bold-tlf-titling-ot1'
+% --feature=lnum --feature=tnum EBGaramond-Regular.otf
+% EBGaramond-Regular-tlf-titling-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_wxmaa6.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_wxmaa6.enc
index 7d9f959917d..2bbc6187ffe 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_wxmaa6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_wxmaa6.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_wxmaa65amjqjpn7vhj2bjdqx3a
-% Encoding created by otftotfm on Fri Nov 30 07:45:05 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:11 2019
 % Command line follows encoding
 /AutoEnc_wxmaa65amjqjpn7vhj2bjdqx3a [
 %00
@@ -61,5 +61,5 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=lnum --feature=tnum
-% EBGaramond-ExtraBoldItalic.otf EBGaramond-ExtraBoldItalic-tlf-t1'
+% --feature=liga --feature=lnum --feature=tnum EBGaramond-Italic.otf
+% EBGaramond-Italic-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_xoskhe.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_xoskhe.enc
index fe6c8f71f22..f3e1a5e6b8c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_xoskhe.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_xoskhe.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_xoskheoavizix7q6vfcc7k34cd
-% Encoding created by otftotfm on Fri Nov 30 07:44:56 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:07 2019
 % Command line follows encoding
 /AutoEnc_xoskheoavizix7q6vfcc7k34cd [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall EBGaramond-Bold.otf
-% EBGaramond-Bold-lf-sc-t1'
+% --unicoding=germandbls =: SSsmall EBGaramond-Regular.otf
+% EBGaramond-Regular-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_xxcxg5.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_xxcxg5.enc
index ec27c83eb91..c46af3e97bc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_xxcxg5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_xxcxg5.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_xxcxg56g42snddornzdfpksj3c
-% Encoding created by otftotfm on Fri Nov 30 07:44:53 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:05 2019
 % Command line follows encoding
 /AutoEnc_xxcxg56g42snddornzdfpksj3c [
 %00
@@ -62,4 +62,4 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=case
 % --feature=kern --feature=liga --feature=lnum --feature=tnum
-% EBGaramond-Bold.otf EBGaramond-Bold-tlf-titling-t1'
+% EBGaramond-Regular.otf EBGaramond-Regular-tlf-titling-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_yddfsn.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_yddfsn.enc
index 3c4a3a6151f..6289fb2cbaa 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_yddfsn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_yddfsn.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_yddfsneogpgfw3a5axgk6w34nc
-% Encoding created by otftotfm on Fri Nov 30 07:45:12 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:15 2019
 % Command line follows encoding
 /AutoEnc_yddfsneogpgfw3a5axgk6w34nc [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
 % --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl EBGaramond-ExtraBoldItalic.otf
-% EBGaramond-ExtraBoldItalic-lf-ts1'
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl EBGaramond-Italic.otf
+% EBGaramond-Italic-lf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_yjkoc2.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_yjkoc2.enc
index 4d00681665c..9307d1eeffd 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_yjkoc2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_yjkoc2.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_yjkoc2bxtyk5pymwhoiyarwopd
-% Encoding created by otftotfm on Fri Nov 30 07:44:51 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:05 2019
 % Command line follows encoding
 /AutoEnc_yjkoc2bxtyk5pymwhoiyarwopd [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall EBGaramond-Bold.otf
-% EBGaramond-Bold-tlf-sc-t1'
+% --unicoding=germandbls =: SSsmall EBGaramond-Regular.otf
+% EBGaramond-Regular-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_yow7vo.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_yow7vo.enc
index 10efa621b2f..0e7df34168e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_yow7vo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_yow7vo.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_yow7vovfjroqgqn2odhltdg34d
-% Encoding created by otftotfm on Fri Nov 30 07:44:57 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:08 2019
 % Command line follows encoding
 /AutoEnc_yow7vovfjroqgqn2odhltdg34d [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=swsh
-% --include-alternates=*.swash --feature=aalt EBGaramond-Bold.otf
-% EBGaramond-Bold-lf-swash-t1'
+% --include-alternates=*.swash --feature=aalt EBGaramond-Regular.otf
+% EBGaramond-Regular-lf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_yyibz2.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_yyibz2.enc
index 880913acfa0..bd79d90d28b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_yyibz2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_yyibz2.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_yyibz2pthfaij2igwb6xmc3hga
-% Encoding created by otftotfm on Fri Nov 30 07:45:07 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:13 2019
 % Command line follows encoding
 /AutoEnc_yyibz2pthfaij2igwb6xmc3hga [
 %00
@@ -62,4 +62,4 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=case
 % --feature=kern --feature=liga --feature=lnum --feature=tnum
-% EBGaramond-ExtraBoldItalic.otf EBGaramond-ExtraBoldItalic-tlf-titling-t1'
+% EBGaramond-Italic.otf EBGaramond-Italic-tlf-titling-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_z6dm7r.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_z6dm7r.enc
index 5f6a869ec84..c8644d06248 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_z6dm7r.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_z6dm7r.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_z6dm7r4nubrhdvpbh46enrdtlf
-% Encoding created by otftotfm on Fri Nov 30 07:45:15 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:17 2019
 % Command line follows encoding
 /AutoEnc_z6dm7r4nubrhdvpbh46enrdtlf [
 %00
@@ -61,5 +61,4 @@
 % --encoding-directory=texmf/fonts/enc/dvips/ebgaramond
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
-% --feature=pnum EBGaramond-ExtraBoldItalic.otf
-% EBGaramond-ExtraBoldItalic-osf-ot1'
+% --feature=pnum EBGaramond-Italic.otf EBGaramond-Italic-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_zgunbq.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_zgunbq.enc
index 57fe9d41b48..a89b7276c47 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_zgunbq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_zgunbq.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_zgunbqcb7fkflwrnjdprpvr44e
-% Encoding created by otftotfm on Fri Nov 30 07:45:06 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:12 2019
 % Command line follows encoding
 /AutoEnc_zgunbqcb7fkflwrnjdprpvr44e [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall EBGaramond-ExtraBoldItalic.otf
-% EBGaramond-ExtraBoldItalic-tlf-sc-ly1'
+% --unicoding=germandbls =: SSsmall EBGaramond-Italic.otf
+% EBGaramond-Italic-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_zjrm7o.enc b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_zjrm7o.enc
index ae15ffce88e..da51546ba04 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_zjrm7o.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ebgaramond/ebgm_zjrm7o.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_zjrm7oiav7ih6lgry4bga5rocb
-% Encoding created by otftotfm on Fri Nov 30 07:45:04 2018
+% Encoding created by otftotfm on Sun Apr  7 10:24:11 2019
 % Command line follows encoding
 /AutoEnc_zjrm7oiav7ih6lgry4bga5rocb [
 %00
@@ -62,5 +62,5 @@
 % --map-file=texmf/fonts/map/dvips/ebgaramond/EBGaramond.map --no-updmap
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=swsh
-% --include-alternates=*.swash --feature=aalt EBGaramond-Bold.otf
-% EBGaramond-Bold-osf-swash-t1'
+% --include-alternates=*.swash --feature=aalt EBGaramond-Regular.otf
+% EBGaramond-Regular-osf-swash-t1'
diff --git a/Master/texmf-dist/fonts/map/dvips/ebgaramond/EBGaramond.map b/Master/texmf-dist/fonts/map/dvips/ebgaramond/EBGaramond.map
index d1e132689be..c5840e4e2e1 100644
--- a/Master/texmf-dist/fonts/map/dvips/ebgaramond/EBGaramond.map
+++ b/Master/texmf-dist/fonts/map/dvips/ebgaramond/EBGaramond.map
@@ -1,152 +1,57 @@
 % Automatically maintained by otftotfm or other programs. Do not edit.
 
-EBGaramond-Bold-tlf-ot1 EBGaramond-Bold "AutoEnc_abyljl7ktazwzcff7pualhlsce ReEncodeFont" <[ebgm_abyljl.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tlf-t1--base EBGaramond-Bold "AutoEnc_mj3jkqegiifwkp7tg5srucvlef ReEncodeFont" <[ebgm_mj3jkq.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tlf-ly1 EBGaramond-Bold "AutoEnc_m26xaf4sayh4v43g2oxpc5fvfd ReEncodeFont" <[ebgm_m26xaf.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tlf-sc-ot1--base EBGaramond-Bold "AutoEnc_s7tpqtebt7fpaobhsv7o6g6p3d ReEncodeFont" <[ebgm_s7tpqt.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tlf-sc-t1--base EBGaramond-Bold "AutoEnc_yjkoc2bxtyk5pymwhoiyarwopd ReEncodeFont" <[ebgm_yjkoc2.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tlf-sc-ly1--base EBGaramond-Bold "AutoEnc_54ujiwtzv6tvhvfi6tvpkznylc ReEncodeFont" <[ebgm_54ujiw.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tlf-swash-ot1 EBGaramond-Bold "AutoEnc_dmjlsehjhqubkrychxdeweizch ReEncodeFont" <[ebgm_dmjlse.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tlf-swash-t1--base EBGaramond-Bold "AutoEnc_tbwoonnbhlwtlye7tm73jktpib ReEncodeFont" <[ebgm_tbwoon.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tlf-swash-ly1 EBGaramond-Bold "AutoEnc_qnvfe4fijcsnkkj3bzt4y4wygd ReEncodeFont" <[ebgm_qnvfe4.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tlf-titling-ot1 EBGaramond-Bold "AutoEnc_wsnb7le2poeyznztvx6b35j2ob ReEncodeFont" <[ebgm_wsnb7l.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tlf-titling-t1--base EBGaramond-Bold "AutoEnc_xxcxg56g42snddornzdfpksj3c ReEncodeFont" <[ebgm_xxcxg5.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tlf-titling-ly1 EBGaramond-Bold "AutoEnc_uj47dd2cdpqks5burrjhiwibgc ReEncodeFont" <[ebgm_uj47dd.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tlf-ts1--base EBGaramond-Bold "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-sup-ot1 EBGaramond-Bold "AutoEnc_oge4zeph4qgrf2eqipj4avd4uf ReEncodeFont" <[ebgm_oge4ze.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-sup-t1--base EBGaramond-Bold "AutoEnc_bszlvlk6bkouv7yc5pd5xqbgld ReEncodeFont" <[ebgm_bszlvl.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-sup-ly1 EBGaramond-Bold "AutoEnc_ob4q4uwnlaqyztqz2q3odaf6zc ReEncodeFont" <[ebgm_ob4q4u.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-lf-ot1 EBGaramond-Bold "AutoEnc_wsnb7le2poeyznztvx6b35j2ob ReEncodeFont" <[ebgm_wsnb7l.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-lf-t1--base EBGaramond-Bold "AutoEnc_xxcxg56g42snddornzdfpksj3c ReEncodeFont" <[ebgm_xxcxg5.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-lf-ly1 EBGaramond-Bold "AutoEnc_uj47dd2cdpqks5burrjhiwibgc ReEncodeFont" <[ebgm_uj47dd.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-lf-sc-ot1--base EBGaramond-Bold "AutoEnc_qip76aljekhkapltnlznjm26tg ReEncodeFont" <[ebgm_qip76a.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-lf-sc-t1--base EBGaramond-Bold "AutoEnc_xoskheoavizix7q6vfcc7k34cd ReEncodeFont" <[ebgm_xoskhe.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-lf-sc-ly1--base EBGaramond-Bold "AutoEnc_qckgozlkzjupumu2bsotgllzze ReEncodeFont" <[ebgm_qckgoz.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-lf-swash-ot1 EBGaramond-Bold "AutoEnc_rbkzluvbsijxcubauk4dxo24od ReEncodeFont" <[ebgm_rbkzlu.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-lf-swash-t1--base EBGaramond-Bold "AutoEnc_yow7vovfjroqgqn2odhltdg34d ReEncodeFont" <[ebgm_yow7vo.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-lf-swash-ly1 EBGaramond-Bold "AutoEnc_6napgq6etqab6jxvgs7tt46mpf ReEncodeFont" <[ebgm_6napgq.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-lf-titling-ot1 EBGaramond-Bold "AutoEnc_wsnb7le2poeyznztvx6b35j2ob ReEncodeFont" <[ebgm_wsnb7l.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-lf-titling-t1--base EBGaramond-Bold "AutoEnc_xxcxg56g42snddornzdfpksj3c ReEncodeFont" <[ebgm_xxcxg5.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-lf-titling-ly1 EBGaramond-Bold "AutoEnc_uj47dd2cdpqks5burrjhiwibgc ReEncodeFont" <[ebgm_uj47dd.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-lf-ts1--base EBGaramond-Bold "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tosf-ot1 EBGaramond-Bold "AutoEnc_rs3zoq2p2wr5xazf3giqkujald ReEncodeFont" <[ebgm_rs3zoq.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tosf-t1--base EBGaramond-Bold "AutoEnc_7zbjebv47f5uy63yxgbxijljze ReEncodeFont" <[ebgm_7zbjeb.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tosf-ly1 EBGaramond-Bold "AutoEnc_j2xr5dq6tgxurfw6n4h7uu2xxg ReEncodeFont" <[ebgm_j2xr5d.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tosf-sc-ot1--base EBGaramond-Bold "AutoEnc_vqv3w3jddu2yz2dnmvvx2bbzrd ReEncodeFont" <[ebgm_vqv3w3.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tosf-sc-t1--base EBGaramond-Bold "AutoEnc_nhfy4vcyskj4jwrirusa4olqia ReEncodeFont" <[ebgm_nhfy4v.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tosf-sc-ly1--base EBGaramond-Bold "AutoEnc_pnjcqfp4hcsltp7rqnhqbb2xmb ReEncodeFont" <[ebgm_pnjcqf.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tosf-swash-ot1 EBGaramond-Bold "AutoEnc_jyhls2hpbu2hzgel7zzhv7frgh ReEncodeFont" <[ebgm_jyhls2.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tosf-swash-t1--base EBGaramond-Bold "AutoEnc_3e4qg265j6ebr4p4pe7kwxf2tf ReEncodeFont" <[ebgm_3e4qg2.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tosf-swash-ly1 EBGaramond-Bold "AutoEnc_ioh3dpo5o56gxrlonlq4ni3eyd ReEncodeFont" <[ebgm_ioh3dp.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-tosf-ts1--base EBGaramond-Bold "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-osf-ot1 EBGaramond-Bold "AutoEnc_nxqm357krn5asjgj4l52s7fwme ReEncodeFont" <[ebgm_nxqm35.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-osf-t1--base EBGaramond-Bold "AutoEnc_a253pkmthtvztt2cy25s6mg7ne ReEncodeFont" <[ebgm_a253pk.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-osf-ly1 EBGaramond-Bold "AutoEnc_23xtnovqxod3edsnez3ckhvjda ReEncodeFont" <[ebgm_23xtno.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-osf-sc-ot1--base EBGaramond-Bold "AutoEnc_egoty6wpchcoxueschnlw73q6d ReEncodeFont" <[ebgm_egoty6.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-osf-sc-t1--base EBGaramond-Bold "AutoEnc_byuynix5r46fcpi7yc7qekcpbh ReEncodeFont" <[ebgm_byuyni.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-osf-sc-ly1--base EBGaramond-Bold "AutoEnc_2xdej53vfkjumr6wkun3igxjtf ReEncodeFont" <[ebgm_2xdej5.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-osf-swash-ot1 EBGaramond-Bold "AutoEnc_t4t3wmxarqpqo4t5vwiyucfrpa ReEncodeFont" <[ebgm_t4t3wm.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-osf-swash-t1--base EBGaramond-Bold "AutoEnc_zjrm7oiav7ih6lgry4bga5rocb ReEncodeFont" <[ebgm_zjrm7o.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-osf-swash-ly1 EBGaramond-Bold "AutoEnc_mnvma6c2scz5splrrrlgnwdtzc ReEncodeFont" <[ebgm_mnvma6.enc <EBGaramond-Bold.pfb
-EBGaramond-Bold-osf-ts1--base EBGaramond-Bold "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-Bold.pfb
-EBGaramond-ExtraBoldItalic-tlf-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_cjjoj4mzlh573qpscv7zdqq5pc ReEncodeFont" <[ebgm_cjjoj4.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tlf-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_wxmaa65amjqjpn7vhj2bjdqx3a ReEncodeFont" <[ebgm_wxmaa6.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tlf-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_dto4r5hkfdywrp623q2mbc3u3g ReEncodeFont" <[ebgm_dto4r5.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tlf-sc-ot1--base EBGaramond-ExtraBoldItalic "AutoEnc_s7tpqtebt7fpaobhsv7o6g6p3d ReEncodeFont" <[ebgm_s7tpqt.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tlf-sc-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_yjkoc2bxtyk5pymwhoiyarwopd ReEncodeFont" <[ebgm_yjkoc2.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tlf-sc-ly1--base EBGaramond-ExtraBoldItalic "AutoEnc_zgunbqcb7fkflwrnjdprpvr44e ReEncodeFont" <[ebgm_zgunbq.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tlf-swash-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_7o6wggmtb7dgdzshbotsm6ev6e ReEncodeFont" <[ebgm_7o6wgg.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tlf-swash-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_jedt67oelb6rdrfkeehbyf76yc ReEncodeFont" <[ebgm_jedt67.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tlf-swash-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_e3brkzvtzp2dmfzg7e54unqplf ReEncodeFont" <[ebgm_e3brkz.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tlf-titling-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_noegxq6wd4gmgm3wclekae5l7c ReEncodeFont" <[ebgm_noegxq.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tlf-titling-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_yyibz2pthfaij2igwb6xmc3hga ReEncodeFont" <[ebgm_yyibz2.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tlf-titling-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_47dl7gl2zcuwieqidajvjqlu7b ReEncodeFont" <[ebgm_47dl7g.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tlf-ts1--base EBGaramond-ExtraBoldItalic "AutoEnc_doset5jni7ptstijeczbezqvvd ReEncodeFont" <[ebgm_doset5.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-sup-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_oge4zeph4qgrf2eqipj4avd4uf ReEncodeFont" <[ebgm_oge4ze.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-sup-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_bszlvlk6bkouv7yc5pd5xqbgld ReEncodeFont" <[ebgm_bszlvl.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-sup-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_ob4q4uwnlaqyztqz2q3odaf6zc ReEncodeFont" <[ebgm_ob4q4u.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-lf-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_noegxq6wd4gmgm3wclekae5l7c ReEncodeFont" <[ebgm_noegxq.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-lf-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_yyibz2pthfaij2igwb6xmc3hga ReEncodeFont" <[ebgm_yyibz2.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-lf-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_hlpoevvpzwoif6oa4heawahthf ReEncodeFont" <[ebgm_hlpoev.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-lf-sc-ot1--base EBGaramond-ExtraBoldItalic "AutoEnc_qip76aljekhkapltnlznjm26tg ReEncodeFont" <[ebgm_qip76a.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-lf-sc-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_xoskheoavizix7q6vfcc7k34cd ReEncodeFont" <[ebgm_xoskhe.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-lf-sc-ly1--base EBGaramond-ExtraBoldItalic "AutoEnc_qckgozlkzjupumu2bsotgllzze ReEncodeFont" <[ebgm_qckgoz.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-lf-swash-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_j2gtbmvgspjsuvuvqshaglweuf ReEncodeFont" <[ebgm_j2gtbm.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-lf-swash-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_izfhxe343lr4odwp7tsz42dm6b ReEncodeFont" <[ebgm_izfhxe.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-lf-swash-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_uxrhpxwyh3rtb7wdsbfy3dpeba ReEncodeFont" <[ebgm_uxrhpx.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-lf-titling-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_noegxq6wd4gmgm3wclekae5l7c ReEncodeFont" <[ebgm_noegxq.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-lf-titling-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_yyibz2pthfaij2igwb6xmc3hga ReEncodeFont" <[ebgm_yyibz2.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-lf-titling-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_hlpoevvpzwoif6oa4heawahthf ReEncodeFont" <[ebgm_hlpoev.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-lf-ts1--base EBGaramond-ExtraBoldItalic "AutoEnc_yddfsneogpgfw3a5axgk6w34nc ReEncodeFont" <[ebgm_yddfsn.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tosf-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_c4ggcorthinbys2wmpe4bwpsqg ReEncodeFont" <[ebgm_c4ggco.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tosf-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_joewosxhna5pwkrt2zs5xfsd5e ReEncodeFont" <[ebgm_joewos.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tosf-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_lvcw6s3b76hfhdwvawjigeyj4f ReEncodeFont" <[ebgm_lvcw6s.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tosf-sc-ot1--base EBGaramond-ExtraBoldItalic "AutoEnc_vqv3w3jddu2yz2dnmvvx2bbzrd ReEncodeFont" <[ebgm_vqv3w3.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tosf-sc-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_nhfy4vcyskj4jwrirusa4olqia ReEncodeFont" <[ebgm_nhfy4v.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tosf-sc-ly1--base EBGaramond-ExtraBoldItalic "AutoEnc_slocg6iashfkchrd7dvhgvyphh ReEncodeFont" <[ebgm_slocg6.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tosf-swash-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_j66zy62stilrgvoep4apdi3znb ReEncodeFont" <[ebgm_j66zy6.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tosf-swash-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_5tyv6cssgdji45lwui2by7br4e ReEncodeFont" <[ebgm_5tyv6c.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tosf-swash-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_5vgwa5l3cgabvwoexj6dqg4sfc ReEncodeFont" <[ebgm_5vgwa5.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-tosf-ts1--base EBGaramond-ExtraBoldItalic "AutoEnc_doset5jni7ptstijeczbezqvvd ReEncodeFont" <[ebgm_doset5.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-osf-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_z6dm7r4nubrhdvpbh46enrdtlf ReEncodeFont" <[ebgm_z6dm7r.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-osf-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_ontdi6jpylpknbkaf3n2ljk6xh ReEncodeFont" <[ebgm_ontdi6.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-osf-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_qnljitgqyb2s65dexixymiibaa ReEncodeFont" <[ebgm_qnljit.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-osf-sc-ot1--base EBGaramond-ExtraBoldItalic "AutoEnc_egoty6wpchcoxueschnlw73q6d ReEncodeFont" <[ebgm_egoty6.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-osf-sc-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_byuynix5r46fcpi7yc7qekcpbh ReEncodeFont" <[ebgm_byuyni.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-osf-sc-ly1--base EBGaramond-ExtraBoldItalic "AutoEnc_2xdej53vfkjumr6wkun3igxjtf ReEncodeFont" <[ebgm_2xdej5.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-osf-swash-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_fjpe6p45raoyul6jro4b6sespb ReEncodeFont" <[ebgm_fjpe6p.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-osf-swash-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_ptk5mdcvitdzngtmcofsfhbteh ReEncodeFont" <[ebgm_ptk5md.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-osf-swash-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_mvrjgh5lp7hs4pp6ibvztkssbg ReEncodeFont" <[ebgm_mvrjgh.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBoldItalic-osf-ts1--base EBGaramond-ExtraBoldItalic "AutoEnc_yddfsneogpgfw3a5axgk6w34nc ReEncodeFont" <[ebgm_yddfsn.enc <EBGaramond-ExtraBoldItalic.pfb
-EBGaramond-ExtraBold-tlf-ot1 EBGaramond-ExtraBold "AutoEnc_abyljl7ktazwzcff7pualhlsce ReEncodeFont" <[ebgm_abyljl.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tlf-t1--base EBGaramond-ExtraBold "AutoEnc_mj3jkqegiifwkp7tg5srucvlef ReEncodeFont" <[ebgm_mj3jkq.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tlf-ly1 EBGaramond-ExtraBold "AutoEnc_m26xaf4sayh4v43g2oxpc5fvfd ReEncodeFont" <[ebgm_m26xaf.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tlf-sc-ot1--base EBGaramond-ExtraBold "AutoEnc_s7tpqtebt7fpaobhsv7o6g6p3d ReEncodeFont" <[ebgm_s7tpqt.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tlf-sc-t1--base EBGaramond-ExtraBold "AutoEnc_yjkoc2bxtyk5pymwhoiyarwopd ReEncodeFont" <[ebgm_yjkoc2.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tlf-sc-ly1--base EBGaramond-ExtraBold "AutoEnc_54ujiwtzv6tvhvfi6tvpkznylc ReEncodeFont" <[ebgm_54ujiw.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tlf-swash-ot1 EBGaramond-ExtraBold "AutoEnc_dmjlsehjhqubkrychxdeweizch ReEncodeFont" <[ebgm_dmjlse.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tlf-swash-t1--base EBGaramond-ExtraBold "AutoEnc_tbwoonnbhlwtlye7tm73jktpib ReEncodeFont" <[ebgm_tbwoon.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tlf-swash-ly1 EBGaramond-ExtraBold "AutoEnc_qnvfe4fijcsnkkj3bzt4y4wygd ReEncodeFont" <[ebgm_qnvfe4.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tlf-titling-ot1 EBGaramond-ExtraBold "AutoEnc_wsnb7le2poeyznztvx6b35j2ob ReEncodeFont" <[ebgm_wsnb7l.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tlf-titling-t1--base EBGaramond-ExtraBold "AutoEnc_xxcxg56g42snddornzdfpksj3c ReEncodeFont" <[ebgm_xxcxg5.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tlf-titling-ly1 EBGaramond-ExtraBold "AutoEnc_uj47dd2cdpqks5burrjhiwibgc ReEncodeFont" <[ebgm_uj47dd.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tlf-ts1--base EBGaramond-ExtraBold "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-sup-ot1 EBGaramond-ExtraBold "AutoEnc_oge4zeph4qgrf2eqipj4avd4uf ReEncodeFont" <[ebgm_oge4ze.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-sup-t1--base EBGaramond-ExtraBold "AutoEnc_bszlvlk6bkouv7yc5pd5xqbgld ReEncodeFont" <[ebgm_bszlvl.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-sup-ly1 EBGaramond-ExtraBold "AutoEnc_ob4q4uwnlaqyztqz2q3odaf6zc ReEncodeFont" <[ebgm_ob4q4u.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-lf-ot1 EBGaramond-ExtraBold "AutoEnc_wsnb7le2poeyznztvx6b35j2ob ReEncodeFont" <[ebgm_wsnb7l.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-lf-t1--base EBGaramond-ExtraBold "AutoEnc_xxcxg56g42snddornzdfpksj3c ReEncodeFont" <[ebgm_xxcxg5.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-lf-ly1 EBGaramond-ExtraBold "AutoEnc_uj47dd2cdpqks5burrjhiwibgc ReEncodeFont" <[ebgm_uj47dd.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-lf-sc-ot1--base EBGaramond-ExtraBold "AutoEnc_qip76aljekhkapltnlznjm26tg ReEncodeFont" <[ebgm_qip76a.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-lf-sc-t1--base EBGaramond-ExtraBold "AutoEnc_xoskheoavizix7q6vfcc7k34cd ReEncodeFont" <[ebgm_xoskhe.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-lf-sc-ly1--base EBGaramond-ExtraBold "AutoEnc_qckgozlkzjupumu2bsotgllzze ReEncodeFont" <[ebgm_qckgoz.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-lf-swash-ot1 EBGaramond-ExtraBold "AutoEnc_rbkzluvbsijxcubauk4dxo24od ReEncodeFont" <[ebgm_rbkzlu.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-lf-swash-t1--base EBGaramond-ExtraBold "AutoEnc_yow7vovfjroqgqn2odhltdg34d ReEncodeFont" <[ebgm_yow7vo.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-lf-swash-ly1 EBGaramond-ExtraBold "AutoEnc_6napgq6etqab6jxvgs7tt46mpf ReEncodeFont" <[ebgm_6napgq.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-lf-titling-ot1 EBGaramond-ExtraBold "AutoEnc_wsnb7le2poeyznztvx6b35j2ob ReEncodeFont" <[ebgm_wsnb7l.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-lf-titling-t1--base EBGaramond-ExtraBold "AutoEnc_xxcxg56g42snddornzdfpksj3c ReEncodeFont" <[ebgm_xxcxg5.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-lf-titling-ly1 EBGaramond-ExtraBold "AutoEnc_uj47dd2cdpqks5burrjhiwibgc ReEncodeFont" <[ebgm_uj47dd.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-lf-ts1--base EBGaramond-ExtraBold "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tosf-ot1 EBGaramond-ExtraBold "AutoEnc_rs3zoq2p2wr5xazf3giqkujald ReEncodeFont" <[ebgm_rs3zoq.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tosf-t1--base EBGaramond-ExtraBold "AutoEnc_7zbjebv47f5uy63yxgbxijljze ReEncodeFont" <[ebgm_7zbjeb.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tosf-ly1 EBGaramond-ExtraBold "AutoEnc_j2xr5dq6tgxurfw6n4h7uu2xxg ReEncodeFont" <[ebgm_j2xr5d.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tosf-sc-ot1--base EBGaramond-ExtraBold "AutoEnc_vqv3w3jddu2yz2dnmvvx2bbzrd ReEncodeFont" <[ebgm_vqv3w3.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tosf-sc-t1--base EBGaramond-ExtraBold "AutoEnc_nhfy4vcyskj4jwrirusa4olqia ReEncodeFont" <[ebgm_nhfy4v.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tosf-sc-ly1--base EBGaramond-ExtraBold "AutoEnc_pnjcqfp4hcsltp7rqnhqbb2xmb ReEncodeFont" <[ebgm_pnjcqf.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tosf-swash-ot1 EBGaramond-ExtraBold "AutoEnc_jyhls2hpbu2hzgel7zzhv7frgh ReEncodeFont" <[ebgm_jyhls2.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tosf-swash-t1--base EBGaramond-ExtraBold "AutoEnc_3e4qg265j6ebr4p4pe7kwxf2tf ReEncodeFont" <[ebgm_3e4qg2.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tosf-swash-ly1 EBGaramond-ExtraBold "AutoEnc_ioh3dpo5o56gxrlonlq4ni3eyd ReEncodeFont" <[ebgm_ioh3dp.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-tosf-ts1--base EBGaramond-ExtraBold "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-osf-ot1 EBGaramond-ExtraBold "AutoEnc_nxqm357krn5asjgj4l52s7fwme ReEncodeFont" <[ebgm_nxqm35.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-osf-t1--base EBGaramond-ExtraBold "AutoEnc_a253pkmthtvztt2cy25s6mg7ne ReEncodeFont" <[ebgm_a253pk.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-osf-ly1 EBGaramond-ExtraBold "AutoEnc_23xtnovqxod3edsnez3ckhvjda ReEncodeFont" <[ebgm_23xtno.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-osf-sc-ot1--base EBGaramond-ExtraBold "AutoEnc_egoty6wpchcoxueschnlw73q6d ReEncodeFont" <[ebgm_egoty6.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-osf-sc-t1--base EBGaramond-ExtraBold "AutoEnc_byuynix5r46fcpi7yc7qekcpbh ReEncodeFont" <[ebgm_byuyni.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-osf-sc-ly1--base EBGaramond-ExtraBold "AutoEnc_2xdej53vfkjumr6wkun3igxjtf ReEncodeFont" <[ebgm_2xdej5.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-osf-swash-ot1 EBGaramond-ExtraBold "AutoEnc_t4t3wmxarqpqo4t5vwiyucfrpa ReEncodeFont" <[ebgm_t4t3wm.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-osf-swash-t1--base EBGaramond-ExtraBold "AutoEnc_zjrm7oiav7ih6lgry4bga5rocb ReEncodeFont" <[ebgm_zjrm7o.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-osf-swash-ly1 EBGaramond-ExtraBold "AutoEnc_mnvma6c2scz5splrrrlgnwdtzc ReEncodeFont" <[ebgm_mnvma6.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-ExtraBold-osf-ts1--base EBGaramond-ExtraBold "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-Regular-tlf-ot1 EBGaramond-Regular "AutoEnc_abyljl7ktazwzcff7pualhlsce ReEncodeFont" <[ebgm_abyljl.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tlf-t1--base EBGaramond-Regular "AutoEnc_mj3jkqegiifwkp7tg5srucvlef ReEncodeFont" <[ebgm_mj3jkq.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tlf-ly1 EBGaramond-Regular "AutoEnc_m26xaf4sayh4v43g2oxpc5fvfd ReEncodeFont" <[ebgm_m26xaf.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tlf-sc-ot1--base EBGaramond-Regular "AutoEnc_s7tpqtebt7fpaobhsv7o6g6p3d ReEncodeFont" <[ebgm_s7tpqt.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tlf-sc-t1--base EBGaramond-Regular "AutoEnc_yjkoc2bxtyk5pymwhoiyarwopd ReEncodeFont" <[ebgm_yjkoc2.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tlf-sc-ly1--base EBGaramond-Regular "AutoEnc_54ujiwtzv6tvhvfi6tvpkznylc ReEncodeFont" <[ebgm_54ujiw.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tlf-swash-ot1 EBGaramond-Regular "AutoEnc_dmjlsehjhqubkrychxdeweizch ReEncodeFont" <[ebgm_dmjlse.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tlf-swash-t1--base EBGaramond-Regular "AutoEnc_tbwoonnbhlwtlye7tm73jktpib ReEncodeFont" <[ebgm_tbwoon.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tlf-swash-ly1 EBGaramond-Regular "AutoEnc_qnvfe4fijcsnkkj3bzt4y4wygd ReEncodeFont" <[ebgm_qnvfe4.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tlf-titling-ot1 EBGaramond-Regular "AutoEnc_wsnb7le2poeyznztvx6b35j2ob ReEncodeFont" <[ebgm_wsnb7l.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tlf-titling-t1--base EBGaramond-Regular "AutoEnc_xxcxg56g42snddornzdfpksj3c ReEncodeFont" <[ebgm_xxcxg5.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tlf-titling-ly1 EBGaramond-Regular "AutoEnc_uj47dd2cdpqks5burrjhiwibgc ReEncodeFont" <[ebgm_uj47dd.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tlf-ts1--base EBGaramond-Regular "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-inf-ot1 EBGaramond-Regular "AutoEnc_ao6kf7czm3kxufroii6io2txyb ReEncodeFont" <[ebgm_ao6kf7.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-inf-t1--base EBGaramond-Regular "AutoEnc_kfeykpdkdkfgcmiob2alq76d6b ReEncodeFont" <[ebgm_kfeykp.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-inf-ly1 EBGaramond-Regular "AutoEnc_muwakt4d7zffh35b2q6vpr7ucg ReEncodeFont" <[ebgm_muwakt.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-sup-ot1 EBGaramond-Regular "AutoEnc_oge4zeph4qgrf2eqipj4avd4uf ReEncodeFont" <[ebgm_oge4ze.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-sup-t1--base EBGaramond-Regular "AutoEnc_bszlvlk6bkouv7yc5pd5xqbgld ReEncodeFont" <[ebgm_bszlvl.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-sup-ly1 EBGaramond-Regular "AutoEnc_ob4q4uwnlaqyztqz2q3odaf6zc ReEncodeFont" <[ebgm_ob4q4u.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-lf-ot1 EBGaramond-Regular "AutoEnc_wsnb7le2poeyznztvx6b35j2ob ReEncodeFont" <[ebgm_wsnb7l.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-lf-t1--base EBGaramond-Regular "AutoEnc_xxcxg56g42snddornzdfpksj3c ReEncodeFont" <[ebgm_xxcxg5.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-lf-ly1 EBGaramond-Regular "AutoEnc_uj47dd2cdpqks5burrjhiwibgc ReEncodeFont" <[ebgm_uj47dd.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-lf-sc-ot1--base EBGaramond-Regular "AutoEnc_qip76aljekhkapltnlznjm26tg ReEncodeFont" <[ebgm_qip76a.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-lf-sc-t1--base EBGaramond-Regular "AutoEnc_xoskheoavizix7q6vfcc7k34cd ReEncodeFont" <[ebgm_xoskhe.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-lf-sc-ly1--base EBGaramond-Regular "AutoEnc_qckgozlkzjupumu2bsotgllzze ReEncodeFont" <[ebgm_qckgoz.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-lf-swash-ot1 EBGaramond-Regular "AutoEnc_rbkzluvbsijxcubauk4dxo24od ReEncodeFont" <[ebgm_rbkzlu.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-lf-swash-t1--base EBGaramond-Regular "AutoEnc_yow7vovfjroqgqn2odhltdg34d ReEncodeFont" <[ebgm_yow7vo.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-lf-swash-ly1 EBGaramond-Regular "AutoEnc_6napgq6etqab6jxvgs7tt46mpf ReEncodeFont" <[ebgm_6napgq.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-lf-titling-ot1 EBGaramond-Regular "AutoEnc_wsnb7le2poeyznztvx6b35j2ob ReEncodeFont" <[ebgm_wsnb7l.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-lf-titling-t1--base EBGaramond-Regular "AutoEnc_xxcxg56g42snddornzdfpksj3c ReEncodeFont" <[ebgm_xxcxg5.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-lf-titling-ly1 EBGaramond-Regular "AutoEnc_uj47dd2cdpqks5burrjhiwibgc ReEncodeFont" <[ebgm_uj47dd.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-lf-ts1--base EBGaramond-Regular "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tosf-ot1 EBGaramond-Regular "AutoEnc_rs3zoq2p2wr5xazf3giqkujald ReEncodeFont" <[ebgm_rs3zoq.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tosf-t1--base EBGaramond-Regular "AutoEnc_7zbjebv47f5uy63yxgbxijljze ReEncodeFont" <[ebgm_7zbjeb.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tosf-ly1 EBGaramond-Regular "AutoEnc_j2xr5dq6tgxurfw6n4h7uu2xxg ReEncodeFont" <[ebgm_j2xr5d.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tosf-sc-ot1--base EBGaramond-Regular "AutoEnc_vqv3w3jddu2yz2dnmvvx2bbzrd ReEncodeFont" <[ebgm_vqv3w3.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tosf-sc-t1--base EBGaramond-Regular "AutoEnc_nhfy4vcyskj4jwrirusa4olqia ReEncodeFont" <[ebgm_nhfy4v.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tosf-sc-ly1--base EBGaramond-Regular "AutoEnc_pnjcqfp4hcsltp7rqnhqbb2xmb ReEncodeFont" <[ebgm_pnjcqf.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tosf-swash-ot1 EBGaramond-Regular "AutoEnc_jyhls2hpbu2hzgel7zzhv7frgh ReEncodeFont" <[ebgm_jyhls2.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tosf-swash-t1--base EBGaramond-Regular "AutoEnc_3e4qg265j6ebr4p4pe7kwxf2tf ReEncodeFont" <[ebgm_3e4qg2.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tosf-swash-ly1 EBGaramond-Regular "AutoEnc_ioh3dpo5o56gxrlonlq4ni3eyd ReEncodeFont" <[ebgm_ioh3dp.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-tosf-ts1--base EBGaramond-Regular "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-osf-ot1 EBGaramond-Regular "AutoEnc_nxqm357krn5asjgj4l52s7fwme ReEncodeFont" <[ebgm_nxqm35.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-osf-t1--base EBGaramond-Regular "AutoEnc_a253pkmthtvztt2cy25s6mg7ne ReEncodeFont" <[ebgm_a253pk.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-osf-ly1 EBGaramond-Regular "AutoEnc_23xtnovqxod3edsnez3ckhvjda ReEncodeFont" <[ebgm_23xtno.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-osf-sc-ot1--base EBGaramond-Regular "AutoEnc_egoty6wpchcoxueschnlw73q6d ReEncodeFont" <[ebgm_egoty6.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-osf-sc-t1--base EBGaramond-Regular "AutoEnc_byuynix5r46fcpi7yc7qekcpbh ReEncodeFont" <[ebgm_byuyni.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-osf-sc-ly1--base EBGaramond-Regular "AutoEnc_2xdej53vfkjumr6wkun3igxjtf ReEncodeFont" <[ebgm_2xdej5.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-osf-swash-ot1 EBGaramond-Regular "AutoEnc_t4t3wmxarqpqo4t5vwiyucfrpa ReEncodeFont" <[ebgm_t4t3wm.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-osf-swash-t1--base EBGaramond-Regular "AutoEnc_zjrm7oiav7ih6lgry4bga5rocb ReEncodeFont" <[ebgm_zjrm7o.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-osf-swash-ly1 EBGaramond-Regular "AutoEnc_mnvma6c2scz5splrrrlgnwdtzc ReEncodeFont" <[ebgm_mnvma6.enc <EBGaramond-Regular.pfb
+EBGaramond-Regular-osf-ts1--base EBGaramond-Regular "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-Regular.pfb
 EBGaramond-Italic-tlf-ot1 EBGaramond-Italic "AutoEnc_cjjoj4mzlh573qpscv7zdqq5pc ReEncodeFont" <[ebgm_cjjoj4.enc <EBGaramond-Italic.pfb
 EBGaramond-Italic-tlf-t1--base EBGaramond-Italic "AutoEnc_wxmaa65amjqjpn7vhj2bjdqx3a ReEncodeFont" <[ebgm_wxmaa6.enc <EBGaramond-Italic.pfb
 EBGaramond-Italic-tlf-ly1 EBGaramond-Italic "AutoEnc_dto4r5hkfdywrp623q2mbc3u3g ReEncodeFont" <[ebgm_dto4r5.enc <EBGaramond-Italic.pfb
@@ -160,6 +65,9 @@ EBGaramond-Italic-tlf-titling-ot1 EBGaramond-Italic "AutoEnc_noegxq6wd4gmgm3wcle
 EBGaramond-Italic-tlf-titling-t1--base EBGaramond-Italic "AutoEnc_yyibz2pthfaij2igwb6xmc3hga ReEncodeFont" <[ebgm_yyibz2.enc <EBGaramond-Italic.pfb
 EBGaramond-Italic-tlf-titling-ly1 EBGaramond-Italic "AutoEnc_47dl7gl2zcuwieqidajvjqlu7b ReEncodeFont" <[ebgm_47dl7g.enc <EBGaramond-Italic.pfb
 EBGaramond-Italic-tlf-ts1--base EBGaramond-Italic "AutoEnc_doset5jni7ptstijeczbezqvvd ReEncodeFont" <[ebgm_doset5.enc <EBGaramond-Italic.pfb
+EBGaramond-Italic-inf-ot1 EBGaramond-Italic "AutoEnc_ao6kf7czm3kxufroii6io2txyb ReEncodeFont" <[ebgm_ao6kf7.enc <EBGaramond-Italic.pfb
+EBGaramond-Italic-inf-t1--base EBGaramond-Italic "AutoEnc_kfeykpdkdkfgcmiob2alq76d6b ReEncodeFont" <[ebgm_kfeykp.enc <EBGaramond-Italic.pfb
+EBGaramond-Italic-inf-ly1 EBGaramond-Italic "AutoEnc_muwakt4d7zffh35b2q6vpr7ucg ReEncodeFont" <[ebgm_muwakt.enc <EBGaramond-Italic.pfb
 EBGaramond-Italic-sup-ot1 EBGaramond-Italic "AutoEnc_oge4zeph4qgrf2eqipj4avd4uf ReEncodeFont" <[ebgm_oge4ze.enc <EBGaramond-Italic.pfb
 EBGaramond-Italic-sup-t1--base EBGaramond-Italic "AutoEnc_bszlvlk6bkouv7yc5pd5xqbgld ReEncodeFont" <[ebgm_bszlvl.enc <EBGaramond-Italic.pfb
 EBGaramond-Italic-sup-ly1 EBGaramond-Italic "AutoEnc_ob4q4uwnlaqyztqz2q3odaf6zc ReEncodeFont" <[ebgm_ob4q4u.enc <EBGaramond-Italic.pfb
@@ -196,55 +104,6 @@ EBGaramond-Italic-osf-swash-ot1 EBGaramond-Italic "AutoEnc_fjpe6p45raoyul6jro4b6
 EBGaramond-Italic-osf-swash-t1--base EBGaramond-Italic "AutoEnc_ptk5mdcvitdzngtmcofsfhbteh ReEncodeFont" <[ebgm_ptk5md.enc <EBGaramond-Italic.pfb
 EBGaramond-Italic-osf-swash-ly1 EBGaramond-Italic "AutoEnc_mvrjgh5lp7hs4pp6ibvztkssbg ReEncodeFont" <[ebgm_mvrjgh.enc <EBGaramond-Italic.pfb
 EBGaramond-Italic-osf-ts1--base EBGaramond-Italic "AutoEnc_yddfsneogpgfw3a5axgk6w34nc ReEncodeFont" <[ebgm_yddfsn.enc <EBGaramond-Italic.pfb
-EBGaramond-MediumItalic-tlf-ot1 EBGaramond-MediumItalic "AutoEnc_cjjoj4mzlh573qpscv7zdqq5pc ReEncodeFont" <[ebgm_cjjoj4.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tlf-t1--base EBGaramond-MediumItalic "AutoEnc_wxmaa65amjqjpn7vhj2bjdqx3a ReEncodeFont" <[ebgm_wxmaa6.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tlf-ly1 EBGaramond-MediumItalic "AutoEnc_dto4r5hkfdywrp623q2mbc3u3g ReEncodeFont" <[ebgm_dto4r5.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tlf-sc-ot1--base EBGaramond-MediumItalic "AutoEnc_s7tpqtebt7fpaobhsv7o6g6p3d ReEncodeFont" <[ebgm_s7tpqt.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tlf-sc-t1--base EBGaramond-MediumItalic "AutoEnc_yjkoc2bxtyk5pymwhoiyarwopd ReEncodeFont" <[ebgm_yjkoc2.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tlf-sc-ly1--base EBGaramond-MediumItalic "AutoEnc_zgunbqcb7fkflwrnjdprpvr44e ReEncodeFont" <[ebgm_zgunbq.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tlf-swash-ot1 EBGaramond-MediumItalic "AutoEnc_7o6wggmtb7dgdzshbotsm6ev6e ReEncodeFont" <[ebgm_7o6wgg.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tlf-swash-t1--base EBGaramond-MediumItalic "AutoEnc_jedt67oelb6rdrfkeehbyf76yc ReEncodeFont" <[ebgm_jedt67.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tlf-swash-ly1 EBGaramond-MediumItalic "AutoEnc_e3brkzvtzp2dmfzg7e54unqplf ReEncodeFont" <[ebgm_e3brkz.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tlf-titling-ot1 EBGaramond-MediumItalic "AutoEnc_noegxq6wd4gmgm3wclekae5l7c ReEncodeFont" <[ebgm_noegxq.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tlf-titling-t1--base EBGaramond-MediumItalic "AutoEnc_yyibz2pthfaij2igwb6xmc3hga ReEncodeFont" <[ebgm_yyibz2.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tlf-titling-ly1 EBGaramond-MediumItalic "AutoEnc_47dl7gl2zcuwieqidajvjqlu7b ReEncodeFont" <[ebgm_47dl7g.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tlf-ts1--base EBGaramond-MediumItalic "AutoEnc_doset5jni7ptstijeczbezqvvd ReEncodeFont" <[ebgm_doset5.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-sup-ot1 EBGaramond-MediumItalic "AutoEnc_oge4zeph4qgrf2eqipj4avd4uf ReEncodeFont" <[ebgm_oge4ze.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-sup-t1--base EBGaramond-MediumItalic "AutoEnc_bszlvlk6bkouv7yc5pd5xqbgld ReEncodeFont" <[ebgm_bszlvl.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-sup-ly1 EBGaramond-MediumItalic "AutoEnc_ob4q4uwnlaqyztqz2q3odaf6zc ReEncodeFont" <[ebgm_ob4q4u.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-lf-ot1 EBGaramond-MediumItalic "AutoEnc_noegxq6wd4gmgm3wclekae5l7c ReEncodeFont" <[ebgm_noegxq.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-lf-t1--base EBGaramond-MediumItalic "AutoEnc_yyibz2pthfaij2igwb6xmc3hga ReEncodeFont" <[ebgm_yyibz2.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-lf-ly1 EBGaramond-MediumItalic "AutoEnc_hlpoevvpzwoif6oa4heawahthf ReEncodeFont" <[ebgm_hlpoev.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-lf-sc-ot1--base EBGaramond-MediumItalic "AutoEnc_qip76aljekhkapltnlznjm26tg ReEncodeFont" <[ebgm_qip76a.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-lf-sc-t1--base EBGaramond-MediumItalic "AutoEnc_xoskheoavizix7q6vfcc7k34cd ReEncodeFont" <[ebgm_xoskhe.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-lf-sc-ly1--base EBGaramond-MediumItalic "AutoEnc_qckgozlkzjupumu2bsotgllzze ReEncodeFont" <[ebgm_qckgoz.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-lf-swash-ot1 EBGaramond-MediumItalic "AutoEnc_j2gtbmvgspjsuvuvqshaglweuf ReEncodeFont" <[ebgm_j2gtbm.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-lf-swash-t1--base EBGaramond-MediumItalic "AutoEnc_izfhxe343lr4odwp7tsz42dm6b ReEncodeFont" <[ebgm_izfhxe.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-lf-swash-ly1 EBGaramond-MediumItalic "AutoEnc_uxrhpxwyh3rtb7wdsbfy3dpeba ReEncodeFont" <[ebgm_uxrhpx.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-lf-titling-ot1 EBGaramond-MediumItalic "AutoEnc_noegxq6wd4gmgm3wclekae5l7c ReEncodeFont" <[ebgm_noegxq.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-lf-titling-t1--base EBGaramond-MediumItalic "AutoEnc_yyibz2pthfaij2igwb6xmc3hga ReEncodeFont" <[ebgm_yyibz2.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-lf-titling-ly1 EBGaramond-MediumItalic "AutoEnc_hlpoevvpzwoif6oa4heawahthf ReEncodeFont" <[ebgm_hlpoev.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-lf-ts1--base EBGaramond-MediumItalic "AutoEnc_yddfsneogpgfw3a5axgk6w34nc ReEncodeFont" <[ebgm_yddfsn.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tosf-ot1 EBGaramond-MediumItalic "AutoEnc_c4ggcorthinbys2wmpe4bwpsqg ReEncodeFont" <[ebgm_c4ggco.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tosf-t1--base EBGaramond-MediumItalic "AutoEnc_joewosxhna5pwkrt2zs5xfsd5e ReEncodeFont" <[ebgm_joewos.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tosf-ly1 EBGaramond-MediumItalic "AutoEnc_lvcw6s3b76hfhdwvawjigeyj4f ReEncodeFont" <[ebgm_lvcw6s.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tosf-sc-ot1--base EBGaramond-MediumItalic "AutoEnc_vqv3w3jddu2yz2dnmvvx2bbzrd ReEncodeFont" <[ebgm_vqv3w3.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tosf-sc-t1--base EBGaramond-MediumItalic "AutoEnc_nhfy4vcyskj4jwrirusa4olqia ReEncodeFont" <[ebgm_nhfy4v.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tosf-sc-ly1--base EBGaramond-MediumItalic "AutoEnc_slocg6iashfkchrd7dvhgvyphh ReEncodeFont" <[ebgm_slocg6.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tosf-swash-ot1 EBGaramond-MediumItalic "AutoEnc_j66zy62stilrgvoep4apdi3znb ReEncodeFont" <[ebgm_j66zy6.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tosf-swash-t1--base EBGaramond-MediumItalic "AutoEnc_5tyv6cssgdji45lwui2by7br4e ReEncodeFont" <[ebgm_5tyv6c.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tosf-swash-ly1 EBGaramond-MediumItalic "AutoEnc_5vgwa5l3cgabvwoexj6dqg4sfc ReEncodeFont" <[ebgm_5vgwa5.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-tosf-ts1--base EBGaramond-MediumItalic "AutoEnc_doset5jni7ptstijeczbezqvvd ReEncodeFont" <[ebgm_doset5.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-osf-ot1 EBGaramond-MediumItalic "AutoEnc_z6dm7r4nubrhdvpbh46enrdtlf ReEncodeFont" <[ebgm_z6dm7r.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-osf-t1--base EBGaramond-MediumItalic "AutoEnc_ontdi6jpylpknbkaf3n2ljk6xh ReEncodeFont" <[ebgm_ontdi6.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-osf-ly1 EBGaramond-MediumItalic "AutoEnc_qnljitgqyb2s65dexixymiibaa ReEncodeFont" <[ebgm_qnljit.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-osf-sc-ot1--base EBGaramond-MediumItalic "AutoEnc_egoty6wpchcoxueschnlw73q6d ReEncodeFont" <[ebgm_egoty6.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-osf-sc-t1--base EBGaramond-MediumItalic "AutoEnc_byuynix5r46fcpi7yc7qekcpbh ReEncodeFont" <[ebgm_byuyni.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-osf-sc-ly1--base EBGaramond-MediumItalic "AutoEnc_2xdej53vfkjumr6wkun3igxjtf ReEncodeFont" <[ebgm_2xdej5.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-osf-swash-ot1 EBGaramond-MediumItalic "AutoEnc_fjpe6p45raoyul6jro4b6sespb ReEncodeFont" <[ebgm_fjpe6p.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-osf-swash-t1--base EBGaramond-MediumItalic "AutoEnc_ptk5mdcvitdzngtmcofsfhbteh ReEncodeFont" <[ebgm_ptk5md.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-osf-swash-ly1 EBGaramond-MediumItalic "AutoEnc_mvrjgh5lp7hs4pp6ibvztkssbg ReEncodeFont" <[ebgm_mvrjgh.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-osf-ts1--base EBGaramond-MediumItalic "AutoEnc_yddfsneogpgfw3a5axgk6w34nc ReEncodeFont" <[ebgm_yddfsn.enc <EBGaramond-MediumItalic.pfb
 EBGaramond-Medium-tlf-ot1 EBGaramond-Medium "AutoEnc_abyljl7ktazwzcff7pualhlsce ReEncodeFont" <[ebgm_abyljl.enc <EBGaramond-Medium.pfb
 EBGaramond-Medium-tlf-t1--base EBGaramond-Medium "AutoEnc_mj3jkqegiifwkp7tg5srucvlef ReEncodeFont" <[ebgm_mj3jkq.enc <EBGaramond-Medium.pfb
 EBGaramond-Medium-tlf-ly1 EBGaramond-Medium "AutoEnc_m26xaf4sayh4v43g2oxpc5fvfd ReEncodeFont" <[ebgm_m26xaf.enc <EBGaramond-Medium.pfb
@@ -258,6 +117,9 @@ EBGaramond-Medium-tlf-titling-ot1 EBGaramond-Medium "AutoEnc_wsnb7le2poeyznztvx6
 EBGaramond-Medium-tlf-titling-t1--base EBGaramond-Medium "AutoEnc_xxcxg56g42snddornzdfpksj3c ReEncodeFont" <[ebgm_xxcxg5.enc <EBGaramond-Medium.pfb
 EBGaramond-Medium-tlf-titling-ly1 EBGaramond-Medium "AutoEnc_uj47dd2cdpqks5burrjhiwibgc ReEncodeFont" <[ebgm_uj47dd.enc <EBGaramond-Medium.pfb
 EBGaramond-Medium-tlf-ts1--base EBGaramond-Medium "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-Medium.pfb
+EBGaramond-Medium-inf-ot1 EBGaramond-Medium "AutoEnc_ao6kf7czm3kxufroii6io2txyb ReEncodeFont" <[ebgm_ao6kf7.enc <EBGaramond-Medium.pfb
+EBGaramond-Medium-inf-t1--base EBGaramond-Medium "AutoEnc_kfeykpdkdkfgcmiob2alq76d6b ReEncodeFont" <[ebgm_kfeykp.enc <EBGaramond-Medium.pfb
+EBGaramond-Medium-inf-ly1 EBGaramond-Medium "AutoEnc_muwakt4d7zffh35b2q6vpr7ucg ReEncodeFont" <[ebgm_muwakt.enc <EBGaramond-Medium.pfb
 EBGaramond-Medium-sup-ot1 EBGaramond-Medium "AutoEnc_oge4zeph4qgrf2eqipj4avd4uf ReEncodeFont" <[ebgm_oge4ze.enc <EBGaramond-Medium.pfb
 EBGaramond-Medium-sup-t1--base EBGaramond-Medium "AutoEnc_bszlvlk6bkouv7yc5pd5xqbgld ReEncodeFont" <[ebgm_bszlvl.enc <EBGaramond-Medium.pfb
 EBGaramond-Medium-sup-ly1 EBGaramond-Medium "AutoEnc_ob4q4uwnlaqyztqz2q3odaf6zc ReEncodeFont" <[ebgm_ob4q4u.enc <EBGaramond-Medium.pfb
@@ -294,55 +156,58 @@ EBGaramond-Medium-osf-swash-ot1 EBGaramond-Medium "AutoEnc_t4t3wmxarqpqo4t5vwiyu
 EBGaramond-Medium-osf-swash-t1--base EBGaramond-Medium "AutoEnc_zjrm7oiav7ih6lgry4bga5rocb ReEncodeFont" <[ebgm_zjrm7o.enc <EBGaramond-Medium.pfb
 EBGaramond-Medium-osf-swash-ly1 EBGaramond-Medium "AutoEnc_mnvma6c2scz5splrrrlgnwdtzc ReEncodeFont" <[ebgm_mnvma6.enc <EBGaramond-Medium.pfb
 EBGaramond-Medium-osf-ts1--base EBGaramond-Medium "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-Medium.pfb
-EBGaramond-Regular-tlf-ot1 EBGaramond-Regular "AutoEnc_abyljl7ktazwzcff7pualhlsce ReEncodeFont" <[ebgm_abyljl.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tlf-t1--base EBGaramond-Regular "AutoEnc_mj3jkqegiifwkp7tg5srucvlef ReEncodeFont" <[ebgm_mj3jkq.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tlf-ly1 EBGaramond-Regular "AutoEnc_m26xaf4sayh4v43g2oxpc5fvfd ReEncodeFont" <[ebgm_m26xaf.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tlf-sc-ot1--base EBGaramond-Regular "AutoEnc_s7tpqtebt7fpaobhsv7o6g6p3d ReEncodeFont" <[ebgm_s7tpqt.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tlf-sc-t1--base EBGaramond-Regular "AutoEnc_yjkoc2bxtyk5pymwhoiyarwopd ReEncodeFont" <[ebgm_yjkoc2.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tlf-sc-ly1--base EBGaramond-Regular "AutoEnc_54ujiwtzv6tvhvfi6tvpkznylc ReEncodeFont" <[ebgm_54ujiw.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tlf-swash-ot1 EBGaramond-Regular "AutoEnc_dmjlsehjhqubkrychxdeweizch ReEncodeFont" <[ebgm_dmjlse.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tlf-swash-t1--base EBGaramond-Regular "AutoEnc_tbwoonnbhlwtlye7tm73jktpib ReEncodeFont" <[ebgm_tbwoon.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tlf-swash-ly1 EBGaramond-Regular "AutoEnc_qnvfe4fijcsnkkj3bzt4y4wygd ReEncodeFont" <[ebgm_qnvfe4.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tlf-titling-ot1 EBGaramond-Regular "AutoEnc_wsnb7le2poeyznztvx6b35j2ob ReEncodeFont" <[ebgm_wsnb7l.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tlf-titling-t1--base EBGaramond-Regular "AutoEnc_xxcxg56g42snddornzdfpksj3c ReEncodeFont" <[ebgm_xxcxg5.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tlf-titling-ly1 EBGaramond-Regular "AutoEnc_uj47dd2cdpqks5burrjhiwibgc ReEncodeFont" <[ebgm_uj47dd.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tlf-ts1--base EBGaramond-Regular "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-sup-ot1 EBGaramond-Regular "AutoEnc_oge4zeph4qgrf2eqipj4avd4uf ReEncodeFont" <[ebgm_oge4ze.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-sup-t1--base EBGaramond-Regular "AutoEnc_bszlvlk6bkouv7yc5pd5xqbgld ReEncodeFont" <[ebgm_bszlvl.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-sup-ly1 EBGaramond-Regular "AutoEnc_ob4q4uwnlaqyztqz2q3odaf6zc ReEncodeFont" <[ebgm_ob4q4u.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-lf-ot1 EBGaramond-Regular "AutoEnc_wsnb7le2poeyznztvx6b35j2ob ReEncodeFont" <[ebgm_wsnb7l.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-lf-t1--base EBGaramond-Regular "AutoEnc_xxcxg56g42snddornzdfpksj3c ReEncodeFont" <[ebgm_xxcxg5.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-lf-ly1 EBGaramond-Regular "AutoEnc_uj47dd2cdpqks5burrjhiwibgc ReEncodeFont" <[ebgm_uj47dd.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-lf-sc-ot1--base EBGaramond-Regular "AutoEnc_qip76aljekhkapltnlznjm26tg ReEncodeFont" <[ebgm_qip76a.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-lf-sc-t1--base EBGaramond-Regular "AutoEnc_xoskheoavizix7q6vfcc7k34cd ReEncodeFont" <[ebgm_xoskhe.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-lf-sc-ly1--base EBGaramond-Regular "AutoEnc_qckgozlkzjupumu2bsotgllzze ReEncodeFont" <[ebgm_qckgoz.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-lf-swash-ot1 EBGaramond-Regular "AutoEnc_rbkzluvbsijxcubauk4dxo24od ReEncodeFont" <[ebgm_rbkzlu.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-lf-swash-t1--base EBGaramond-Regular "AutoEnc_yow7vovfjroqgqn2odhltdg34d ReEncodeFont" <[ebgm_yow7vo.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-lf-swash-ly1 EBGaramond-Regular "AutoEnc_6napgq6etqab6jxvgs7tt46mpf ReEncodeFont" <[ebgm_6napgq.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-lf-titling-ot1 EBGaramond-Regular "AutoEnc_wsnb7le2poeyznztvx6b35j2ob ReEncodeFont" <[ebgm_wsnb7l.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-lf-titling-t1--base EBGaramond-Regular "AutoEnc_xxcxg56g42snddornzdfpksj3c ReEncodeFont" <[ebgm_xxcxg5.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-lf-titling-ly1 EBGaramond-Regular "AutoEnc_uj47dd2cdpqks5burrjhiwibgc ReEncodeFont" <[ebgm_uj47dd.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-lf-ts1--base EBGaramond-Regular "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tosf-ot1 EBGaramond-Regular "AutoEnc_rs3zoq2p2wr5xazf3giqkujald ReEncodeFont" <[ebgm_rs3zoq.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tosf-t1--base EBGaramond-Regular "AutoEnc_7zbjebv47f5uy63yxgbxijljze ReEncodeFont" <[ebgm_7zbjeb.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tosf-ly1 EBGaramond-Regular "AutoEnc_j2xr5dq6tgxurfw6n4h7uu2xxg ReEncodeFont" <[ebgm_j2xr5d.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tosf-sc-ot1--base EBGaramond-Regular "AutoEnc_vqv3w3jddu2yz2dnmvvx2bbzrd ReEncodeFont" <[ebgm_vqv3w3.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tosf-sc-t1--base EBGaramond-Regular "AutoEnc_nhfy4vcyskj4jwrirusa4olqia ReEncodeFont" <[ebgm_nhfy4v.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tosf-sc-ly1--base EBGaramond-Regular "AutoEnc_pnjcqfp4hcsltp7rqnhqbb2xmb ReEncodeFont" <[ebgm_pnjcqf.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tosf-swash-ot1 EBGaramond-Regular "AutoEnc_jyhls2hpbu2hzgel7zzhv7frgh ReEncodeFont" <[ebgm_jyhls2.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tosf-swash-t1--base EBGaramond-Regular "AutoEnc_3e4qg265j6ebr4p4pe7kwxf2tf ReEncodeFont" <[ebgm_3e4qg2.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tosf-swash-ly1 EBGaramond-Regular "AutoEnc_ioh3dpo5o56gxrlonlq4ni3eyd ReEncodeFont" <[ebgm_ioh3dp.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-tosf-ts1--base EBGaramond-Regular "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-osf-ot1 EBGaramond-Regular "AutoEnc_nxqm357krn5asjgj4l52s7fwme ReEncodeFont" <[ebgm_nxqm35.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-osf-t1--base EBGaramond-Regular "AutoEnc_a253pkmthtvztt2cy25s6mg7ne ReEncodeFont" <[ebgm_a253pk.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-osf-ly1 EBGaramond-Regular "AutoEnc_23xtnovqxod3edsnez3ckhvjda ReEncodeFont" <[ebgm_23xtno.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-osf-sc-ot1--base EBGaramond-Regular "AutoEnc_egoty6wpchcoxueschnlw73q6d ReEncodeFont" <[ebgm_egoty6.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-osf-sc-t1--base EBGaramond-Regular "AutoEnc_byuynix5r46fcpi7yc7qekcpbh ReEncodeFont" <[ebgm_byuyni.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-osf-sc-ly1--base EBGaramond-Regular "AutoEnc_2xdej53vfkjumr6wkun3igxjtf ReEncodeFont" <[ebgm_2xdej5.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-osf-swash-ot1 EBGaramond-Regular "AutoEnc_t4t3wmxarqpqo4t5vwiyucfrpa ReEncodeFont" <[ebgm_t4t3wm.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-osf-swash-t1--base EBGaramond-Regular "AutoEnc_zjrm7oiav7ih6lgry4bga5rocb ReEncodeFont" <[ebgm_zjrm7o.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-osf-swash-ly1 EBGaramond-Regular "AutoEnc_mnvma6c2scz5splrrrlgnwdtzc ReEncodeFont" <[ebgm_mnvma6.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-osf-ts1--base EBGaramond-Regular "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-Regular.pfb
+EBGaramond-MediumItalic-tlf-ot1 EBGaramond-MediumItalic "AutoEnc_cjjoj4mzlh573qpscv7zdqq5pc ReEncodeFont" <[ebgm_cjjoj4.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tlf-t1--base EBGaramond-MediumItalic "AutoEnc_wxmaa65amjqjpn7vhj2bjdqx3a ReEncodeFont" <[ebgm_wxmaa6.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tlf-ly1 EBGaramond-MediumItalic "AutoEnc_dto4r5hkfdywrp623q2mbc3u3g ReEncodeFont" <[ebgm_dto4r5.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tlf-sc-ot1--base EBGaramond-MediumItalic "AutoEnc_s7tpqtebt7fpaobhsv7o6g6p3d ReEncodeFont" <[ebgm_s7tpqt.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tlf-sc-t1--base EBGaramond-MediumItalic "AutoEnc_yjkoc2bxtyk5pymwhoiyarwopd ReEncodeFont" <[ebgm_yjkoc2.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tlf-sc-ly1--base EBGaramond-MediumItalic "AutoEnc_zgunbqcb7fkflwrnjdprpvr44e ReEncodeFont" <[ebgm_zgunbq.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tlf-swash-ot1 EBGaramond-MediumItalic "AutoEnc_7o6wggmtb7dgdzshbotsm6ev6e ReEncodeFont" <[ebgm_7o6wgg.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tlf-swash-t1--base EBGaramond-MediumItalic "AutoEnc_jedt67oelb6rdrfkeehbyf76yc ReEncodeFont" <[ebgm_jedt67.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tlf-swash-ly1 EBGaramond-MediumItalic "AutoEnc_e3brkzvtzp2dmfzg7e54unqplf ReEncodeFont" <[ebgm_e3brkz.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tlf-titling-ot1 EBGaramond-MediumItalic "AutoEnc_noegxq6wd4gmgm3wclekae5l7c ReEncodeFont" <[ebgm_noegxq.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tlf-titling-t1--base EBGaramond-MediumItalic "AutoEnc_yyibz2pthfaij2igwb6xmc3hga ReEncodeFont" <[ebgm_yyibz2.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tlf-titling-ly1 EBGaramond-MediumItalic "AutoEnc_47dl7gl2zcuwieqidajvjqlu7b ReEncodeFont" <[ebgm_47dl7g.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tlf-ts1--base EBGaramond-MediumItalic "AutoEnc_doset5jni7ptstijeczbezqvvd ReEncodeFont" <[ebgm_doset5.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-inf-ot1 EBGaramond-MediumItalic "AutoEnc_ao6kf7czm3kxufroii6io2txyb ReEncodeFont" <[ebgm_ao6kf7.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-inf-t1--base EBGaramond-MediumItalic "AutoEnc_kfeykpdkdkfgcmiob2alq76d6b ReEncodeFont" <[ebgm_kfeykp.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-inf-ly1 EBGaramond-MediumItalic "AutoEnc_muwakt4d7zffh35b2q6vpr7ucg ReEncodeFont" <[ebgm_muwakt.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-sup-ot1 EBGaramond-MediumItalic "AutoEnc_oge4zeph4qgrf2eqipj4avd4uf ReEncodeFont" <[ebgm_oge4ze.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-sup-t1--base EBGaramond-MediumItalic "AutoEnc_bszlvlk6bkouv7yc5pd5xqbgld ReEncodeFont" <[ebgm_bszlvl.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-sup-ly1 EBGaramond-MediumItalic "AutoEnc_ob4q4uwnlaqyztqz2q3odaf6zc ReEncodeFont" <[ebgm_ob4q4u.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-lf-ot1 EBGaramond-MediumItalic "AutoEnc_noegxq6wd4gmgm3wclekae5l7c ReEncodeFont" <[ebgm_noegxq.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-lf-t1--base EBGaramond-MediumItalic "AutoEnc_yyibz2pthfaij2igwb6xmc3hga ReEncodeFont" <[ebgm_yyibz2.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-lf-ly1 EBGaramond-MediumItalic "AutoEnc_hlpoevvpzwoif6oa4heawahthf ReEncodeFont" <[ebgm_hlpoev.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-lf-sc-ot1--base EBGaramond-MediumItalic "AutoEnc_qip76aljekhkapltnlznjm26tg ReEncodeFont" <[ebgm_qip76a.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-lf-sc-t1--base EBGaramond-MediumItalic "AutoEnc_xoskheoavizix7q6vfcc7k34cd ReEncodeFont" <[ebgm_xoskhe.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-lf-sc-ly1--base EBGaramond-MediumItalic "AutoEnc_qckgozlkzjupumu2bsotgllzze ReEncodeFont" <[ebgm_qckgoz.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-lf-swash-ot1 EBGaramond-MediumItalic "AutoEnc_j2gtbmvgspjsuvuvqshaglweuf ReEncodeFont" <[ebgm_j2gtbm.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-lf-swash-t1--base EBGaramond-MediumItalic "AutoEnc_izfhxe343lr4odwp7tsz42dm6b ReEncodeFont" <[ebgm_izfhxe.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-lf-swash-ly1 EBGaramond-MediumItalic "AutoEnc_uxrhpxwyh3rtb7wdsbfy3dpeba ReEncodeFont" <[ebgm_uxrhpx.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-lf-titling-ot1 EBGaramond-MediumItalic "AutoEnc_noegxq6wd4gmgm3wclekae5l7c ReEncodeFont" <[ebgm_noegxq.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-lf-titling-t1--base EBGaramond-MediumItalic "AutoEnc_yyibz2pthfaij2igwb6xmc3hga ReEncodeFont" <[ebgm_yyibz2.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-lf-titling-ly1 EBGaramond-MediumItalic "AutoEnc_hlpoevvpzwoif6oa4heawahthf ReEncodeFont" <[ebgm_hlpoev.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-lf-ts1--base EBGaramond-MediumItalic "AutoEnc_yddfsneogpgfw3a5axgk6w34nc ReEncodeFont" <[ebgm_yddfsn.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tosf-ot1 EBGaramond-MediumItalic "AutoEnc_c4ggcorthinbys2wmpe4bwpsqg ReEncodeFont" <[ebgm_c4ggco.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tosf-t1--base EBGaramond-MediumItalic "AutoEnc_joewosxhna5pwkrt2zs5xfsd5e ReEncodeFont" <[ebgm_joewos.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tosf-ly1 EBGaramond-MediumItalic "AutoEnc_lvcw6s3b76hfhdwvawjigeyj4f ReEncodeFont" <[ebgm_lvcw6s.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tosf-sc-ot1--base EBGaramond-MediumItalic "AutoEnc_vqv3w3jddu2yz2dnmvvx2bbzrd ReEncodeFont" <[ebgm_vqv3w3.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tosf-sc-t1--base EBGaramond-MediumItalic "AutoEnc_nhfy4vcyskj4jwrirusa4olqia ReEncodeFont" <[ebgm_nhfy4v.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tosf-sc-ly1--base EBGaramond-MediumItalic "AutoEnc_slocg6iashfkchrd7dvhgvyphh ReEncodeFont" <[ebgm_slocg6.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tosf-swash-ot1 EBGaramond-MediumItalic "AutoEnc_j66zy62stilrgvoep4apdi3znb ReEncodeFont" <[ebgm_j66zy6.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tosf-swash-t1--base EBGaramond-MediumItalic "AutoEnc_5tyv6cssgdji45lwui2by7br4e ReEncodeFont" <[ebgm_5tyv6c.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tosf-swash-ly1 EBGaramond-MediumItalic "AutoEnc_5vgwa5l3cgabvwoexj6dqg4sfc ReEncodeFont" <[ebgm_5vgwa5.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-tosf-ts1--base EBGaramond-MediumItalic "AutoEnc_doset5jni7ptstijeczbezqvvd ReEncodeFont" <[ebgm_doset5.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-osf-ot1 EBGaramond-MediumItalic "AutoEnc_z6dm7r4nubrhdvpbh46enrdtlf ReEncodeFont" <[ebgm_z6dm7r.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-osf-t1--base EBGaramond-MediumItalic "AutoEnc_ontdi6jpylpknbkaf3n2ljk6xh ReEncodeFont" <[ebgm_ontdi6.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-osf-ly1 EBGaramond-MediumItalic "AutoEnc_qnljitgqyb2s65dexixymiibaa ReEncodeFont" <[ebgm_qnljit.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-osf-sc-ot1--base EBGaramond-MediumItalic "AutoEnc_egoty6wpchcoxueschnlw73q6d ReEncodeFont" <[ebgm_egoty6.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-osf-sc-t1--base EBGaramond-MediumItalic "AutoEnc_byuynix5r46fcpi7yc7qekcpbh ReEncodeFont" <[ebgm_byuyni.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-osf-sc-ly1--base EBGaramond-MediumItalic "AutoEnc_2xdej53vfkjumr6wkun3igxjtf ReEncodeFont" <[ebgm_2xdej5.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-osf-swash-ot1 EBGaramond-MediumItalic "AutoEnc_fjpe6p45raoyul6jro4b6sespb ReEncodeFont" <[ebgm_fjpe6p.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-osf-swash-t1--base EBGaramond-MediumItalic "AutoEnc_ptk5mdcvitdzngtmcofsfhbteh ReEncodeFont" <[ebgm_ptk5md.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-osf-swash-ly1 EBGaramond-MediumItalic "AutoEnc_mvrjgh5lp7hs4pp6ibvztkssbg ReEncodeFont" <[ebgm_mvrjgh.enc <EBGaramond-MediumItalic.pfb
+EBGaramond-MediumItalic-osf-ts1--base EBGaramond-MediumItalic "AutoEnc_yddfsneogpgfw3a5axgk6w34nc ReEncodeFont" <[ebgm_yddfsn.enc <EBGaramond-MediumItalic.pfb
 EBGaramond-SemiBoldItalic-tlf-ot1 EBGaramond-SemiBoldItalic "AutoEnc_cjjoj4mzlh573qpscv7zdqq5pc ReEncodeFont" <[ebgm_cjjoj4.enc <EBGaramond-SemiBoldItalic.pfb
 EBGaramond-SemiBoldItalic-tlf-t1--base EBGaramond-SemiBoldItalic "AutoEnc_wxmaa65amjqjpn7vhj2bjdqx3a ReEncodeFont" <[ebgm_wxmaa6.enc <EBGaramond-SemiBoldItalic.pfb
 EBGaramond-SemiBoldItalic-tlf-ly1 EBGaramond-SemiBoldItalic "AutoEnc_dto4r5hkfdywrp623q2mbc3u3g ReEncodeFont" <[ebgm_dto4r5.enc <EBGaramond-SemiBoldItalic.pfb
@@ -356,6 +221,9 @@ EBGaramond-SemiBoldItalic-tlf-titling-ot1 EBGaramond-SemiBoldItalic "AutoEnc_noe
 EBGaramond-SemiBoldItalic-tlf-titling-t1--base EBGaramond-SemiBoldItalic "AutoEnc_yyibz2pthfaij2igwb6xmc3hga ReEncodeFont" <[ebgm_yyibz2.enc <EBGaramond-SemiBoldItalic.pfb
 EBGaramond-SemiBoldItalic-tlf-titling-ly1 EBGaramond-SemiBoldItalic "AutoEnc_47dl7gl2zcuwieqidajvjqlu7b ReEncodeFont" <[ebgm_47dl7g.enc <EBGaramond-SemiBoldItalic.pfb
 EBGaramond-SemiBoldItalic-tlf-ts1--base EBGaramond-SemiBoldItalic "AutoEnc_doset5jni7ptstijeczbezqvvd ReEncodeFont" <[ebgm_doset5.enc <EBGaramond-SemiBoldItalic.pfb
+EBGaramond-SemiBoldItalic-inf-ot1 EBGaramond-SemiBoldItalic "AutoEnc_ao6kf7czm3kxufroii6io2txyb ReEncodeFont" <[ebgm_ao6kf7.enc <EBGaramond-SemiBoldItalic.pfb
+EBGaramond-SemiBoldItalic-inf-t1--base EBGaramond-SemiBoldItalic "AutoEnc_kfeykpdkdkfgcmiob2alq76d6b ReEncodeFont" <[ebgm_kfeykp.enc <EBGaramond-SemiBoldItalic.pfb
+EBGaramond-SemiBoldItalic-inf-ly1 EBGaramond-SemiBoldItalic "AutoEnc_muwakt4d7zffh35b2q6vpr7ucg ReEncodeFont" <[ebgm_muwakt.enc <EBGaramond-SemiBoldItalic.pfb
 EBGaramond-SemiBoldItalic-sup-ot1 EBGaramond-SemiBoldItalic "AutoEnc_oge4zeph4qgrf2eqipj4avd4uf ReEncodeFont" <[ebgm_oge4ze.enc <EBGaramond-SemiBoldItalic.pfb
 EBGaramond-SemiBoldItalic-sup-t1--base EBGaramond-SemiBoldItalic "AutoEnc_bszlvlk6bkouv7yc5pd5xqbgld ReEncodeFont" <[ebgm_bszlvl.enc <EBGaramond-SemiBoldItalic.pfb
 EBGaramond-SemiBoldItalic-sup-ly1 EBGaramond-SemiBoldItalic "AutoEnc_ob4q4uwnlaqyztqz2q3odaf6zc ReEncodeFont" <[ebgm_ob4q4u.enc <EBGaramond-SemiBoldItalic.pfb
@@ -405,6 +273,9 @@ EBGaramond-SemiBold-tlf-titling-ot1 EBGaramond-SemiBold "AutoEnc_wsnb7le2poeyznz
 EBGaramond-SemiBold-tlf-titling-t1--base EBGaramond-SemiBold "AutoEnc_xxcxg56g42snddornzdfpksj3c ReEncodeFont" <[ebgm_xxcxg5.enc <EBGaramond-SemiBold.pfb
 EBGaramond-SemiBold-tlf-titling-ly1 EBGaramond-SemiBold "AutoEnc_uj47dd2cdpqks5burrjhiwibgc ReEncodeFont" <[ebgm_uj47dd.enc <EBGaramond-SemiBold.pfb
 EBGaramond-SemiBold-tlf-ts1--base EBGaramond-SemiBold "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-SemiBold.pfb
+EBGaramond-SemiBold-inf-ot1 EBGaramond-SemiBold "AutoEnc_ao6kf7czm3kxufroii6io2txyb ReEncodeFont" <[ebgm_ao6kf7.enc <EBGaramond-SemiBold.pfb
+EBGaramond-SemiBold-inf-t1--base EBGaramond-SemiBold "AutoEnc_kfeykpdkdkfgcmiob2alq76d6b ReEncodeFont" <[ebgm_kfeykp.enc <EBGaramond-SemiBold.pfb
+EBGaramond-SemiBold-inf-ly1 EBGaramond-SemiBold "AutoEnc_muwakt4d7zffh35b2q6vpr7ucg ReEncodeFont" <[ebgm_muwakt.enc <EBGaramond-SemiBold.pfb
 EBGaramond-SemiBold-sup-ot1 EBGaramond-SemiBold "AutoEnc_oge4zeph4qgrf2eqipj4avd4uf ReEncodeFont" <[ebgm_oge4ze.enc <EBGaramond-SemiBold.pfb
 EBGaramond-SemiBold-sup-t1--base EBGaramond-SemiBold "AutoEnc_bszlvlk6bkouv7yc5pd5xqbgld ReEncodeFont" <[ebgm_bszlvl.enc <EBGaramond-SemiBold.pfb
 EBGaramond-SemiBold-sup-ly1 EBGaramond-SemiBold "AutoEnc_ob4q4uwnlaqyztqz2q3odaf6zc ReEncodeFont" <[ebgm_ob4q4u.enc <EBGaramond-SemiBold.pfb
@@ -493,34 +364,162 @@ EBGaramond-BoldItalic-osf-swash-ot1 EBGaramond-BoldItalic "AutoEnc_fjpe6p45raoyu
 EBGaramond-BoldItalic-osf-swash-t1--base EBGaramond-BoldItalic "AutoEnc_ptk5mdcvitdzngtmcofsfhbteh ReEncodeFont" <[ebgm_ptk5md.enc <EBGaramond-BoldItalic.pfb
 EBGaramond-BoldItalic-osf-swash-ly1 EBGaramond-BoldItalic "AutoEnc_mvrjgh5lp7hs4pp6ibvztkssbg ReEncodeFont" <[ebgm_mvrjgh.enc <EBGaramond-BoldItalic.pfb
 EBGaramond-BoldItalic-osf-ts1--base EBGaramond-BoldItalic "AutoEnc_yddfsneogpgfw3a5axgk6w34nc ReEncodeFont" <[ebgm_yddfsn.enc <EBGaramond-BoldItalic.pfb
+EBGaramond-Bold-tlf-ot1 EBGaramond-Bold "AutoEnc_abyljl7ktazwzcff7pualhlsce ReEncodeFont" <[ebgm_abyljl.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tlf-t1--base EBGaramond-Bold "AutoEnc_mj3jkqegiifwkp7tg5srucvlef ReEncodeFont" <[ebgm_mj3jkq.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tlf-ly1 EBGaramond-Bold "AutoEnc_m26xaf4sayh4v43g2oxpc5fvfd ReEncodeFont" <[ebgm_m26xaf.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tlf-sc-ot1--base EBGaramond-Bold "AutoEnc_s7tpqtebt7fpaobhsv7o6g6p3d ReEncodeFont" <[ebgm_s7tpqt.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tlf-sc-t1--base EBGaramond-Bold "AutoEnc_yjkoc2bxtyk5pymwhoiyarwopd ReEncodeFont" <[ebgm_yjkoc2.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tlf-sc-ly1--base EBGaramond-Bold "AutoEnc_54ujiwtzv6tvhvfi6tvpkznylc ReEncodeFont" <[ebgm_54ujiw.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tlf-swash-ot1 EBGaramond-Bold "AutoEnc_dmjlsehjhqubkrychxdeweizch ReEncodeFont" <[ebgm_dmjlse.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tlf-swash-t1--base EBGaramond-Bold "AutoEnc_tbwoonnbhlwtlye7tm73jktpib ReEncodeFont" <[ebgm_tbwoon.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tlf-swash-ly1 EBGaramond-Bold "AutoEnc_qnvfe4fijcsnkkj3bzt4y4wygd ReEncodeFont" <[ebgm_qnvfe4.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tlf-titling-ot1 EBGaramond-Bold "AutoEnc_wsnb7le2poeyznztvx6b35j2ob ReEncodeFont" <[ebgm_wsnb7l.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tlf-titling-t1--base EBGaramond-Bold "AutoEnc_xxcxg56g42snddornzdfpksj3c ReEncodeFont" <[ebgm_xxcxg5.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tlf-titling-ly1 EBGaramond-Bold "AutoEnc_uj47dd2cdpqks5burrjhiwibgc ReEncodeFont" <[ebgm_uj47dd.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tlf-ts1--base EBGaramond-Bold "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-Bold.pfb
 EBGaramond-Bold-inf-ot1 EBGaramond-Bold "AutoEnc_ao6kf7czm3kxufroii6io2txyb ReEncodeFont" <[ebgm_ao6kf7.enc <EBGaramond-Bold.pfb
 EBGaramond-Bold-inf-t1--base EBGaramond-Bold "AutoEnc_kfeykpdkdkfgcmiob2alq76d6b ReEncodeFont" <[ebgm_kfeykp.enc <EBGaramond-Bold.pfb
 EBGaramond-Bold-inf-ly1 EBGaramond-Bold "AutoEnc_muwakt4d7zffh35b2q6vpr7ucg ReEncodeFont" <[ebgm_muwakt.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-sup-ot1 EBGaramond-Bold "AutoEnc_oge4zeph4qgrf2eqipj4avd4uf ReEncodeFont" <[ebgm_oge4ze.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-sup-t1--base EBGaramond-Bold "AutoEnc_bszlvlk6bkouv7yc5pd5xqbgld ReEncodeFont" <[ebgm_bszlvl.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-sup-ly1 EBGaramond-Bold "AutoEnc_ob4q4uwnlaqyztqz2q3odaf6zc ReEncodeFont" <[ebgm_ob4q4u.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-lf-ot1 EBGaramond-Bold "AutoEnc_wsnb7le2poeyznztvx6b35j2ob ReEncodeFont" <[ebgm_wsnb7l.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-lf-t1--base EBGaramond-Bold "AutoEnc_xxcxg56g42snddornzdfpksj3c ReEncodeFont" <[ebgm_xxcxg5.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-lf-ly1 EBGaramond-Bold "AutoEnc_uj47dd2cdpqks5burrjhiwibgc ReEncodeFont" <[ebgm_uj47dd.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-lf-sc-ot1--base EBGaramond-Bold "AutoEnc_qip76aljekhkapltnlznjm26tg ReEncodeFont" <[ebgm_qip76a.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-lf-sc-t1--base EBGaramond-Bold "AutoEnc_xoskheoavizix7q6vfcc7k34cd ReEncodeFont" <[ebgm_xoskhe.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-lf-sc-ly1--base EBGaramond-Bold "AutoEnc_qckgozlkzjupumu2bsotgllzze ReEncodeFont" <[ebgm_qckgoz.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-lf-swash-ot1 EBGaramond-Bold "AutoEnc_rbkzluvbsijxcubauk4dxo24od ReEncodeFont" <[ebgm_rbkzlu.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-lf-swash-t1--base EBGaramond-Bold "AutoEnc_yow7vovfjroqgqn2odhltdg34d ReEncodeFont" <[ebgm_yow7vo.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-lf-swash-ly1 EBGaramond-Bold "AutoEnc_6napgq6etqab6jxvgs7tt46mpf ReEncodeFont" <[ebgm_6napgq.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-lf-titling-ot1 EBGaramond-Bold "AutoEnc_wsnb7le2poeyznztvx6b35j2ob ReEncodeFont" <[ebgm_wsnb7l.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-lf-titling-t1--base EBGaramond-Bold "AutoEnc_xxcxg56g42snddornzdfpksj3c ReEncodeFont" <[ebgm_xxcxg5.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-lf-titling-ly1 EBGaramond-Bold "AutoEnc_uj47dd2cdpqks5burrjhiwibgc ReEncodeFont" <[ebgm_uj47dd.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-lf-ts1--base EBGaramond-Bold "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tosf-ot1 EBGaramond-Bold "AutoEnc_rs3zoq2p2wr5xazf3giqkujald ReEncodeFont" <[ebgm_rs3zoq.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tosf-t1--base EBGaramond-Bold "AutoEnc_7zbjebv47f5uy63yxgbxijljze ReEncodeFont" <[ebgm_7zbjeb.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tosf-ly1 EBGaramond-Bold "AutoEnc_j2xr5dq6tgxurfw6n4h7uu2xxg ReEncodeFont" <[ebgm_j2xr5d.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tosf-sc-ot1--base EBGaramond-Bold "AutoEnc_vqv3w3jddu2yz2dnmvvx2bbzrd ReEncodeFont" <[ebgm_vqv3w3.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tosf-sc-t1--base EBGaramond-Bold "AutoEnc_nhfy4vcyskj4jwrirusa4olqia ReEncodeFont" <[ebgm_nhfy4v.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tosf-sc-ly1--base EBGaramond-Bold "AutoEnc_pnjcqfp4hcsltp7rqnhqbb2xmb ReEncodeFont" <[ebgm_pnjcqf.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tosf-swash-ot1 EBGaramond-Bold "AutoEnc_jyhls2hpbu2hzgel7zzhv7frgh ReEncodeFont" <[ebgm_jyhls2.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tosf-swash-t1--base EBGaramond-Bold "AutoEnc_3e4qg265j6ebr4p4pe7kwxf2tf ReEncodeFont" <[ebgm_3e4qg2.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tosf-swash-ly1 EBGaramond-Bold "AutoEnc_ioh3dpo5o56gxrlonlq4ni3eyd ReEncodeFont" <[ebgm_ioh3dp.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-tosf-ts1--base EBGaramond-Bold "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-osf-ot1 EBGaramond-Bold "AutoEnc_nxqm357krn5asjgj4l52s7fwme ReEncodeFont" <[ebgm_nxqm35.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-osf-t1--base EBGaramond-Bold "AutoEnc_a253pkmthtvztt2cy25s6mg7ne ReEncodeFont" <[ebgm_a253pk.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-osf-ly1 EBGaramond-Bold "AutoEnc_23xtnovqxod3edsnez3ckhvjda ReEncodeFont" <[ebgm_23xtno.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-osf-sc-ot1--base EBGaramond-Bold "AutoEnc_egoty6wpchcoxueschnlw73q6d ReEncodeFont" <[ebgm_egoty6.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-osf-sc-t1--base EBGaramond-Bold "AutoEnc_byuynix5r46fcpi7yc7qekcpbh ReEncodeFont" <[ebgm_byuyni.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-osf-sc-ly1--base EBGaramond-Bold "AutoEnc_2xdej53vfkjumr6wkun3igxjtf ReEncodeFont" <[ebgm_2xdej5.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-osf-swash-ot1 EBGaramond-Bold "AutoEnc_t4t3wmxarqpqo4t5vwiyucfrpa ReEncodeFont" <[ebgm_t4t3wm.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-osf-swash-t1--base EBGaramond-Bold "AutoEnc_zjrm7oiav7ih6lgry4bga5rocb ReEncodeFont" <[ebgm_zjrm7o.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-osf-swash-ly1 EBGaramond-Bold "AutoEnc_mnvma6c2scz5splrrrlgnwdtzc ReEncodeFont" <[ebgm_mnvma6.enc <EBGaramond-Bold.pfb
+EBGaramond-Bold-osf-ts1--base EBGaramond-Bold "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-Bold.pfb
+EBGaramond-ExtraBoldItalic-tlf-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_cjjoj4mzlh573qpscv7zdqq5pc ReEncodeFont" <[ebgm_cjjoj4.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tlf-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_wxmaa65amjqjpn7vhj2bjdqx3a ReEncodeFont" <[ebgm_wxmaa6.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tlf-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_dto4r5hkfdywrp623q2mbc3u3g ReEncodeFont" <[ebgm_dto4r5.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tlf-sc-ot1--base EBGaramond-ExtraBoldItalic "AutoEnc_s7tpqtebt7fpaobhsv7o6g6p3d ReEncodeFont" <[ebgm_s7tpqt.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tlf-sc-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_yjkoc2bxtyk5pymwhoiyarwopd ReEncodeFont" <[ebgm_yjkoc2.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tlf-sc-ly1--base EBGaramond-ExtraBoldItalic "AutoEnc_zgunbqcb7fkflwrnjdprpvr44e ReEncodeFont" <[ebgm_zgunbq.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tlf-swash-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_7o6wggmtb7dgdzshbotsm6ev6e ReEncodeFont" <[ebgm_7o6wgg.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tlf-swash-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_jedt67oelb6rdrfkeehbyf76yc ReEncodeFont" <[ebgm_jedt67.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tlf-swash-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_e3brkzvtzp2dmfzg7e54unqplf ReEncodeFont" <[ebgm_e3brkz.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tlf-titling-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_noegxq6wd4gmgm3wclekae5l7c ReEncodeFont" <[ebgm_noegxq.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tlf-titling-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_yyibz2pthfaij2igwb6xmc3hga ReEncodeFont" <[ebgm_yyibz2.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tlf-titling-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_47dl7gl2zcuwieqidajvjqlu7b ReEncodeFont" <[ebgm_47dl7g.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tlf-ts1--base EBGaramond-ExtraBoldItalic "AutoEnc_doset5jni7ptstijeczbezqvvd ReEncodeFont" <[ebgm_doset5.enc <EBGaramond-ExtraBoldItalic.pfb
 EBGaramond-ExtraBoldItalic-inf-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_ao6kf7czm3kxufroii6io2txyb ReEncodeFont" <[ebgm_ao6kf7.enc <EBGaramond-ExtraBoldItalic.pfb
 EBGaramond-ExtraBoldItalic-inf-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_kfeykpdkdkfgcmiob2alq76d6b ReEncodeFont" <[ebgm_kfeykp.enc <EBGaramond-ExtraBoldItalic.pfb
 EBGaramond-ExtraBoldItalic-inf-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_muwakt4d7zffh35b2q6vpr7ucg ReEncodeFont" <[ebgm_muwakt.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-sup-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_oge4zeph4qgrf2eqipj4avd4uf ReEncodeFont" <[ebgm_oge4ze.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-sup-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_bszlvlk6bkouv7yc5pd5xqbgld ReEncodeFont" <[ebgm_bszlvl.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-sup-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_ob4q4uwnlaqyztqz2q3odaf6zc ReEncodeFont" <[ebgm_ob4q4u.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-lf-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_noegxq6wd4gmgm3wclekae5l7c ReEncodeFont" <[ebgm_noegxq.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-lf-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_yyibz2pthfaij2igwb6xmc3hga ReEncodeFont" <[ebgm_yyibz2.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-lf-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_hlpoevvpzwoif6oa4heawahthf ReEncodeFont" <[ebgm_hlpoev.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-lf-sc-ot1--base EBGaramond-ExtraBoldItalic "AutoEnc_qip76aljekhkapltnlznjm26tg ReEncodeFont" <[ebgm_qip76a.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-lf-sc-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_xoskheoavizix7q6vfcc7k34cd ReEncodeFont" <[ebgm_xoskhe.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-lf-sc-ly1--base EBGaramond-ExtraBoldItalic "AutoEnc_qckgozlkzjupumu2bsotgllzze ReEncodeFont" <[ebgm_qckgoz.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-lf-swash-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_j2gtbmvgspjsuvuvqshaglweuf ReEncodeFont" <[ebgm_j2gtbm.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-lf-swash-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_izfhxe343lr4odwp7tsz42dm6b ReEncodeFont" <[ebgm_izfhxe.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-lf-swash-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_uxrhpxwyh3rtb7wdsbfy3dpeba ReEncodeFont" <[ebgm_uxrhpx.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-lf-titling-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_noegxq6wd4gmgm3wclekae5l7c ReEncodeFont" <[ebgm_noegxq.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-lf-titling-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_yyibz2pthfaij2igwb6xmc3hga ReEncodeFont" <[ebgm_yyibz2.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-lf-titling-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_hlpoevvpzwoif6oa4heawahthf ReEncodeFont" <[ebgm_hlpoev.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-lf-ts1--base EBGaramond-ExtraBoldItalic "AutoEnc_yddfsneogpgfw3a5axgk6w34nc ReEncodeFont" <[ebgm_yddfsn.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tosf-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_c4ggcorthinbys2wmpe4bwpsqg ReEncodeFont" <[ebgm_c4ggco.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tosf-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_joewosxhna5pwkrt2zs5xfsd5e ReEncodeFont" <[ebgm_joewos.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tosf-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_lvcw6s3b76hfhdwvawjigeyj4f ReEncodeFont" <[ebgm_lvcw6s.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tosf-sc-ot1--base EBGaramond-ExtraBoldItalic "AutoEnc_vqv3w3jddu2yz2dnmvvx2bbzrd ReEncodeFont" <[ebgm_vqv3w3.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tosf-sc-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_nhfy4vcyskj4jwrirusa4olqia ReEncodeFont" <[ebgm_nhfy4v.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tosf-sc-ly1--base EBGaramond-ExtraBoldItalic "AutoEnc_slocg6iashfkchrd7dvhgvyphh ReEncodeFont" <[ebgm_slocg6.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tosf-swash-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_j66zy62stilrgvoep4apdi3znb ReEncodeFont" <[ebgm_j66zy6.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tosf-swash-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_5tyv6cssgdji45lwui2by7br4e ReEncodeFont" <[ebgm_5tyv6c.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tosf-swash-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_5vgwa5l3cgabvwoexj6dqg4sfc ReEncodeFont" <[ebgm_5vgwa5.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-tosf-ts1--base EBGaramond-ExtraBoldItalic "AutoEnc_doset5jni7ptstijeczbezqvvd ReEncodeFont" <[ebgm_doset5.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-osf-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_z6dm7r4nubrhdvpbh46enrdtlf ReEncodeFont" <[ebgm_z6dm7r.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-osf-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_ontdi6jpylpknbkaf3n2ljk6xh ReEncodeFont" <[ebgm_ontdi6.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-osf-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_qnljitgqyb2s65dexixymiibaa ReEncodeFont" <[ebgm_qnljit.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-osf-sc-ot1--base EBGaramond-ExtraBoldItalic "AutoEnc_egoty6wpchcoxueschnlw73q6d ReEncodeFont" <[ebgm_egoty6.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-osf-sc-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_byuynix5r46fcpi7yc7qekcpbh ReEncodeFont" <[ebgm_byuyni.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-osf-sc-ly1--base EBGaramond-ExtraBoldItalic "AutoEnc_2xdej53vfkjumr6wkun3igxjtf ReEncodeFont" <[ebgm_2xdej5.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-osf-swash-ot1 EBGaramond-ExtraBoldItalic "AutoEnc_fjpe6p45raoyul6jro4b6sespb ReEncodeFont" <[ebgm_fjpe6p.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-osf-swash-t1--base EBGaramond-ExtraBoldItalic "AutoEnc_ptk5mdcvitdzngtmcofsfhbteh ReEncodeFont" <[ebgm_ptk5md.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-osf-swash-ly1 EBGaramond-ExtraBoldItalic "AutoEnc_mvrjgh5lp7hs4pp6ibvztkssbg ReEncodeFont" <[ebgm_mvrjgh.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBoldItalic-osf-ts1--base EBGaramond-ExtraBoldItalic "AutoEnc_yddfsneogpgfw3a5axgk6w34nc ReEncodeFont" <[ebgm_yddfsn.enc <EBGaramond-ExtraBoldItalic.pfb
+EBGaramond-ExtraBold-tlf-ot1 EBGaramond-ExtraBold "AutoEnc_abyljl7ktazwzcff7pualhlsce ReEncodeFont" <[ebgm_abyljl.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tlf-t1--base EBGaramond-ExtraBold "AutoEnc_mj3jkqegiifwkp7tg5srucvlef ReEncodeFont" <[ebgm_mj3jkq.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tlf-ly1 EBGaramond-ExtraBold "AutoEnc_m26xaf4sayh4v43g2oxpc5fvfd ReEncodeFont" <[ebgm_m26xaf.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tlf-sc-ot1--base EBGaramond-ExtraBold "AutoEnc_s7tpqtebt7fpaobhsv7o6g6p3d ReEncodeFont" <[ebgm_s7tpqt.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tlf-sc-t1--base EBGaramond-ExtraBold "AutoEnc_yjkoc2bxtyk5pymwhoiyarwopd ReEncodeFont" <[ebgm_yjkoc2.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tlf-sc-ly1--base EBGaramond-ExtraBold "AutoEnc_54ujiwtzv6tvhvfi6tvpkznylc ReEncodeFont" <[ebgm_54ujiw.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tlf-swash-ot1 EBGaramond-ExtraBold "AutoEnc_dmjlsehjhqubkrychxdeweizch ReEncodeFont" <[ebgm_dmjlse.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tlf-swash-t1--base EBGaramond-ExtraBold "AutoEnc_tbwoonnbhlwtlye7tm73jktpib ReEncodeFont" <[ebgm_tbwoon.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tlf-swash-ly1 EBGaramond-ExtraBold "AutoEnc_qnvfe4fijcsnkkj3bzt4y4wygd ReEncodeFont" <[ebgm_qnvfe4.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tlf-titling-ot1 EBGaramond-ExtraBold "AutoEnc_wsnb7le2poeyznztvx6b35j2ob ReEncodeFont" <[ebgm_wsnb7l.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tlf-titling-t1--base EBGaramond-ExtraBold "AutoEnc_xxcxg56g42snddornzdfpksj3c ReEncodeFont" <[ebgm_xxcxg5.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tlf-titling-ly1 EBGaramond-ExtraBold "AutoEnc_uj47dd2cdpqks5burrjhiwibgc ReEncodeFont" <[ebgm_uj47dd.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tlf-ts1--base EBGaramond-ExtraBold "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-ExtraBold.pfb
 EBGaramond-ExtraBold-inf-ot1 EBGaramond-ExtraBold "AutoEnc_ao6kf7czm3kxufroii6io2txyb ReEncodeFont" <[ebgm_ao6kf7.enc <EBGaramond-ExtraBold.pfb
 EBGaramond-ExtraBold-inf-t1--base EBGaramond-ExtraBold "AutoEnc_kfeykpdkdkfgcmiob2alq76d6b ReEncodeFont" <[ebgm_kfeykp.enc <EBGaramond-ExtraBold.pfb
 EBGaramond-ExtraBold-inf-ly1 EBGaramond-ExtraBold "AutoEnc_muwakt4d7zffh35b2q6vpr7ucg ReEncodeFont" <[ebgm_muwakt.enc <EBGaramond-ExtraBold.pfb
-EBGaramond-Italic-inf-ot1 EBGaramond-Italic "AutoEnc_ao6kf7czm3kxufroii6io2txyb ReEncodeFont" <[ebgm_ao6kf7.enc <EBGaramond-Italic.pfb
-EBGaramond-Italic-inf-t1--base EBGaramond-Italic "AutoEnc_kfeykpdkdkfgcmiob2alq76d6b ReEncodeFont" <[ebgm_kfeykp.enc <EBGaramond-Italic.pfb
-EBGaramond-Italic-inf-ly1 EBGaramond-Italic "AutoEnc_muwakt4d7zffh35b2q6vpr7ucg ReEncodeFont" <[ebgm_muwakt.enc <EBGaramond-Italic.pfb
-EBGaramond-MediumItalic-inf-ot1 EBGaramond-MediumItalic "AutoEnc_ao6kf7czm3kxufroii6io2txyb ReEncodeFont" <[ebgm_ao6kf7.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-inf-t1--base EBGaramond-MediumItalic "AutoEnc_kfeykpdkdkfgcmiob2alq76d6b ReEncodeFont" <[ebgm_kfeykp.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-MediumItalic-inf-ly1 EBGaramond-MediumItalic "AutoEnc_muwakt4d7zffh35b2q6vpr7ucg ReEncodeFont" <[ebgm_muwakt.enc <EBGaramond-MediumItalic.pfb
-EBGaramond-Medium-inf-ot1 EBGaramond-Medium "AutoEnc_ao6kf7czm3kxufroii6io2txyb ReEncodeFont" <[ebgm_ao6kf7.enc <EBGaramond-Medium.pfb
-EBGaramond-Medium-inf-t1--base EBGaramond-Medium "AutoEnc_kfeykpdkdkfgcmiob2alq76d6b ReEncodeFont" <[ebgm_kfeykp.enc <EBGaramond-Medium.pfb
-EBGaramond-Medium-inf-ly1 EBGaramond-Medium "AutoEnc_muwakt4d7zffh35b2q6vpr7ucg ReEncodeFont" <[ebgm_muwakt.enc <EBGaramond-Medium.pfb
-EBGaramond-Regular-inf-ot1 EBGaramond-Regular "AutoEnc_ao6kf7czm3kxufroii6io2txyb ReEncodeFont" <[ebgm_ao6kf7.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-inf-t1--base EBGaramond-Regular "AutoEnc_kfeykpdkdkfgcmiob2alq76d6b ReEncodeFont" <[ebgm_kfeykp.enc <EBGaramond-Regular.pfb
-EBGaramond-Regular-inf-ly1 EBGaramond-Regular "AutoEnc_muwakt4d7zffh35b2q6vpr7ucg ReEncodeFont" <[ebgm_muwakt.enc <EBGaramond-Regular.pfb
-EBGaramond-SemiBoldItalic-inf-ot1 EBGaramond-SemiBoldItalic "AutoEnc_ao6kf7czm3kxufroii6io2txyb ReEncodeFont" <[ebgm_ao6kf7.enc <EBGaramond-SemiBoldItalic.pfb
-EBGaramond-SemiBoldItalic-inf-t1--base EBGaramond-SemiBoldItalic "AutoEnc_kfeykpdkdkfgcmiob2alq76d6b ReEncodeFont" <[ebgm_kfeykp.enc <EBGaramond-SemiBoldItalic.pfb
-EBGaramond-SemiBoldItalic-inf-ly1 EBGaramond-SemiBoldItalic "AutoEnc_muwakt4d7zffh35b2q6vpr7ucg ReEncodeFont" <[ebgm_muwakt.enc <EBGaramond-SemiBoldItalic.pfb
-EBGaramond-SemiBold-inf-ot1 EBGaramond-SemiBold "AutoEnc_ao6kf7czm3kxufroii6io2txyb ReEncodeFont" <[ebgm_ao6kf7.enc <EBGaramond-SemiBold.pfb
-EBGaramond-SemiBold-inf-t1--base EBGaramond-SemiBold "AutoEnc_kfeykpdkdkfgcmiob2alq76d6b ReEncodeFont" <[ebgm_kfeykp.enc <EBGaramond-SemiBold.pfb
-EBGaramond-SemiBold-inf-ly1 EBGaramond-SemiBold "AutoEnc_muwakt4d7zffh35b2q6vpr7ucg ReEncodeFont" <[ebgm_muwakt.enc <EBGaramond-SemiBold.pfb
-
+EBGaramond-ExtraBold-sup-ot1 EBGaramond-ExtraBold "AutoEnc_oge4zeph4qgrf2eqipj4avd4uf ReEncodeFont" <[ebgm_oge4ze.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-sup-t1--base EBGaramond-ExtraBold "AutoEnc_bszlvlk6bkouv7yc5pd5xqbgld ReEncodeFont" <[ebgm_bszlvl.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-sup-ly1 EBGaramond-ExtraBold "AutoEnc_ob4q4uwnlaqyztqz2q3odaf6zc ReEncodeFont" <[ebgm_ob4q4u.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-lf-ot1 EBGaramond-ExtraBold "AutoEnc_wsnb7le2poeyznztvx6b35j2ob ReEncodeFont" <[ebgm_wsnb7l.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-lf-t1--base EBGaramond-ExtraBold "AutoEnc_xxcxg56g42snddornzdfpksj3c ReEncodeFont" <[ebgm_xxcxg5.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-lf-ly1 EBGaramond-ExtraBold "AutoEnc_uj47dd2cdpqks5burrjhiwibgc ReEncodeFont" <[ebgm_uj47dd.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-lf-sc-ot1--base EBGaramond-ExtraBold "AutoEnc_qip76aljekhkapltnlznjm26tg ReEncodeFont" <[ebgm_qip76a.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-lf-sc-t1--base EBGaramond-ExtraBold "AutoEnc_xoskheoavizix7q6vfcc7k34cd ReEncodeFont" <[ebgm_xoskhe.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-lf-sc-ly1--base EBGaramond-ExtraBold "AutoEnc_qckgozlkzjupumu2bsotgllzze ReEncodeFont" <[ebgm_qckgoz.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-lf-swash-ot1 EBGaramond-ExtraBold "AutoEnc_rbkzluvbsijxcubauk4dxo24od ReEncodeFont" <[ebgm_rbkzlu.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-lf-swash-t1--base EBGaramond-ExtraBold "AutoEnc_yow7vovfjroqgqn2odhltdg34d ReEncodeFont" <[ebgm_yow7vo.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-lf-swash-ly1 EBGaramond-ExtraBold "AutoEnc_6napgq6etqab6jxvgs7tt46mpf ReEncodeFont" <[ebgm_6napgq.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-lf-titling-ot1 EBGaramond-ExtraBold "AutoEnc_wsnb7le2poeyznztvx6b35j2ob ReEncodeFont" <[ebgm_wsnb7l.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-lf-titling-t1--base EBGaramond-ExtraBold "AutoEnc_xxcxg56g42snddornzdfpksj3c ReEncodeFont" <[ebgm_xxcxg5.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-lf-titling-ly1 EBGaramond-ExtraBold "AutoEnc_uj47dd2cdpqks5burrjhiwibgc ReEncodeFont" <[ebgm_uj47dd.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-lf-ts1--base EBGaramond-ExtraBold "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tosf-ot1 EBGaramond-ExtraBold "AutoEnc_rs3zoq2p2wr5xazf3giqkujald ReEncodeFont" <[ebgm_rs3zoq.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tosf-t1--base EBGaramond-ExtraBold "AutoEnc_7zbjebv47f5uy63yxgbxijljze ReEncodeFont" <[ebgm_7zbjeb.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tosf-ly1 EBGaramond-ExtraBold "AutoEnc_j2xr5dq6tgxurfw6n4h7uu2xxg ReEncodeFont" <[ebgm_j2xr5d.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tosf-sc-ot1--base EBGaramond-ExtraBold "AutoEnc_vqv3w3jddu2yz2dnmvvx2bbzrd ReEncodeFont" <[ebgm_vqv3w3.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tosf-sc-t1--base EBGaramond-ExtraBold "AutoEnc_nhfy4vcyskj4jwrirusa4olqia ReEncodeFont" <[ebgm_nhfy4v.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tosf-sc-ly1--base EBGaramond-ExtraBold "AutoEnc_pnjcqfp4hcsltp7rqnhqbb2xmb ReEncodeFont" <[ebgm_pnjcqf.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tosf-swash-ot1 EBGaramond-ExtraBold "AutoEnc_jyhls2hpbu2hzgel7zzhv7frgh ReEncodeFont" <[ebgm_jyhls2.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tosf-swash-t1--base EBGaramond-ExtraBold "AutoEnc_3e4qg265j6ebr4p4pe7kwxf2tf ReEncodeFont" <[ebgm_3e4qg2.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tosf-swash-ly1 EBGaramond-ExtraBold "AutoEnc_ioh3dpo5o56gxrlonlq4ni3eyd ReEncodeFont" <[ebgm_ioh3dp.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-tosf-ts1--base EBGaramond-ExtraBold "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-osf-ot1 EBGaramond-ExtraBold "AutoEnc_nxqm357krn5asjgj4l52s7fwme ReEncodeFont" <[ebgm_nxqm35.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-osf-t1--base EBGaramond-ExtraBold "AutoEnc_a253pkmthtvztt2cy25s6mg7ne ReEncodeFont" <[ebgm_a253pk.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-osf-ly1 EBGaramond-ExtraBold "AutoEnc_23xtnovqxod3edsnez3ckhvjda ReEncodeFont" <[ebgm_23xtno.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-osf-sc-ot1--base EBGaramond-ExtraBold "AutoEnc_egoty6wpchcoxueschnlw73q6d ReEncodeFont" <[ebgm_egoty6.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-osf-sc-t1--base EBGaramond-ExtraBold "AutoEnc_byuynix5r46fcpi7yc7qekcpbh ReEncodeFont" <[ebgm_byuyni.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-osf-sc-ly1--base EBGaramond-ExtraBold "AutoEnc_2xdej53vfkjumr6wkun3igxjtf ReEncodeFont" <[ebgm_2xdej5.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-osf-swash-ot1 EBGaramond-ExtraBold "AutoEnc_t4t3wmxarqpqo4t5vwiyucfrpa ReEncodeFont" <[ebgm_t4t3wm.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-osf-swash-t1--base EBGaramond-ExtraBold "AutoEnc_zjrm7oiav7ih6lgry4bga5rocb ReEncodeFont" <[ebgm_zjrm7o.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-osf-swash-ly1 EBGaramond-ExtraBold "AutoEnc_mnvma6c2scz5splrrrlgnwdtzc ReEncodeFont" <[ebgm_mnvma6.enc <EBGaramond-ExtraBold.pfb
+EBGaramond-ExtraBold-osf-ts1--base EBGaramond-ExtraBold "AutoEnc_ld6df2x7jielfy7kpphsipzgeb ReEncodeFont" <[ebgm_ld6df2.enc <EBGaramond-ExtraBold.pfb
 
 EBGaramondInitials-tlf-ot1 EBGaramondInitials "AutoEnc_liamowwj6bkl6mtj7xyoefkgke ReEncodeFont" <[ebgm_liamow.enc <EBGaramondInitials.pfb
 EBGaramondInitials-tlf-t1--base EBGaramondInitials "AutoEnc_liamowwj6bkl6mtj7xyoefkgke ReEncodeFont" <[ebgm_liamow.enc <EBGaramondInitials.pfb
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-inf-ly1.tfm
index 935fa5b3723..e0606ade75a 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-inf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-inf-ot1.tfm
index b3b1605810e..e016d50e39d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-inf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-inf-t1--base.tfm
index a4d2795d808..8d3fa1ec54d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-inf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-inf-t1.tfm
index 4a34d500ef0..06b95391ef7 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-inf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-ly1.tfm
index c4ade0f0034..9bc27a5d97b 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-ot1.tfm
index b773dcd8a90..78446c927ba 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-ly1--base.tfm
index 6c4003dc970..911c239c92b 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-ly1.tfm
index 4c99470024f..edea267002f 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-ot1--base.tfm
index b8cf8a005d9..0ec033659ff 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-ot1.tfm
index 07f31092ad0..3778f16001f 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-t1--base.tfm
index 050d94e30c2..19362504dc7 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-t1.tfm
index a434db028c4..91d5bd9fda9 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-swash-ly1.tfm
index c13575f422b..6f86e06e83d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-swash-ot1.tfm
index e622021f935..85cb4c323a3 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-swash-t1--base.tfm
index 576c27709ab..7f52ed6891c 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-swash-t1.tfm
index a2976a55a25..3cb521ab4ce 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-t1--base.tfm
index 7265014c2d0..8c1c8697383 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-t1.tfm
index 73a0e7c8c8a..1872e503757 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-titling-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-titling-ly1.tfm
index c4ade0f0034..9bc27a5d97b 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-titling-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-titling-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-titling-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-titling-ot1.tfm
index b773dcd8a90..78446c927ba 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-titling-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-titling-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-titling-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-titling-t1--base.tfm
index 7265014c2d0..8c1c8697383 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-titling-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-titling-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-titling-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-titling-t1.tfm
index 73a0e7c8c8a..1872e503757 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-titling-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-titling-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-ts1--base.tfm
index b7c7e68508c..bf03342626e 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-ts1.tfm
index 4dc96969d2e..4b621defc9b 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-ly1.tfm
index 5c596f2a86a..bee792d603a 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-ot1.tfm
index 2eaf1a32c30..d5a6bb15343 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-ly1--base.tfm
index f86771505eb..c4154927f73 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-ly1.tfm
index 3d99e148636..c1e734494d0 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-ot1--base.tfm
index 64f992608e6..bdf71d63e3f 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-ot1.tfm
index 8b8ea53d6b3..0a3eec88e5b 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-t1--base.tfm
index 6bd0e3bd830..95f64fcab17 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-t1.tfm
index 65ba3a90c37..6bf7b55b569 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-swash-ly1.tfm
index 1fee4514b02..d4bf41128ec 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-swash-ot1.tfm
index 446ac025a2b..822490fba9e 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-swash-t1--base.tfm
index 13ee513fcc7..eb466105790 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-swash-t1.tfm
index bbbeba71a03..ec62f4308a8 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-t1--base.tfm
index 432b18b2e95..fbcd14a6954 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-t1.tfm
index aa6a79d871a..156f0c5ec0c 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-ts1--base.tfm
index b7c7e68508c..bf03342626e 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-ts1.tfm
index 4dc96969d2e..4b621defc9b 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-osf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-sup-ly1.tfm
index 3ecbe8e0223..92dcba29458 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-sup-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-sup-ot1.tfm
index fa4fdcb9821..b4926425e44 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-sup-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-sup-t1--base.tfm
index dc43f67ac49..4deea799a84 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-sup-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-sup-t1.tfm
index c679ed2c23c..4cca12cd497 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-sup-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-ly1.tfm
index 1706d7e7b3e..c1ada1c4a18 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-ot1.tfm
index 42aa950b011..8530a30f902 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-ly1--base.tfm
index 654527f5ec2..c08da0527bb 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-ly1.tfm
index fbdd0402d5c..76377afceef 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-ot1--base.tfm
index 33a7f4b3c37..c2e626af71a 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-ot1.tfm
index 6ec61dd70bc..cbba15b9b76 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-t1--base.tfm
index c8ef3d8ba78..c3cfc7c0676 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-t1.tfm
index b20cb9f3559..ae396d10aff 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-swash-ly1.tfm
index 68da0b3fb26..72ec091a2cf 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-swash-ot1.tfm
index ace4f21a71b..c024bdf273d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-swash-t1--base.tfm
index 2856eabaa5c..35ef4ff841a 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-swash-t1.tfm
index 10f603dd59c..820c0f8e665 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-t1--base.tfm
index 01774839929..daf9b0c0d53 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-t1.tfm
index 8336723b4a0..5851b5f82aa 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-titling-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-titling-ly1.tfm
index 7c74b9e6499..acec3d02804 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-titling-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-titling-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-titling-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-titling-ot1.tfm
index b773dcd8a90..78446c927ba 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-titling-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-titling-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-titling-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-titling-t1--base.tfm
index 7265014c2d0..8c1c8697383 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-titling-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-titling-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-titling-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-titling-t1.tfm
index 73a0e7c8c8a..1872e503757 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-titling-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-titling-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-ts1--base.tfm
index b4e064f9224..54e757cf80c 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-ts1.tfm
index b60c80959c1..de065515e06 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tlf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-ly1.tfm
index 32eea9552e1..03567119188 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-ot1.tfm
index aebe4c14b16..ae22627a738 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-ly1--base.tfm
index bafeb3f67fd..9b9a7c6f93b 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-ly1.tfm
index f6cf23a9c87..831e1fa01f2 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-ot1--base.tfm
index 46881284f70..197b06964f5 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-ot1.tfm
index d22a61c099c..71f7d116f3c 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-t1--base.tfm
index 8648366efbc..5eb46469426 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-t1.tfm
index ebeb9f3ae97..e57c7b216af 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-swash-ly1.tfm
index 612ea5795a7..26d92ece7c9 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-swash-ot1.tfm
index 8e15b877d72..dda790bf0e3 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-swash-t1--base.tfm
index 6feb0a029b9..7f9d256558d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-swash-t1.tfm
index 7d874decc79..aebefe5a87c 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-t1--base.tfm
index 81c390b2fbb..4291f24ef72 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-t1.tfm
index b9f11d7139f..85506e0914d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-ts1--base.tfm
index b4e064f9224..54e757cf80c 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-ts1.tfm
index b60c80959c1..de065515e06 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-BoldItalic-tosf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-inf-ly1.tfm
index 9071871c4af..8dc0f2e7cfe 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-inf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-inf-ot1.tfm
index 94a4f221837..ad937d7f06b 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-inf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-inf-t1--base.tfm
index 36c0116e112..1ff3deb0f0e 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-inf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-inf-t1.tfm
index c72243a698d..352f8ca7e51 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-inf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-ly1.tfm
index 289d394e0f3..136ca6c47c4 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-ot1.tfm
index 5acb3464dcc..999f052eecc 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-ly1--base.tfm
index e3e3a5169c2..4467fd21e0e 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-ly1.tfm
index 392e6f0d1ee..414d57ff050 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-ot1--base.tfm
index 1a7731bc22e..d3451f4b163 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-ot1.tfm
index 51c093e5579..c72fda0cc42 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-t1--base.tfm
index 5b849c7a433..94ecdcec86f 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-t1.tfm
index 73f26f1d6bd..41f6b910edc 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-swash-ly1.tfm
index 265faca8c29..f7b0ff58ac5 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-swash-ot1.tfm
index b915f89372c..860133be939 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-swash-t1--base.tfm
index d9fdb37eb12..1e1c12b5bb7 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-swash-t1.tfm
index 1fa9cb03d56..2eae2661016 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-t1--base.tfm
index af456c01077..cf4855eddb9 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-t1.tfm
index bc2d90a133e..ae97725e139 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-titling-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-titling-ly1.tfm
index 289d394e0f3..136ca6c47c4 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-titling-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-titling-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-titling-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-titling-ot1.tfm
index 5acb3464dcc..999f052eecc 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-titling-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-titling-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-titling-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-titling-t1--base.tfm
index af456c01077..cf4855eddb9 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-titling-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-titling-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-titling-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-titling-t1.tfm
index bc2d90a133e..ae97725e139 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-titling-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-titling-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-ts1--base.tfm
index 0b8b3795007..fbffd3e5d59 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-ts1.tfm
index 9b61b26be97..480034b6ddc 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-ly1.tfm
index f6e9ca7e839..c8032a56951 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-ot1.tfm
index 1fb4851ce5a..ffa079c0f4d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-ly1--base.tfm
index 8989c32f542..d3af166a239 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-ly1.tfm
index 460986af621..33f5b473087 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-ot1--base.tfm
index 00491df0eb1..a4fd7113918 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-ot1.tfm
index 0896acea8f0..8a93c3acc90 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-t1--base.tfm
index bfeaaa1442f..b7f7c5487fd 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-t1.tfm
index 3812b8397de..0e725c04652 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-swash-ly1.tfm
index 0e16436cdb1..d3f73fc6654 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-swash-ot1.tfm
index 59bc2a0652b..f8e4af13c95 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-swash-t1--base.tfm
index 1b8d6fc2bc4..580e115e7a2 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-swash-t1.tfm
index ce418c51844..377dcec8ab7 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-t1--base.tfm
index b01fcbeca16..5a538317eb7 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-t1.tfm
index aa8c3ab663c..10b4381b7c7 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-ts1--base.tfm
index 0b8b3795007..fbffd3e5d59 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-ts1.tfm
index 9b61b26be97..480034b6ddc 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-osf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-sup-ly1.tfm
index 8ec5ef23552..3bd6600e5d1 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-sup-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-sup-ot1.tfm
index 3adf298a124..45b1e08d643 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-sup-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-sup-t1--base.tfm
index 2cb26bc40e0..3ea2f3c7ef5 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-sup-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-sup-t1.tfm
index 73d5bc4d1a8..67753eec7c5 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-sup-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-ly1.tfm
index 159faa6dcae..415bdb2560e 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-ot1.tfm
index 30f9ea26568..e812c66f972 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-ly1--base.tfm
index 0d2af721007..5daf7ac024c 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-ly1.tfm
index 936fc399849..c4412f74e0a 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-ot1--base.tfm
index 666d6eb99a7..b1f978fd889 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-ot1.tfm
index 67dc591e050..d8b4adb3869 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-t1--base.tfm
index ef00f0de311..103932fe08c 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-t1.tfm
index 0437e057a4e..636c40ff896 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-swash-ly1.tfm
index db3d002b6c2..53cb90b35f5 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-swash-ot1.tfm
index 3c5f54d4884..eb2e715427b 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-swash-t1--base.tfm
index 9006d778d8d..1745674bd6c 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-swash-t1.tfm
index 56fd8de2996..3df6c0b8691 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-t1--base.tfm
index 789d3c24aed..6d9f20f7984 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-t1.tfm
index 2614966121c..38f3b797726 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-titling-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-titling-ly1.tfm
index edc5cdf3e63..545f775b00a 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-titling-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-titling-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-titling-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-titling-ot1.tfm
index 5acb3464dcc..999f052eecc 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-titling-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-titling-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-titling-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-titling-t1--base.tfm
index af456c01077..cf4855eddb9 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-titling-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-titling-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-titling-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-titling-t1.tfm
index bc2d90a133e..ae97725e139 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-titling-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-titling-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-ts1--base.tfm
index 348d1e63091..58c1a72dafb 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-ts1.tfm
index 5cea8b03ec5..7373a1fcb9f 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tlf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-ly1.tfm
index 6461ba7709c..f9f52fefbbc 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-ot1.tfm
index d2ef2bab444..4e32d1ff8bf 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-ly1--base.tfm
index 27e4e04c08a..1cba6593b7f 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-ly1.tfm
index b4f5e6b2463..554f47f420a 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-ot1--base.tfm
index f9fa8f69585..eec23072e9b 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-ot1.tfm
index 6ca3c0f8f81..a0f0b0e720f 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-t1--base.tfm
index b783a5a7c21..c2b2153dcba 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-t1.tfm
index 69fd7122e0c..6f71795b967 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-swash-ly1.tfm
index 495fa847248..5feafb0847d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-swash-ot1.tfm
index 4c146b9b1e2..33445e27029 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-swash-t1--base.tfm
index 01b404d13cd..5c47d13e250 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-swash-t1.tfm
index 02fca5114fb..66be12e1725 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-t1--base.tfm
index 77430f9eaac..eee61251ce9 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-t1.tfm
index 87677d74327..8ead002c540 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-ts1--base.tfm
index 348d1e63091..58c1a72dafb 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-ts1.tfm
index 5cea8b03ec5..7373a1fcb9f 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-ExtraBoldItalic-tosf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-inf-ly1.tfm
index 979bba2d85a..7b9bb6df78f 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-inf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-inf-ot1.tfm
index d2421170514..b9ec9ba47ed 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-inf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-inf-t1--base.tfm
index a631e5e6c97..0e9dab9aadc 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-inf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-inf-t1.tfm
index af52fd3c41d..7de67f0b30d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-inf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-ly1.tfm
index 4b4ec6eae87..c2e5de4a825 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-ot1.tfm
index 1b02c5d2a25..6c817712d46 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-ly1--base.tfm
index 6d872f4bdea..0cee707944d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-ly1.tfm
index 36a3ab0cb5c..70b39c870a0 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-ot1--base.tfm
index 6c10e4ecff5..bc10c63cb71 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-ot1.tfm
index bdf3d75eb79..bbe240fb10c 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-t1--base.tfm
index 86a144762a0..1eb62f35c8c 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-t1.tfm
index 9204d948b13..d6432019ef9 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-swash-ly1.tfm
index 5b52f436c95..c29d1f75fa0 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-swash-ot1.tfm
index abc3dfb68f6..a15273f2d63 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-swash-t1--base.tfm
index 000553688fd..3821a465b98 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-swash-t1.tfm
index 47f18af40b0..edd7045669d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-t1--base.tfm
index feb408d515b..f1eff3a43fd 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-t1.tfm
index 8de333452a9..170b5c7b3ca 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-titling-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-titling-ly1.tfm
index 4b4ec6eae87..c2e5de4a825 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-titling-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-titling-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-titling-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-titling-ot1.tfm
index 1b02c5d2a25..6c817712d46 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-titling-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-titling-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-titling-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-titling-t1--base.tfm
index feb408d515b..f1eff3a43fd 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-titling-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-titling-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-titling-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-titling-t1.tfm
index 8de333452a9..170b5c7b3ca 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-titling-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-titling-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-ts1--base.tfm
index ac9876f1b1d..49a3a2dd290 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-ts1.tfm
index 2324e48dc83..12fd9a3c0f8 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-ly1.tfm
index d4003b955ef..906f14112b0 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-ot1.tfm
index 9b6366436a7..a1fd312c842 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-ly1--base.tfm
index a117015970c..ab7454a4f1b 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-ly1.tfm
index 660c2b04eb2..5aa5fa82107 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-ot1--base.tfm
index 3c233e77814..a8576a14e41 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-ot1.tfm
index bf9734dd4fd..c14be6c00d6 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-t1--base.tfm
index 059d1207682..ee10e452146 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-t1.tfm
index b30bbe505ec..58dd58e1fab 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-swash-ly1.tfm
index dbca6d8717c..a805cd88dcd 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-swash-ot1.tfm
index cc3a7e908a7..a1b4dfdcf97 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-swash-t1--base.tfm
index 76fd166ce44..46de5af66ba 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-swash-t1.tfm
index 49fdc100a8a..d174528dbba 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-t1--base.tfm
index 34a07ccf5e0..536a477feb3 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-t1.tfm
index dda9251a74e..689774df34f 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-ts1--base.tfm
index ac9876f1b1d..49a3a2dd290 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-ts1.tfm
index 2324e48dc83..12fd9a3c0f8 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-osf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-sup-ly1.tfm
index 76e815dcac8..c9a2df4a4e5 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-sup-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-sup-ot1.tfm
index 5ff36c4e361..9c2f82e044f 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-sup-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-sup-t1--base.tfm
index 516beb0b7a1..5b3964b6125 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-sup-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-sup-t1.tfm
index f5e0aebbf49..5f946dd2917 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-sup-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-ly1.tfm
index 2120d343319..38cf979d0f7 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-ot1.tfm
index 1aa68dc2263..e5286b1ceec 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-ly1--base.tfm
index 719f8abc22d..f27927e84b5 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-ly1.tfm
index d16b0b8e3e9..f15f5db0fc4 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-ot1--base.tfm
index 7c90aab9b5e..f1505123f3d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-ot1.tfm
index 279c1b27b0f..c54ebcca1d3 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-t1--base.tfm
index 21723f9658c..d8ab735b001 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-t1.tfm
index 3c153e5a701..2b4e793ef02 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-swash-ly1.tfm
index fb7879dd19a..12310a29ddd 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-swash-ot1.tfm
index 5cfcca0c9fa..1ea7aff3562 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-swash-t1--base.tfm
index 2db189e69ed..ec9a12ffaef 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-swash-t1.tfm
index bc6905832e4..f641cd84f82 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-t1--base.tfm
index bef331f58b8..4bb7183541a 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-t1.tfm
index 395862f7da7..3b82f11adc6 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-titling-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-titling-ly1.tfm
index c287c070c9c..69e99433e99 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-titling-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-titling-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-titling-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-titling-ot1.tfm
index 1b02c5d2a25..6c817712d46 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-titling-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-titling-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-titling-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-titling-t1--base.tfm
index feb408d515b..f1eff3a43fd 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-titling-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-titling-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-titling-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-titling-t1.tfm
index 8de333452a9..170b5c7b3ca 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-titling-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-titling-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-ts1--base.tfm
index 0d65d94f14c..c38ae1afade 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-ts1.tfm
index eb155344ca5..c2c3dbd6fad 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tlf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-ly1.tfm
index 9fb831a95ae..bdd1e91c117 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-ot1.tfm
index 96ba15d8c9f..9caecd19043 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-ly1--base.tfm
index 5a43d8406b5..e2f374406e2 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-ly1.tfm
index 39c68cabb78..5a1e854efe2 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-ot1--base.tfm
index 2ddd1f39f11..46326167390 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-ot1.tfm
index 1037b3785df..c115a72f2fa 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-t1--base.tfm
index c744c96e386..afbe2f56b18 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-t1.tfm
index 5f7ceb93323..5f440f02b3a 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-swash-ly1.tfm
index eaeeda2f8bf..7ca9a4b857e 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-swash-ot1.tfm
index 2d195210499..7599b389f65 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-swash-t1--base.tfm
index 4ba6ed721ea..14d4c9afa63 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-swash-t1.tfm
index fba5364f819..763d8484198 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-t1--base.tfm
index 70080316e5f..2b4866d875d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-t1.tfm
index cc273ffe6f4..eb2a99f5cec 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-ts1--base.tfm
index 0d65d94f14c..c38ae1afade 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-ts1.tfm
index eb155344ca5..c2c3dbd6fad 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-Italic-tosf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-inf-ly1.tfm
index 89e5fa4dfab..67057761cb3 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-inf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-inf-ot1.tfm
index 6760a17340b..5180106c601 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-inf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-inf-t1--base.tfm
index 310993636c6..b489e58c01d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-inf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-inf-t1.tfm
index 5831ee2d999..0bc6fba3169 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-inf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-ly1.tfm
index 69ebbb268de..40f43c1e895 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-ot1.tfm
index e2d017dd1a7..81e25d593ab 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-ly1--base.tfm
index 97e63b25311..cfa54a828c5 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-ly1.tfm
index d92d4d8dc5e..068658deee7 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-ot1--base.tfm
index 4a0e0429f86..d0f17671f0d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-ot1.tfm
index 5d6e97565eb..d3c3523dc31 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-t1--base.tfm
index d6de7fdfac4..e699d5f3c09 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-t1.tfm
index a8a9b0cf0ca..e4d47457bb2 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-swash-ly1.tfm
index 88b72efbc29..d5784ca2b8d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-swash-ot1.tfm
index 8775a8b74d0..29ea509a7bb 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-swash-t1--base.tfm
index 3cee810bcc9..d93e58b6a18 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-swash-t1.tfm
index 5ebab617156..31039257d53 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-t1--base.tfm
index 5a1214a7b37..429819cf8a5 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-t1.tfm
index 13a0d6fc729..4d4a1ea6868 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-titling-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-titling-ly1.tfm
index 69ebbb268de..40f43c1e895 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-titling-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-titling-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-titling-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-titling-ot1.tfm
index e2d017dd1a7..81e25d593ab 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-titling-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-titling-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-titling-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-titling-t1--base.tfm
index 5a1214a7b37..429819cf8a5 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-titling-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-titling-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-titling-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-titling-t1.tfm
index 13a0d6fc729..4d4a1ea6868 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-titling-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-titling-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-ts1--base.tfm
index 3d02cce091c..05220ed259d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-ts1.tfm
index aa89f721afb..ff76cd5ff81 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-ly1.tfm
index de9c8feae6d..4af9677c766 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-ot1.tfm
index 780d1f5b98b..463b14822bf 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-ly1--base.tfm
index 5e0ad55032b..f395e4f72a5 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-ly1.tfm
index 15dc946a0ee..238cdf086fa 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-ot1--base.tfm
index 0f8288aead3..6449722c393 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-ot1.tfm
index 678e69bfae2..e8335c9a3e3 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-t1--base.tfm
index af1a9ba216d..c0da3b0e69f 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-t1.tfm
index 8edb60065a2..f5cc8d0eea0 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-swash-ly1.tfm
index c5eb1060690..77bd165ce93 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-swash-ot1.tfm
index 40f31491734..e0df74ab0a2 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-swash-t1--base.tfm
index 5ab0983ce86..1690b016ddb 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-swash-t1.tfm
index 3d6ef71c921..09023cff7a8 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-t1--base.tfm
index 9230cd8bcf5..cba4c1a5ca0 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-t1.tfm
index fd03b2c72da..41543603bd6 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-ts1--base.tfm
index 3d02cce091c..05220ed259d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-ts1.tfm
index aa89f721afb..ff76cd5ff81 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-osf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-sup-ly1.tfm
index b14abdc0aca..cd8adc43a8b 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-sup-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-sup-ot1.tfm
index 0fde9cd4983..903ff64af34 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-sup-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-sup-t1--base.tfm
index 0ac3ee38fc6..e87fed1aa8f 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-sup-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-sup-t1.tfm
index aeada1d96b2..c46c117ed60 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-sup-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-ly1.tfm
index 727bdcaa859..68b9a199e53 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-ot1.tfm
index f827bd0049b..d937b6209e4 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-ly1--base.tfm
index f70da990b58..e95ba79be42 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-ly1.tfm
index 411854003f7..9f804ab9305 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-ot1--base.tfm
index 29fe6a28d19..464cc74a3f1 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-ot1.tfm
index 4e8cf39204e..8587cae581d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-t1--base.tfm
index f436bc28346..342101d5ac9 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-t1.tfm
index ebb3b8ad091..23d8f041a50 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-swash-ly1.tfm
index 65d87c33f17..3ed6fe8d924 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-swash-ot1.tfm
index 19c29ba3f4e..0e820b3e1f3 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-swash-t1--base.tfm
index 7cb18f50344..e3e827947c4 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-swash-t1.tfm
index c2ef7f062e8..ff22fb78b18 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-t1--base.tfm
index 8d4ac8580ef..98d6361ce02 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-t1.tfm
index 39cfe3b6097..0d9b44d70e7 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-titling-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-titling-ly1.tfm
index 5f6efcd121c..2f73a4587f5 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-titling-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-titling-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-titling-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-titling-ot1.tfm
index e2d017dd1a7..81e25d593ab 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-titling-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-titling-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-titling-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-titling-t1--base.tfm
index 5a1214a7b37..429819cf8a5 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-titling-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-titling-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-titling-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-titling-t1.tfm
index 13a0d6fc729..4d4a1ea6868 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-titling-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-titling-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-ts1--base.tfm
index f7742822fa9..48683f35d7d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-ts1.tfm
index 90a20f40377..079b05f3d6c 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tlf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-ly1.tfm
index fbc0cff3b13..cac89407dd3 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-ot1.tfm
index 6d11a990f9f..42d52b4bfa6 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-ly1--base.tfm
index 31821412310..ae95da5b970 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-ly1.tfm
index a4dcc68786e..f682fbec3ab 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-ot1--base.tfm
index 93d339f291a..7fa0b2c78c7 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-ot1.tfm
index 7717558da19..0b1ae283b89 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-t1--base.tfm
index 71e21ab185c..1d36327d1a9 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-t1.tfm
index 3c9318a3d12..951071e9d34 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-swash-ly1.tfm
index 1e1eb6fefef..0457fb37354 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-swash-ot1.tfm
index 09620b48e85..5f1d7f2c0b4 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-swash-t1--base.tfm
index e48910cae5b..f01c9017adb 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-swash-t1.tfm
index 183d2ff2df5..d51864f2c84 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-t1--base.tfm
index 5d03e96fc01..ee294861977 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-t1.tfm
index a8ffc87b00e..6d116b64b58 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-ts1--base.tfm
index f7742822fa9..48683f35d7d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-ts1.tfm
index 90a20f40377..079b05f3d6c 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-MediumItalic-tosf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-inf-ly1.tfm
index 7a763be7137..1930aba5065 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-inf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-inf-ot1.tfm
index 3eff82f31e0..b881f18993f 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-inf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-inf-t1--base.tfm
index 132269fe5d5..5ca3f2771ee 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-inf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-inf-t1.tfm
index 9931c708698..4d9af0f55b2 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-inf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-ly1.tfm
index f2cfb392043..603f7da4b71 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-ot1.tfm
index df1f5f23183..6fa322c3aa6 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-ly1--base.tfm
index 1fad5b68e29..0d697f0659e 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-ly1.tfm
index 1ef625119fb..9adf454adda 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-ot1--base.tfm
index 0dd1df27442..87880c06922 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-ot1.tfm
index 24b14ec4b6f..e77d6484ded 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-t1--base.tfm
index 44b1df61cc2..d7c25bca9f3 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-t1.tfm
index 21c396a50c4..f3968b25ae0 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-swash-ly1.tfm
index 5e7588c5da7..effacd49508 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-swash-ot1.tfm
index 00cacfdd05c..b78217603ec 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-swash-t1--base.tfm
index 4ffcba0ab29..c3ede67af93 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-swash-t1.tfm
index f9003941766..51383f9e10d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-t1--base.tfm
index 0ac07f3a8af..0d82cc878f5 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-t1.tfm
index 7f070e40880..15b8e6584ab 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-titling-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-titling-ly1.tfm
index f2cfb392043..603f7da4b71 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-titling-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-titling-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-titling-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-titling-ot1.tfm
index df1f5f23183..6fa322c3aa6 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-titling-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-titling-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-titling-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-titling-t1--base.tfm
index 0ac07f3a8af..0d82cc878f5 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-titling-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-titling-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-titling-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-titling-t1.tfm
index 7f070e40880..15b8e6584ab 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-titling-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-titling-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-ts1--base.tfm
index b52b4262b44..5a62dcc6e6d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-ts1.tfm
index 47b767e99ed..d8e51d253d7 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-ly1.tfm
index 35f59ba3de2..e04bd7e036d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-ot1.tfm
index e160d876275..166ae0fbe39 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-ly1--base.tfm
index b3035be7f65..2cac64b78eb 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-ly1.tfm
index b97f110d259..ddfca4d146a 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-ot1--base.tfm
index d20b1b1d583..5930ebee7a0 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-ot1.tfm
index 09f9d4919cd..026198eb57f 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-t1--base.tfm
index f5e2d781990..e842d6bf16e 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-t1.tfm
index cfaf0efbcfa..6ad6aacf793 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-swash-ly1.tfm
index 01483039fe3..832f3d1b047 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-swash-ot1.tfm
index 1d7b3ef5eb1..c3fcc842807 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-swash-t1--base.tfm
index a21440f9ddb..ccb5ee2416e 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-swash-t1.tfm
index 59e98935e46..d8a43890e62 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-t1--base.tfm
index 2963479ae2b..dbfd63b02ef 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-t1.tfm
index 11d2c2a4f93..e96cc3e32af 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-ts1--base.tfm
index b52b4262b44..5a62dcc6e6d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-ts1.tfm
index 47b767e99ed..d8e51d253d7 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-osf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-sup-ly1.tfm
index 8453477b30d..bfedf66cc74 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-sup-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-sup-ot1.tfm
index a7059cce39b..9cbd09581a3 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-sup-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-sup-t1--base.tfm
index 72cae113fe3..e8d74cf71df 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-sup-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-sup-t1.tfm
index 40a23fc3b11..fd8e7e14919 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-sup-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-ly1.tfm
index 300064d5158..7c23fe9fdcc 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-ot1.tfm
index e91f2240ab0..b33d8529d4c 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-ly1--base.tfm
index 7cc55844b88..dc761206819 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-ly1.tfm
index 6550e32ed2f..61efd172b7b 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-ot1--base.tfm
index e8820046214..b640d8df804 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-ot1.tfm
index c9ee8baa73d..fad8db9fa1e 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-t1--base.tfm
index 8324e457e0f..6f89ca1665f 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-t1.tfm
index 67d296dcf8b..59de64d6348 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-swash-ly1.tfm
index b41720e4221..b60da67d8bb 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-swash-ot1.tfm
index db219b5af17..d7243d23cef 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-swash-t1--base.tfm
index d0e9134d1d7..33e269a5465 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-swash-t1.tfm
index 5f5ccd8df0f..7f783a93065 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-t1--base.tfm
index 134a79d2d8d..9682afb0fc2 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-t1.tfm
index 1a0718d2b85..71047853273 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-titling-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-titling-ly1.tfm
index ce7bbb33184..f32d406f0b6 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-titling-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-titling-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-titling-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-titling-ot1.tfm
index df1f5f23183..6fa322c3aa6 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-titling-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-titling-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-titling-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-titling-t1--base.tfm
index 0ac07f3a8af..0d82cc878f5 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-titling-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-titling-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-titling-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-titling-t1.tfm
index 7f070e40880..15b8e6584ab 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-titling-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-titling-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-ts1--base.tfm
index 8f9ee553be6..75de4466524 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-ts1.tfm
index 57e6ea06c8d..1e7921626c5 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tlf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-ly1.tfm
index 26c8a4b2079..e3dc983109f 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-ot1.tfm
index d63f5f02376..c5d7bd6f97b 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-ly1--base.tfm
index e0003f95835..d1455832e61 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-ly1.tfm
index f9d3bf1c4b1..c91db67c349 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-ot1--base.tfm
index 7875ee5c9d1..75dd5ae4dc7 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-ot1.tfm
index 6d280156903..fbff019160e 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-t1--base.tfm
index 96ce23323e3..d21c1dec222 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-t1.tfm
index 0d1161d27d4..162d64016fd 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-swash-ly1.tfm
index 39185248762..24c8712cd78 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-swash-ot1.tfm
index 5a7b30d02b7..0e9c5b007d2 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-swash-t1--base.tfm
index 78f40b3629f..0937e5b4016 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-swash-t1.tfm
index f426ad1eb72..78dcb3715cd 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-t1--base.tfm
index 16250ea8107..a9d98d56edb 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-t1.tfm
index 70b5d0f9aa7..0df3aa6f07d 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-ts1--base.tfm
index 8f9ee553be6..75de4466524 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-ts1.tfm
index 57e6ea06c8d..1e7921626c5 100644
--- a/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ebgaramond/EBGaramond-SemiBoldItalic-tosf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/type1/public/ebgaramond/EBGaramond12-Italic.pfb b/Master/texmf-dist/fonts/type1/public/ebgaramond/EBGaramond12-Italic.pfb
deleted file mode 100644
index 7be201c063a..00000000000
--- a/Master/texmf-dist/fonts/type1/public/ebgaramond/EBGaramond12-Italic.pfb
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/type1/public/ebgaramond/EBGaramondInitials.pfb b/Master/texmf-dist/fonts/type1/public/ebgaramond/EBGaramondInitials.pfb
index dfc0d7b57cf..ad65325c1d9 100644
--- a/Master/texmf-dist/fonts/type1/public/ebgaramond/EBGaramondInitials.pfb
+++ b/Master/texmf-dist/fonts/type1/public/ebgaramond/EBGaramondInitials.pfb
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-Inf.fd b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-Inf.fd
index 2f1d3a39ee4..d4f2d6403a7 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-Inf.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{LY1EBGaramond-Inf.fd}
-    [2018/11/30 (autoinst)  Font definitions for LY1/EBGaramond-Inf.]
+    [2019/04/07 (autoinst)  Font definitions for LY1/EBGaramond-Inf.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{LY1}{EBGaramond-Inf}{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-inf-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-inf-ly1
+\DeclareFontShape{LY1}{EBGaramond-Inf}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{eb}{sl}{
-      <-> ssub * EBGaramond-Inf/eb/it
+\DeclareFontShape{LY1}{EBGaramond-Inf}{regular}{sl}{
+      <-> ssub * EBGaramond-Inf/regular/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{b}{it}{
+\DeclareFontShape{LY1}{EBGaramond-Inf}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{b}{sl}{
-      <-> ssub * EBGaramond-Inf/b/it
+\DeclareFontShape{LY1}{EBGaramond-Inf}{bold}{sl}{
+      <-> ssub * EBGaramond-Inf/bold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{sb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-Inf}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{sb}{sl}{
-      <-> ssub * EBGaramond-Inf/sb/it
+\DeclareFontShape{LY1}{EBGaramond-Inf}{semibold}{sl}{
+      <-> ssub * EBGaramond-Inf/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{mb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-Inf}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{mb}{sl}{
-      <-> ssub * EBGaramond-Inf/mb/it
+\DeclareFontShape{LY1}{EBGaramond-Inf}{medium}{sl}{
+      <-> ssub * EBGaramond-Inf/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{extrabold}{sl}{
+      <-> ssub * EBGaramond-Inf/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{m}{sl}{
+      <-> ssub * EBGaramond-Inf/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-Inf}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-inf-ly1
+      <-> ssub * EBGaramond-Inf/regular/n
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-Inf}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-inf-ly1
+      <-> ssub * EBGaramond-Inf/regular/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{m}{sl}{
-      <-> ssub * EBGaramond-Inf/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{sb}{sl}{
+      <-> ssub * EBGaramond-Inf/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{bx}{sl}{
-      <-> ssub * EBGaramond-Inf/b/sl
+\DeclareFontShape{LY1}{EBGaramond-Inf}{sb}{n}{
+      <-> ssub * EBGaramond-Inf/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{sb}{it}{
+      <-> ssub * EBGaramond-Inf/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{b}{sl}{
+      <-> ssub * EBGaramond-Inf/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{b}{n}{
+      <-> ssub * EBGaramond-Inf/bold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{b}{it}{
+      <-> ssub * EBGaramond-Inf/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{eb}{sl}{
+      <-> ssub * EBGaramond-Inf/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{eb}{n}{
+      <-> ssub * EBGaramond-Inf/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{eb}{it}{
+      <-> ssub * EBGaramond-Inf/extrabold/it
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-Inf}{bx}{n}{
       <-> ssub * EBGaramond-Inf/b/n
 }{}
 
+\DeclareFontShape{LY1}{EBGaramond-Inf}{bx}{sl}{
+      <-> ssub * EBGaramond-Inf/b/sl
+}{}
+
 \DeclareFontShape{LY1}{EBGaramond-Inf}{bx}{it}{
       <-> ssub * EBGaramond-Inf/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-LF.fd b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-LF.fd
index 9a58edaaa52..3df35e16aba 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-LF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{LY1EBGaramond-LF.fd}
-    [2018/11/30 (autoinst)  Font definitions for LY1/EBGaramond-LF.]
+    [2019/04/07 (autoinst)  Font definitions for LY1/EBGaramond-LF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,242 +11,448 @@
 
 \DeclareFontFamily{LY1}{EBGaramond-LF}{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-titling-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-sc-ly1
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-ly1
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-ly1
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-swash-ly1
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-titling-ly1
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-swash-ly1
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{scsl}{
-      <-> ssub * EBGaramond-LF/eb/scit
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{scsl}{
+      <-> ssub * EBGaramond-LF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{sl}{
-      <-> ssub * EBGaramond-LF/eb/it
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{sl}{
+      <-> ssub * EBGaramond-LF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{tlsl}{
-      <-> ssub * EBGaramond-LF/eb/tlit
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{tlsl}{
+      <-> ssub * EBGaramond-LF/regular/tlit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{tl}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{sc}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{n}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{it}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{tlit}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{scsl}{
-      <-> ssub * EBGaramond-LF/b/scit
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{scsl}{
+      <-> ssub * EBGaramond-LF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{sl}{
-      <-> ssub * EBGaramond-LF/b/it
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{sl}{
+      <-> ssub * EBGaramond-LF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{tlsl}{
-      <-> ssub * EBGaramond-LF/b/tlit
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{tlsl}{
+      <-> ssub * EBGaramond-LF/bold/tlit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{tl}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{sc}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{n}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{tlit}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{scsl}{
-      <-> ssub * EBGaramond-LF/sb/scit
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-LF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{sl}{
-      <-> ssub * EBGaramond-LF/sb/it
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{sl}{
+      <-> ssub * EBGaramond-LF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{tlsl}{
-      <-> ssub * EBGaramond-LF/sb/tlit
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{tlsl}{
+      <-> ssub * EBGaramond-LF/semibold/tlit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{tl}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{sc}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{n}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{tlit}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{scsl}{
-      <-> ssub * EBGaramond-LF/mb/scit
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{scsl}{
+      <-> ssub * EBGaramond-LF/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{sl}{
+      <-> ssub * EBGaramond-LF/medium/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{tlsl}{
+      <-> ssub * EBGaramond-LF/medium/tlit
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-titling-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-titling-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-LF/extrabold/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{sl}{
-      <-> ssub * EBGaramond-LF/mb/it
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-LF/extrabold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{tlsl}{
-      <-> ssub * EBGaramond-LF/mb/tlit
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{tlsl}{
+      <-> ssub * EBGaramond-LF/extrabold/tlit
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{m}{scsl}{
+      <-> ssub * EBGaramond-LF/regular/scsl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{m}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-titling-ly1
+      <-> ssub * EBGaramond-LF/regular/tl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-sc-ly1
+      <-> ssub * EBGaramond-LF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-ly1
+      <-> ssub * EBGaramond-LF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-ly1
+      <-> ssub * EBGaramond-LF/regular/it
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-swash-ly1
+      <-> ssub * EBGaramond-LF/regular/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{m}{sl}{
+      <-> ssub * EBGaramond-LF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{m}{tlsl}{
+      <-> ssub * EBGaramond-LF/regular/tlsl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-sc-ly1
+      <-> ssub * EBGaramond-LF/regular/scit
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{m}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-titling-ly1
+      <-> ssub * EBGaramond-LF/regular/tlit
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-swash-ly1
+      <-> ssub * EBGaramond-LF/regular/nw
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{m}{scsl}{
-      <-> ssub * EBGaramond-LF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{scsl}{
+      <-> ssub * EBGaramond-LF/semibold/scsl
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{m}{sl}{
-      <-> ssub * EBGaramond-LF/m/it
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{tl}{
+      <-> ssub * EBGaramond-LF/semibold/tl
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{m}{tlsl}{
-      <-> ssub * EBGaramond-LF/m/tlit
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{sc}{
+      <-> ssub * EBGaramond-LF/semibold/sc
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{bx}{scsl}{
-      <-> ssub * EBGaramond-LF/b/scsl
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{n}{
+      <-> ssub * EBGaramond-LF/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{bx}{tl}{
-      <-> ssub * EBGaramond-LF/b/tl
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{it}{
+      <-> ssub * EBGaramond-LF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{bx}{sc}{
-      <-> ssub * EBGaramond-LF/b/sc
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{sw}{
+      <-> ssub * EBGaramond-LF/semibold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{sl}{
+      <-> ssub * EBGaramond-LF/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{tlsl}{
+      <-> ssub * EBGaramond-LF/semibold/tlsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{scit}{
+      <-> ssub * EBGaramond-LF/semibold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{tlit}{
+      <-> ssub * EBGaramond-LF/semibold/tlit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{nw}{
+      <-> ssub * EBGaramond-LF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{scsl}{
+      <-> ssub * EBGaramond-LF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{tl}{
+      <-> ssub * EBGaramond-LF/bold/tl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{sc}{
+      <-> ssub * EBGaramond-LF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{n}{
+      <-> ssub * EBGaramond-LF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{it}{
+      <-> ssub * EBGaramond-LF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{sw}{
+      <-> ssub * EBGaramond-LF/bold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{sl}{
+      <-> ssub * EBGaramond-LF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{tlsl}{
+      <-> ssub * EBGaramond-LF/bold/tlsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{scit}{
+      <-> ssub * EBGaramond-LF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{tlit}{
+      <-> ssub * EBGaramond-LF/bold/tlit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{nw}{
+      <-> ssub * EBGaramond-LF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{scsl}{
+      <-> ssub * EBGaramond-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{tl}{
+      <-> ssub * EBGaramond-LF/extrabold/tl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{sc}{
+      <-> ssub * EBGaramond-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{n}{
+      <-> ssub * EBGaramond-LF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{it}{
+      <-> ssub * EBGaramond-LF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{sw}{
+      <-> ssub * EBGaramond-LF/extrabold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{sl}{
+      <-> ssub * EBGaramond-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{tlsl}{
+      <-> ssub * EBGaramond-LF/extrabold/tlsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{scit}{
+      <-> ssub * EBGaramond-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{tlit}{
+      <-> ssub * EBGaramond-LF/extrabold/tlit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{nw}{
+      <-> ssub * EBGaramond-LF/extrabold/nw
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{bx}{n}{
       <-> ssub * EBGaramond-LF/b/n
 }{}
 
+\DeclareFontShape{LY1}{EBGaramond-LF}{bx}{sc}{
+      <-> ssub * EBGaramond-LF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{bx}{tl}{
+      <-> ssub * EBGaramond-LF/b/tl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{bx}{scsl}{
+      <-> ssub * EBGaramond-LF/b/scsl
+}{}
+
 \DeclareFontShape{LY1}{EBGaramond-LF}{bx}{it}{
       <-> ssub * EBGaramond-LF/b/it
 }{}
@@ -259,16 +465,16 @@
       <-> ssub * EBGaramond-LF/b/sl
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{bx}{tlsl}{
-      <-> ssub * EBGaramond-LF/b/tlsl
+\DeclareFontShape{LY1}{EBGaramond-LF}{bx}{tlit}{
+      <-> ssub * EBGaramond-LF/b/tlit
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{bx}{scit}{
       <-> ssub * EBGaramond-LF/b/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{bx}{tlit}{
-      <-> ssub * EBGaramond-LF/b/tlit
+\DeclareFontShape{LY1}{EBGaramond-LF}{bx}{tlsl}{
+      <-> ssub * EBGaramond-LF/b/tlsl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{bx}{nw}{
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-OsF.fd b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-OsF.fd
index 569b05bf3e1..85961b67240 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-OsF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{LY1EBGaramond-OsF.fd}
-    [2018/11/30 (autoinst)  Font definitions for LY1/EBGaramond-OsF.]
+    [2019/04/07 (autoinst)  Font definitions for LY1/EBGaramond-OsF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,178 +11,336 @@
 
 \DeclareFontFamily{LY1}{EBGaramond-OsF}{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-ly1
+\DeclareFontShape{LY1}{EBGaramond-OsF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-ly1
+\DeclareFontShape{LY1}{EBGaramond-OsF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{EBGaramond-OsF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-swash-ly1
+\DeclareFontShape{LY1}{EBGaramond-OsF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-osf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-swash-ly1
+\DeclareFontShape{LY1}{EBGaramond-OsF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-osf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{scsl}{
-      <-> ssub * EBGaramond-OsF/eb/scit
+\DeclareFontShape{LY1}{EBGaramond-OsF}{regular}{scsl}{
+      <-> ssub * EBGaramond-OsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{sl}{
-      <-> ssub * EBGaramond-OsF/eb/it
+\DeclareFontShape{LY1}{EBGaramond-OsF}{regular}{sl}{
+      <-> ssub * EBGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{sc}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{n}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{it}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-osf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-osf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{scsl}{
-      <-> ssub * EBGaramond-OsF/b/scit
+\DeclareFontShape{LY1}{EBGaramond-OsF}{bold}{scsl}{
+      <-> ssub * EBGaramond-OsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{sl}{
-      <-> ssub * EBGaramond-OsF/b/it
+\DeclareFontShape{LY1}{EBGaramond-OsF}{bold}{sl}{
+      <-> ssub * EBGaramond-OsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{sc}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{n}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-osf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-osf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{scsl}{
-      <-> ssub * EBGaramond-OsF/sb/scit
+\DeclareFontShape{LY1}{EBGaramond-OsF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{sl}{
-      <-> ssub * EBGaramond-OsF/sb/it
+\DeclareFontShape{LY1}{EBGaramond-OsF}{semibold}{sl}{
+      <-> ssub * EBGaramond-OsF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{mb}{n}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{mb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{mb}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{mb}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-osf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{mb}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-osf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{mb}{scsl}{
-      <-> ssub * EBGaramond-OsF/mb/scit
+\DeclareFontShape{LY1}{EBGaramond-OsF}{medium}{scsl}{
+      <-> ssub * EBGaramond-OsF/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{medium}{sl}{
+      <-> ssub * EBGaramond-OsF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{mb}{sl}{
-      <-> ssub * EBGaramond-OsF/mb/it
+\DeclareFontShape{LY1}{EBGaramond-OsF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-OsF/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{m}{scsl}{
+      <-> ssub * EBGaramond-OsF/regular/scsl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-OsF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-osf-sc-ly1
+      <-> ssub * EBGaramond-OsF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-OsF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-osf-ly1
+      <-> ssub * EBGaramond-OsF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-OsF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-osf-ly1
+      <-> ssub * EBGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-osf-sc-ly1
+\DeclareFontShape{LY1}{EBGaramond-OsF}{m}{sw}{
+      <-> ssub * EBGaramond-OsF/regular/sw
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-osf-swash-ly1
+\DeclareFontShape{LY1}{EBGaramond-OsF}{m}{sl}{
+      <-> ssub * EBGaramond-OsF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{m}{scit}{
+      <-> ssub * EBGaramond-OsF/regular/scit
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-OsF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-osf-swash-ly1
+      <-> ssub * EBGaramond-OsF/regular/nw
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{m}{scsl}{
-      <-> ssub * EBGaramond-OsF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{scsl}{
+      <-> ssub * EBGaramond-OsF/semibold/scsl
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{m}{sl}{
-      <-> ssub * EBGaramond-OsF/m/it
+\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{sc}{
+      <-> ssub * EBGaramond-OsF/semibold/sc
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{bx}{scsl}{
-      <-> ssub * EBGaramond-OsF/b/scsl
+\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{n}{
+      <-> ssub * EBGaramond-OsF/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{bx}{sc}{
-      <-> ssub * EBGaramond-OsF/b/sc
+\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{it}{
+      <-> ssub * EBGaramond-OsF/semibold/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{sw}{
+      <-> ssub * EBGaramond-OsF/semibold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{sl}{
+      <-> ssub * EBGaramond-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{scit}{
+      <-> ssub * EBGaramond-OsF/semibold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{nw}{
+      <-> ssub * EBGaramond-OsF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{scsl}{
+      <-> ssub * EBGaramond-OsF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{sc}{
+      <-> ssub * EBGaramond-OsF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{n}{
+      <-> ssub * EBGaramond-OsF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{it}{
+      <-> ssub * EBGaramond-OsF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{sw}{
+      <-> ssub * EBGaramond-OsF/bold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{sl}{
+      <-> ssub * EBGaramond-OsF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{scit}{
+      <-> ssub * EBGaramond-OsF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{nw}{
+      <-> ssub * EBGaramond-OsF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{scsl}{
+      <-> ssub * EBGaramond-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{sc}{
+      <-> ssub * EBGaramond-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{n}{
+      <-> ssub * EBGaramond-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{it}{
+      <-> ssub * EBGaramond-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{sw}{
+      <-> ssub * EBGaramond-OsF/extrabold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{sl}{
+      <-> ssub * EBGaramond-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{scit}{
+      <-> ssub * EBGaramond-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{nw}{
+      <-> ssub * EBGaramond-OsF/extrabold/nw
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-OsF}{bx}{n}{
       <-> ssub * EBGaramond-OsF/b/n
 }{}
 
+\DeclareFontShape{LY1}{EBGaramond-OsF}{bx}{sc}{
+      <-> ssub * EBGaramond-OsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{bx}{scsl}{
+      <-> ssub * EBGaramond-OsF/b/scsl
+}{}
+
 \DeclareFontShape{LY1}{EBGaramond-OsF}{bx}{it}{
       <-> ssub * EBGaramond-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-Sup.fd b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-Sup.fd
index 966664af735..513d5634376 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-Sup.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{LY1EBGaramond-Sup.fd}
-    [2018/11/30 (autoinst)  Font definitions for LY1/EBGaramond-Sup.]
+    [2019/04/07 (autoinst)  Font definitions for LY1/EBGaramond-Sup.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{LY1}{EBGaramond-Sup}{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-sup-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-sup-ly1
+\DeclareFontShape{LY1}{EBGaramond-Sup}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{eb}{sl}{
-      <-> ssub * EBGaramond-Sup/eb/it
+\DeclareFontShape{LY1}{EBGaramond-Sup}{regular}{sl}{
+      <-> ssub * EBGaramond-Sup/regular/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{b}{it}{
+\DeclareFontShape{LY1}{EBGaramond-Sup}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{b}{sl}{
-      <-> ssub * EBGaramond-Sup/b/it
+\DeclareFontShape{LY1}{EBGaramond-Sup}{bold}{sl}{
+      <-> ssub * EBGaramond-Sup/bold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{sb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-Sup}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{sb}{sl}{
-      <-> ssub * EBGaramond-Sup/sb/it
+\DeclareFontShape{LY1}{EBGaramond-Sup}{semibold}{sl}{
+      <-> ssub * EBGaramond-Sup/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{mb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-Sup}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{mb}{sl}{
-      <-> ssub * EBGaramond-Sup/mb/it
+\DeclareFontShape{LY1}{EBGaramond-Sup}{medium}{sl}{
+      <-> ssub * EBGaramond-Sup/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{extrabold}{sl}{
+      <-> ssub * EBGaramond-Sup/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{m}{sl}{
+      <-> ssub * EBGaramond-Sup/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-Sup}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-sup-ly1
+      <-> ssub * EBGaramond-Sup/regular/n
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-Sup}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-sup-ly1
+      <-> ssub * EBGaramond-Sup/regular/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{m}{sl}{
-      <-> ssub * EBGaramond-Sup/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{sb}{sl}{
+      <-> ssub * EBGaramond-Sup/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{bx}{sl}{
-      <-> ssub * EBGaramond-Sup/b/sl
+\DeclareFontShape{LY1}{EBGaramond-Sup}{sb}{n}{
+      <-> ssub * EBGaramond-Sup/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{sb}{it}{
+      <-> ssub * EBGaramond-Sup/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{b}{sl}{
+      <-> ssub * EBGaramond-Sup/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{b}{n}{
+      <-> ssub * EBGaramond-Sup/bold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{b}{it}{
+      <-> ssub * EBGaramond-Sup/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{eb}{sl}{
+      <-> ssub * EBGaramond-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{eb}{n}{
+      <-> ssub * EBGaramond-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{eb}{it}{
+      <-> ssub * EBGaramond-Sup/extrabold/it
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-Sup}{bx}{n}{
       <-> ssub * EBGaramond-Sup/b/n
 }{}
 
+\DeclareFontShape{LY1}{EBGaramond-Sup}{bx}{sl}{
+      <-> ssub * EBGaramond-Sup/b/sl
+}{}
+
 \DeclareFontShape{LY1}{EBGaramond-Sup}{bx}{it}{
       <-> ssub * EBGaramond-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-TLF.fd b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-TLF.fd
index d0dff7ecb2d..c71f78aced4 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{LY1EBGaramond-TLF.fd}
-    [2018/11/30 (autoinst)  Font definitions for LY1/EBGaramond-TLF.]
+    [2019/04/07 (autoinst)  Font definitions for LY1/EBGaramond-TLF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,242 +11,448 @@
 
 \DeclareFontFamily{LY1}{EBGaramond-TLF}{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-titling-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-sc-ly1
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-ly1
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-swash-ly1
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-titling-ly1
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-swash-ly1
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{scsl}{
-      <-> ssub * EBGaramond-TLF/eb/scit
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{scsl}{
+      <-> ssub * EBGaramond-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{sl}{
-      <-> ssub * EBGaramond-TLF/eb/it
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{sl}{
+      <-> ssub * EBGaramond-TLF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{tlsl}{
-      <-> ssub * EBGaramond-TLF/eb/tlit
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{tlsl}{
+      <-> ssub * EBGaramond-TLF/regular/tlit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{tl}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{sc}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{n}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{it}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{tlit}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{scsl}{
-      <-> ssub * EBGaramond-TLF/b/scit
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{scsl}{
+      <-> ssub * EBGaramond-TLF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{sl}{
-      <-> ssub * EBGaramond-TLF/b/it
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{sl}{
+      <-> ssub * EBGaramond-TLF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{tlsl}{
-      <-> ssub * EBGaramond-TLF/b/tlit
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{tlsl}{
+      <-> ssub * EBGaramond-TLF/bold/tlit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{tl}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{sc}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{n}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{tlit}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{scsl}{
-      <-> ssub * EBGaramond-TLF/sb/scit
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{sl}{
-      <-> ssub * EBGaramond-TLF/sb/it
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{sl}{
+      <-> ssub * EBGaramond-TLF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{tlsl}{
-      <-> ssub * EBGaramond-TLF/sb/tlit
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{tlsl}{
+      <-> ssub * EBGaramond-TLF/semibold/tlit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{tl}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{sc}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{n}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{tlit}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{scsl}{
-      <-> ssub * EBGaramond-TLF/mb/scit
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{scsl}{
+      <-> ssub * EBGaramond-TLF/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{sl}{
+      <-> ssub * EBGaramond-TLF/medium/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{tlsl}{
+      <-> ssub * EBGaramond-TLF/medium/tlit
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-titling-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-titling-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{sl}{
-      <-> ssub * EBGaramond-TLF/mb/it
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-TLF/extrabold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{tlsl}{
-      <-> ssub * EBGaramond-TLF/mb/tlit
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{tlsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/tlit
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{m}{scsl}{
+      <-> ssub * EBGaramond-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{m}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-titling-ly1
+      <-> ssub * EBGaramond-TLF/regular/tl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-sc-ly1
+      <-> ssub * EBGaramond-TLF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-ly1
+      <-> ssub * EBGaramond-TLF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-ly1
+      <-> ssub * EBGaramond-TLF/regular/it
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-swash-ly1
+      <-> ssub * EBGaramond-TLF/regular/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{m}{sl}{
+      <-> ssub * EBGaramond-TLF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{m}{tlsl}{
+      <-> ssub * EBGaramond-TLF/regular/tlsl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-sc-ly1
+      <-> ssub * EBGaramond-TLF/regular/scit
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{m}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-titling-ly1
+      <-> ssub * EBGaramond-TLF/regular/tlit
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-swash-ly1
+      <-> ssub * EBGaramond-TLF/regular/nw
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{m}{scsl}{
-      <-> ssub * EBGaramond-TLF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{scsl}{
+      <-> ssub * EBGaramond-TLF/semibold/scsl
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{m}{sl}{
-      <-> ssub * EBGaramond-TLF/m/it
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{tl}{
+      <-> ssub * EBGaramond-TLF/semibold/tl
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{m}{tlsl}{
-      <-> ssub * EBGaramond-TLF/m/tlit
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{sc}{
+      <-> ssub * EBGaramond-TLF/semibold/sc
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{scsl}{
-      <-> ssub * EBGaramond-TLF/b/scsl
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{n}{
+      <-> ssub * EBGaramond-TLF/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{tl}{
-      <-> ssub * EBGaramond-TLF/b/tl
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{it}{
+      <-> ssub * EBGaramond-TLF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{sc}{
-      <-> ssub * EBGaramond-TLF/b/sc
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{sw}{
+      <-> ssub * EBGaramond-TLF/semibold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{sl}{
+      <-> ssub * EBGaramond-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{tlsl}{
+      <-> ssub * EBGaramond-TLF/semibold/tlsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{scit}{
+      <-> ssub * EBGaramond-TLF/semibold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{tlit}{
+      <-> ssub * EBGaramond-TLF/semibold/tlit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{nw}{
+      <-> ssub * EBGaramond-TLF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{scsl}{
+      <-> ssub * EBGaramond-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{tl}{
+      <-> ssub * EBGaramond-TLF/bold/tl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{sc}{
+      <-> ssub * EBGaramond-TLF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{n}{
+      <-> ssub * EBGaramond-TLF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{it}{
+      <-> ssub * EBGaramond-TLF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{sw}{
+      <-> ssub * EBGaramond-TLF/bold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{sl}{
+      <-> ssub * EBGaramond-TLF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{tlsl}{
+      <-> ssub * EBGaramond-TLF/bold/tlsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{scit}{
+      <-> ssub * EBGaramond-TLF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{tlit}{
+      <-> ssub * EBGaramond-TLF/bold/tlit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{nw}{
+      <-> ssub * EBGaramond-TLF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{scsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{tl}{
+      <-> ssub * EBGaramond-TLF/extrabold/tl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{sc}{
+      <-> ssub * EBGaramond-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{n}{
+      <-> ssub * EBGaramond-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{it}{
+      <-> ssub * EBGaramond-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{sw}{
+      <-> ssub * EBGaramond-TLF/extrabold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{sl}{
+      <-> ssub * EBGaramond-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{tlsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/tlsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{scit}{
+      <-> ssub * EBGaramond-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{tlit}{
+      <-> ssub * EBGaramond-TLF/extrabold/tlit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{nw}{
+      <-> ssub * EBGaramond-TLF/extrabold/nw
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{n}{
       <-> ssub * EBGaramond-TLF/b/n
 }{}
 
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{sc}{
+      <-> ssub * EBGaramond-TLF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{tl}{
+      <-> ssub * EBGaramond-TLF/b/tl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{scsl}{
+      <-> ssub * EBGaramond-TLF/b/scsl
+}{}
+
 \DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{it}{
       <-> ssub * EBGaramond-TLF/b/it
 }{}
@@ -259,16 +465,16 @@
       <-> ssub * EBGaramond-TLF/b/sl
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{tlsl}{
-      <-> ssub * EBGaramond-TLF/b/tlsl
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{tlit}{
+      <-> ssub * EBGaramond-TLF/b/tlit
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{scit}{
       <-> ssub * EBGaramond-TLF/b/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{tlit}{
-      <-> ssub * EBGaramond-TLF/b/tlit
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{tlsl}{
+      <-> ssub * EBGaramond-TLF/b/tlsl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{nw}{
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-TOsF.fd b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-TOsF.fd
index bc6aa51f9b5..c7d1a0a7e9a 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{LY1EBGaramond-TOsF.fd}
-    [2018/11/30 (autoinst)  Font definitions for LY1/EBGaramond-TOsF.]
+    [2019/04/07 (autoinst)  Font definitions for LY1/EBGaramond-TOsF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,178 +11,336 @@
 
 \DeclareFontFamily{LY1}{EBGaramond-TOsF}{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-ly1
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-swash-ly1
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-swash-ly1
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{scsl}{
-      <-> ssub * EBGaramond-TOsF/eb/scit
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{regular}{scsl}{
+      <-> ssub * EBGaramond-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{sl}{
-      <-> ssub * EBGaramond-TOsF/eb/it
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{regular}{sl}{
+      <-> ssub * EBGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{sc}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{n}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{it}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tosf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tosf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{scsl}{
-      <-> ssub * EBGaramond-TOsF/b/scit
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{bold}{scsl}{
+      <-> ssub * EBGaramond-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{sl}{
-      <-> ssub * EBGaramond-TOsF/b/it
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{bold}{sl}{
+      <-> ssub * EBGaramond-TOsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{sc}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{n}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tosf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tosf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{scsl}{
-      <-> ssub * EBGaramond-TOsF/sb/scit
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{sl}{
-      <-> ssub * EBGaramond-TOsF/sb/it
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{semibold}{sl}{
+      <-> ssub * EBGaramond-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{mb}{n}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{mb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{mb}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{mb}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tosf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{mb}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tosf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{mb}{scsl}{
-      <-> ssub * EBGaramond-TOsF/mb/scit
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{medium}{scsl}{
+      <-> ssub * EBGaramond-TOsF/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{medium}{sl}{
+      <-> ssub * EBGaramond-TOsF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{mb}{sl}{
-      <-> ssub * EBGaramond-TOsF/mb/it
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{scsl}{
+      <-> ssub * EBGaramond-TOsF/regular/scsl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-sc-ly1
+      <-> ssub * EBGaramond-TOsF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-ly1
+      <-> ssub * EBGaramond-TOsF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-ly1
+      <-> ssub * EBGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-sc-ly1
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{sw}{
+      <-> ssub * EBGaramond-TOsF/regular/sw
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-swash-ly1
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{sl}{
+      <-> ssub * EBGaramond-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{scit}{
+      <-> ssub * EBGaramond-TOsF/regular/scit
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-swash-ly1
+      <-> ssub * EBGaramond-TOsF/regular/nw
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{scsl}{
-      <-> ssub * EBGaramond-TOsF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{scsl}{
+      <-> ssub * EBGaramond-TOsF/semibold/scsl
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{sl}{
-      <-> ssub * EBGaramond-TOsF/m/it
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{sc}{
+      <-> ssub * EBGaramond-TOsF/semibold/sc
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{bx}{scsl}{
-      <-> ssub * EBGaramond-TOsF/b/scsl
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{n}{
+      <-> ssub * EBGaramond-TOsF/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{bx}{sc}{
-      <-> ssub * EBGaramond-TOsF/b/sc
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{it}{
+      <-> ssub * EBGaramond-TOsF/semibold/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{sw}{
+      <-> ssub * EBGaramond-TOsF/semibold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{sl}{
+      <-> ssub * EBGaramond-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{scit}{
+      <-> ssub * EBGaramond-TOsF/semibold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{nw}{
+      <-> ssub * EBGaramond-TOsF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{scsl}{
+      <-> ssub * EBGaramond-TOsF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{sc}{
+      <-> ssub * EBGaramond-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{n}{
+      <-> ssub * EBGaramond-TOsF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{it}{
+      <-> ssub * EBGaramond-TOsF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{sw}{
+      <-> ssub * EBGaramond-TOsF/bold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{sl}{
+      <-> ssub * EBGaramond-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{scit}{
+      <-> ssub * EBGaramond-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{nw}{
+      <-> ssub * EBGaramond-TOsF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{scsl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{sc}{
+      <-> ssub * EBGaramond-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{n}{
+      <-> ssub * EBGaramond-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{it}{
+      <-> ssub * EBGaramond-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{sw}{
+      <-> ssub * EBGaramond-TOsF/extrabold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{sl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{scit}{
+      <-> ssub * EBGaramond-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{nw}{
+      <-> ssub * EBGaramond-TOsF/extrabold/nw
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TOsF}{bx}{n}{
       <-> ssub * EBGaramond-TOsF/b/n
 }{}
 
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{bx}{sc}{
+      <-> ssub * EBGaramond-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{bx}{scsl}{
+      <-> ssub * EBGaramond-TOsF/b/scsl
+}{}
+
 \DeclareFontShape{LY1}{EBGaramond-TOsF}{bx}{it}{
       <-> ssub * EBGaramond-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramondInitials-TLF.fd b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramondInitials-TLF.fd
index 010eff4e7b3..8b6348794e2 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramondInitials-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramondInitials-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{LY1EBGaramondInitials-TLF.fd}
-    [2018/11/30 (autoinst)  Font definitions for LY1/EBGaramondInitials-TLF.]
+    [2019/04/07 (autoinst)  Font definitions for LY1/EBGaramondInitials-TLF.]
 
 \expandafter\ifx\csname EBGaramondInitials@scale\endcsname\relax
     \let\EBGaramondInitials@@scale\@empty
@@ -11,8 +11,21 @@
 
 \DeclareFontFamily{LY1}{EBGaramondInitials-TLF}{}
 
-\DeclareFontShape{LY1}{EBGaramondInitials-TLF}{m}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{EBGaramondInitials-TLF}{regular}{n}{
       <-> \EBGaramondInitials@@scale EBGaramondInitials-tlf-ly1
 }{}
 
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{EBGaramondInitials-TLF}{m}{n}{
+      <-> ssub * EBGaramondInitials-TLF/regular/n
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-Inf.fd b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-Inf.fd
index b73e504ad56..578961a4e68 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-Inf.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{OT1EBGaramond-Inf.fd}
-    [2018/11/30 (autoinst)  Font definitions for OT1/EBGaramond-Inf.]
+    [2019/04/07 (autoinst)  Font definitions for OT1/EBGaramond-Inf.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{OT1}{EBGaramond-Inf}{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-inf-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-inf-ot1
+\DeclareFontShape{OT1}{EBGaramond-Inf}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{eb}{sl}{
-      <-> ssub * EBGaramond-Inf/eb/it
+\DeclareFontShape{OT1}{EBGaramond-Inf}{regular}{sl}{
+      <-> ssub * EBGaramond-Inf/regular/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{b}{it}{
+\DeclareFontShape{OT1}{EBGaramond-Inf}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{b}{sl}{
-      <-> ssub * EBGaramond-Inf/b/it
+\DeclareFontShape{OT1}{EBGaramond-Inf}{bold}{sl}{
+      <-> ssub * EBGaramond-Inf/bold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{sb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-Inf}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{sb}{sl}{
-      <-> ssub * EBGaramond-Inf/sb/it
+\DeclareFontShape{OT1}{EBGaramond-Inf}{semibold}{sl}{
+      <-> ssub * EBGaramond-Inf/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{mb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-Inf}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{mb}{sl}{
-      <-> ssub * EBGaramond-Inf/mb/it
+\DeclareFontShape{OT1}{EBGaramond-Inf}{medium}{sl}{
+      <-> ssub * EBGaramond-Inf/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{extrabold}{sl}{
+      <-> ssub * EBGaramond-Inf/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{m}{sl}{
+      <-> ssub * EBGaramond-Inf/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-Inf}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-inf-ot1
+      <-> ssub * EBGaramond-Inf/regular/n
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-Inf}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-inf-ot1
+      <-> ssub * EBGaramond-Inf/regular/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{m}{sl}{
-      <-> ssub * EBGaramond-Inf/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{sb}{sl}{
+      <-> ssub * EBGaramond-Inf/semibold/sl
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{bx}{sl}{
-      <-> ssub * EBGaramond-Inf/b/sl
+\DeclareFontShape{OT1}{EBGaramond-Inf}{sb}{n}{
+      <-> ssub * EBGaramond-Inf/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{sb}{it}{
+      <-> ssub * EBGaramond-Inf/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{b}{sl}{
+      <-> ssub * EBGaramond-Inf/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{b}{n}{
+      <-> ssub * EBGaramond-Inf/bold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{b}{it}{
+      <-> ssub * EBGaramond-Inf/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{eb}{sl}{
+      <-> ssub * EBGaramond-Inf/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{eb}{n}{
+      <-> ssub * EBGaramond-Inf/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{eb}{it}{
+      <-> ssub * EBGaramond-Inf/extrabold/it
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-Inf}{bx}{n}{
       <-> ssub * EBGaramond-Inf/b/n
 }{}
 
+\DeclareFontShape{OT1}{EBGaramond-Inf}{bx}{sl}{
+      <-> ssub * EBGaramond-Inf/b/sl
+}{}
+
 \DeclareFontShape{OT1}{EBGaramond-Inf}{bx}{it}{
       <-> ssub * EBGaramond-Inf/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-LF.fd b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-LF.fd
index 82f8c1fef5f..26c46170979 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-LF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{OT1EBGaramond-LF.fd}
-    [2018/11/30 (autoinst)  Font definitions for OT1/EBGaramond-LF.]
+    [2019/04/07 (autoinst)  Font definitions for OT1/EBGaramond-LF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,242 +11,448 @@
 
 \DeclareFontFamily{OT1}{EBGaramond-LF}{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-titling-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-sc-ot1
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-ot1
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-ot1
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-swash-ot1
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-titling-ot1
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-swash-ot1
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{scsl}{
-      <-> ssub * EBGaramond-LF/eb/scit
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{scsl}{
+      <-> ssub * EBGaramond-LF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{sl}{
-      <-> ssub * EBGaramond-LF/eb/it
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{sl}{
+      <-> ssub * EBGaramond-LF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{tlsl}{
-      <-> ssub * EBGaramond-LF/eb/tlit
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{tlsl}{
+      <-> ssub * EBGaramond-LF/regular/tlit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{tl}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{sc}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{n}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{it}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{tlit}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{scsl}{
-      <-> ssub * EBGaramond-LF/b/scit
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{scsl}{
+      <-> ssub * EBGaramond-LF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{sl}{
-      <-> ssub * EBGaramond-LF/b/it
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{sl}{
+      <-> ssub * EBGaramond-LF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{tlsl}{
-      <-> ssub * EBGaramond-LF/b/tlit
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{tlsl}{
+      <-> ssub * EBGaramond-LF/bold/tlit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{tl}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{sc}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{n}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{tlit}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{scsl}{
-      <-> ssub * EBGaramond-LF/sb/scit
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-LF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{sl}{
-      <-> ssub * EBGaramond-LF/sb/it
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{sl}{
+      <-> ssub * EBGaramond-LF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{tlsl}{
-      <-> ssub * EBGaramond-LF/sb/tlit
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{tlsl}{
+      <-> ssub * EBGaramond-LF/semibold/tlit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{tl}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{sc}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{n}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{tlit}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{scsl}{
-      <-> ssub * EBGaramond-LF/mb/scit
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{scsl}{
+      <-> ssub * EBGaramond-LF/medium/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{sl}{
+      <-> ssub * EBGaramond-LF/medium/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{tlsl}{
+      <-> ssub * EBGaramond-LF/medium/tlit
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-titling-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-titling-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-LF/extrabold/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{sl}{
-      <-> ssub * EBGaramond-LF/mb/it
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-LF/extrabold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{tlsl}{
-      <-> ssub * EBGaramond-LF/mb/tlit
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{tlsl}{
+      <-> ssub * EBGaramond-LF/extrabold/tlit
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{m}{scsl}{
+      <-> ssub * EBGaramond-LF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{m}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-titling-ot1
+      <-> ssub * EBGaramond-LF/regular/tl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-sc-ot1
+      <-> ssub * EBGaramond-LF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-ot1
+      <-> ssub * EBGaramond-LF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-ot1
+      <-> ssub * EBGaramond-LF/regular/it
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-swash-ot1
+      <-> ssub * EBGaramond-LF/regular/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{m}{sl}{
+      <-> ssub * EBGaramond-LF/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{m}{tlsl}{
+      <-> ssub * EBGaramond-LF/regular/tlsl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-sc-ot1
+      <-> ssub * EBGaramond-LF/regular/scit
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{m}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-titling-ot1
+      <-> ssub * EBGaramond-LF/regular/tlit
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-swash-ot1
+      <-> ssub * EBGaramond-LF/regular/nw
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{m}{scsl}{
-      <-> ssub * EBGaramond-LF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{scsl}{
+      <-> ssub * EBGaramond-LF/semibold/scsl
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{m}{sl}{
-      <-> ssub * EBGaramond-LF/m/it
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{tl}{
+      <-> ssub * EBGaramond-LF/semibold/tl
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{m}{tlsl}{
-      <-> ssub * EBGaramond-LF/m/tlit
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{sc}{
+      <-> ssub * EBGaramond-LF/semibold/sc
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{bx}{scsl}{
-      <-> ssub * EBGaramond-LF/b/scsl
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{n}{
+      <-> ssub * EBGaramond-LF/semibold/n
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{bx}{tl}{
-      <-> ssub * EBGaramond-LF/b/tl
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{it}{
+      <-> ssub * EBGaramond-LF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{bx}{sc}{
-      <-> ssub * EBGaramond-LF/b/sc
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{sw}{
+      <-> ssub * EBGaramond-LF/semibold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{sl}{
+      <-> ssub * EBGaramond-LF/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{tlsl}{
+      <-> ssub * EBGaramond-LF/semibold/tlsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{scit}{
+      <-> ssub * EBGaramond-LF/semibold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{tlit}{
+      <-> ssub * EBGaramond-LF/semibold/tlit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{nw}{
+      <-> ssub * EBGaramond-LF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{scsl}{
+      <-> ssub * EBGaramond-LF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{tl}{
+      <-> ssub * EBGaramond-LF/bold/tl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{sc}{
+      <-> ssub * EBGaramond-LF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{n}{
+      <-> ssub * EBGaramond-LF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{it}{
+      <-> ssub * EBGaramond-LF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{sw}{
+      <-> ssub * EBGaramond-LF/bold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{sl}{
+      <-> ssub * EBGaramond-LF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{tlsl}{
+      <-> ssub * EBGaramond-LF/bold/tlsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{scit}{
+      <-> ssub * EBGaramond-LF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{tlit}{
+      <-> ssub * EBGaramond-LF/bold/tlit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{nw}{
+      <-> ssub * EBGaramond-LF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{scsl}{
+      <-> ssub * EBGaramond-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{tl}{
+      <-> ssub * EBGaramond-LF/extrabold/tl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{sc}{
+      <-> ssub * EBGaramond-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{n}{
+      <-> ssub * EBGaramond-LF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{it}{
+      <-> ssub * EBGaramond-LF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{sw}{
+      <-> ssub * EBGaramond-LF/extrabold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{sl}{
+      <-> ssub * EBGaramond-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{tlsl}{
+      <-> ssub * EBGaramond-LF/extrabold/tlsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{scit}{
+      <-> ssub * EBGaramond-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{tlit}{
+      <-> ssub * EBGaramond-LF/extrabold/tlit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{nw}{
+      <-> ssub * EBGaramond-LF/extrabold/nw
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{bx}{n}{
       <-> ssub * EBGaramond-LF/b/n
 }{}
 
+\DeclareFontShape{OT1}{EBGaramond-LF}{bx}{sc}{
+      <-> ssub * EBGaramond-LF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{bx}{tl}{
+      <-> ssub * EBGaramond-LF/b/tl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{bx}{scsl}{
+      <-> ssub * EBGaramond-LF/b/scsl
+}{}
+
 \DeclareFontShape{OT1}{EBGaramond-LF}{bx}{it}{
       <-> ssub * EBGaramond-LF/b/it
 }{}
@@ -259,16 +465,16 @@
       <-> ssub * EBGaramond-LF/b/sl
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{bx}{tlsl}{
-      <-> ssub * EBGaramond-LF/b/tlsl
+\DeclareFontShape{OT1}{EBGaramond-LF}{bx}{tlit}{
+      <-> ssub * EBGaramond-LF/b/tlit
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{bx}{scit}{
       <-> ssub * EBGaramond-LF/b/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{bx}{tlit}{
-      <-> ssub * EBGaramond-LF/b/tlit
+\DeclareFontShape{OT1}{EBGaramond-LF}{bx}{tlsl}{
+      <-> ssub * EBGaramond-LF/b/tlsl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{bx}{nw}{
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-OsF.fd b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-OsF.fd
index cc181fb3bc8..7abacf15722 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-OsF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{OT1EBGaramond-OsF.fd}
-    [2018/11/30 (autoinst)  Font definitions for OT1/EBGaramond-OsF.]
+    [2019/04/07 (autoinst)  Font definitions for OT1/EBGaramond-OsF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,178 +11,336 @@
 
 \DeclareFontFamily{OT1}{EBGaramond-OsF}{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-ot1
+\DeclareFontShape{OT1}{EBGaramond-OsF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-ot1
+\DeclareFontShape{OT1}{EBGaramond-OsF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{EBGaramond-OsF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-swash-ot1
+\DeclareFontShape{OT1}{EBGaramond-OsF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-osf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-swash-ot1
+\DeclareFontShape{OT1}{EBGaramond-OsF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-osf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{scsl}{
-      <-> ssub * EBGaramond-OsF/eb/scit
+\DeclareFontShape{OT1}{EBGaramond-OsF}{regular}{scsl}{
+      <-> ssub * EBGaramond-OsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{sl}{
-      <-> ssub * EBGaramond-OsF/eb/it
+\DeclareFontShape{OT1}{EBGaramond-OsF}{regular}{sl}{
+      <-> ssub * EBGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{sc}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{n}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{it}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-osf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-osf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{scsl}{
-      <-> ssub * EBGaramond-OsF/b/scit
+\DeclareFontShape{OT1}{EBGaramond-OsF}{bold}{scsl}{
+      <-> ssub * EBGaramond-OsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{sl}{
-      <-> ssub * EBGaramond-OsF/b/it
+\DeclareFontShape{OT1}{EBGaramond-OsF}{bold}{sl}{
+      <-> ssub * EBGaramond-OsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{sc}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{n}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-osf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-osf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{scsl}{
-      <-> ssub * EBGaramond-OsF/sb/scit
+\DeclareFontShape{OT1}{EBGaramond-OsF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{sl}{
-      <-> ssub * EBGaramond-OsF/sb/it
+\DeclareFontShape{OT1}{EBGaramond-OsF}{semibold}{sl}{
+      <-> ssub * EBGaramond-OsF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{mb}{n}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{mb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{mb}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{mb}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-osf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{mb}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-osf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{mb}{scsl}{
-      <-> ssub * EBGaramond-OsF/mb/scit
+\DeclareFontShape{OT1}{EBGaramond-OsF}{medium}{scsl}{
+      <-> ssub * EBGaramond-OsF/medium/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{medium}{sl}{
+      <-> ssub * EBGaramond-OsF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{mb}{sl}{
-      <-> ssub * EBGaramond-OsF/mb/it
+\DeclareFontShape{OT1}{EBGaramond-OsF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-OsF/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{m}{scsl}{
+      <-> ssub * EBGaramond-OsF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-OsF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-osf-sc-ot1
+      <-> ssub * EBGaramond-OsF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-OsF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-osf-ot1
+      <-> ssub * EBGaramond-OsF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-OsF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-osf-ot1
+      <-> ssub * EBGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-osf-sc-ot1
+\DeclareFontShape{OT1}{EBGaramond-OsF}{m}{sw}{
+      <-> ssub * EBGaramond-OsF/regular/sw
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-osf-swash-ot1
+\DeclareFontShape{OT1}{EBGaramond-OsF}{m}{sl}{
+      <-> ssub * EBGaramond-OsF/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{m}{scit}{
+      <-> ssub * EBGaramond-OsF/regular/scit
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-OsF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-osf-swash-ot1
+      <-> ssub * EBGaramond-OsF/regular/nw
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{m}{scsl}{
-      <-> ssub * EBGaramond-OsF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{scsl}{
+      <-> ssub * EBGaramond-OsF/semibold/scsl
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{m}{sl}{
-      <-> ssub * EBGaramond-OsF/m/it
+\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{sc}{
+      <-> ssub * EBGaramond-OsF/semibold/sc
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{bx}{scsl}{
-      <-> ssub * EBGaramond-OsF/b/scsl
+\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{n}{
+      <-> ssub * EBGaramond-OsF/semibold/n
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{bx}{sc}{
-      <-> ssub * EBGaramond-OsF/b/sc
+\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{it}{
+      <-> ssub * EBGaramond-OsF/semibold/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{sw}{
+      <-> ssub * EBGaramond-OsF/semibold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{sl}{
+      <-> ssub * EBGaramond-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{scit}{
+      <-> ssub * EBGaramond-OsF/semibold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{nw}{
+      <-> ssub * EBGaramond-OsF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{scsl}{
+      <-> ssub * EBGaramond-OsF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{sc}{
+      <-> ssub * EBGaramond-OsF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{n}{
+      <-> ssub * EBGaramond-OsF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{it}{
+      <-> ssub * EBGaramond-OsF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{sw}{
+      <-> ssub * EBGaramond-OsF/bold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{sl}{
+      <-> ssub * EBGaramond-OsF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{scit}{
+      <-> ssub * EBGaramond-OsF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{nw}{
+      <-> ssub * EBGaramond-OsF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{scsl}{
+      <-> ssub * EBGaramond-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{sc}{
+      <-> ssub * EBGaramond-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{n}{
+      <-> ssub * EBGaramond-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{it}{
+      <-> ssub * EBGaramond-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{sw}{
+      <-> ssub * EBGaramond-OsF/extrabold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{sl}{
+      <-> ssub * EBGaramond-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{scit}{
+      <-> ssub * EBGaramond-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{nw}{
+      <-> ssub * EBGaramond-OsF/extrabold/nw
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-OsF}{bx}{n}{
       <-> ssub * EBGaramond-OsF/b/n
 }{}
 
+\DeclareFontShape{OT1}{EBGaramond-OsF}{bx}{sc}{
+      <-> ssub * EBGaramond-OsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{bx}{scsl}{
+      <-> ssub * EBGaramond-OsF/b/scsl
+}{}
+
 \DeclareFontShape{OT1}{EBGaramond-OsF}{bx}{it}{
       <-> ssub * EBGaramond-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-Sup.fd b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-Sup.fd
index c4a03698158..75cf4d7bd1f 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-Sup.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{OT1EBGaramond-Sup.fd}
-    [2018/11/30 (autoinst)  Font definitions for OT1/EBGaramond-Sup.]
+    [2019/04/07 (autoinst)  Font definitions for OT1/EBGaramond-Sup.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{OT1}{EBGaramond-Sup}{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-sup-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-sup-ot1
+\DeclareFontShape{OT1}{EBGaramond-Sup}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{eb}{sl}{
-      <-> ssub * EBGaramond-Sup/eb/it
+\DeclareFontShape{OT1}{EBGaramond-Sup}{regular}{sl}{
+      <-> ssub * EBGaramond-Sup/regular/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{b}{it}{
+\DeclareFontShape{OT1}{EBGaramond-Sup}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{b}{sl}{
-      <-> ssub * EBGaramond-Sup/b/it
+\DeclareFontShape{OT1}{EBGaramond-Sup}{bold}{sl}{
+      <-> ssub * EBGaramond-Sup/bold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{sb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-Sup}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{sb}{sl}{
-      <-> ssub * EBGaramond-Sup/sb/it
+\DeclareFontShape{OT1}{EBGaramond-Sup}{semibold}{sl}{
+      <-> ssub * EBGaramond-Sup/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{mb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-Sup}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{mb}{sl}{
-      <-> ssub * EBGaramond-Sup/mb/it
+\DeclareFontShape{OT1}{EBGaramond-Sup}{medium}{sl}{
+      <-> ssub * EBGaramond-Sup/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{extrabold}{sl}{
+      <-> ssub * EBGaramond-Sup/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{m}{sl}{
+      <-> ssub * EBGaramond-Sup/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-Sup}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-sup-ot1
+      <-> ssub * EBGaramond-Sup/regular/n
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-Sup}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-sup-ot1
+      <-> ssub * EBGaramond-Sup/regular/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{m}{sl}{
-      <-> ssub * EBGaramond-Sup/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{sb}{sl}{
+      <-> ssub * EBGaramond-Sup/semibold/sl
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{bx}{sl}{
-      <-> ssub * EBGaramond-Sup/b/sl
+\DeclareFontShape{OT1}{EBGaramond-Sup}{sb}{n}{
+      <-> ssub * EBGaramond-Sup/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{sb}{it}{
+      <-> ssub * EBGaramond-Sup/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{b}{sl}{
+      <-> ssub * EBGaramond-Sup/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{b}{n}{
+      <-> ssub * EBGaramond-Sup/bold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{b}{it}{
+      <-> ssub * EBGaramond-Sup/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{eb}{sl}{
+      <-> ssub * EBGaramond-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{eb}{n}{
+      <-> ssub * EBGaramond-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{eb}{it}{
+      <-> ssub * EBGaramond-Sup/extrabold/it
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-Sup}{bx}{n}{
       <-> ssub * EBGaramond-Sup/b/n
 }{}
 
+\DeclareFontShape{OT1}{EBGaramond-Sup}{bx}{sl}{
+      <-> ssub * EBGaramond-Sup/b/sl
+}{}
+
 \DeclareFontShape{OT1}{EBGaramond-Sup}{bx}{it}{
       <-> ssub * EBGaramond-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-TLF.fd b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-TLF.fd
index 8f9b5ebf301..d9a156a4ea5 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{OT1EBGaramond-TLF.fd}
-    [2018/11/30 (autoinst)  Font definitions for OT1/EBGaramond-TLF.]
+    [2019/04/07 (autoinst)  Font definitions for OT1/EBGaramond-TLF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,242 +11,448 @@
 
 \DeclareFontFamily{OT1}{EBGaramond-TLF}{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-titling-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-sc-ot1
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-ot1
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-swash-ot1
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-titling-ot1
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-swash-ot1
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{scsl}{
-      <-> ssub * EBGaramond-TLF/eb/scit
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{scsl}{
+      <-> ssub * EBGaramond-TLF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{sl}{
-      <-> ssub * EBGaramond-TLF/eb/it
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{sl}{
+      <-> ssub * EBGaramond-TLF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{tlsl}{
-      <-> ssub * EBGaramond-TLF/eb/tlit
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{tlsl}{
+      <-> ssub * EBGaramond-TLF/regular/tlit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{tl}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{sc}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{n}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{it}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{tlit}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{scsl}{
-      <-> ssub * EBGaramond-TLF/b/scit
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{scsl}{
+      <-> ssub * EBGaramond-TLF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{sl}{
-      <-> ssub * EBGaramond-TLF/b/it
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{sl}{
+      <-> ssub * EBGaramond-TLF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{tlsl}{
-      <-> ssub * EBGaramond-TLF/b/tlit
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{tlsl}{
+      <-> ssub * EBGaramond-TLF/bold/tlit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{tl}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{sc}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{n}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{tlit}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{scsl}{
-      <-> ssub * EBGaramond-TLF/sb/scit
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{sl}{
-      <-> ssub * EBGaramond-TLF/sb/it
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{sl}{
+      <-> ssub * EBGaramond-TLF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{tlsl}{
-      <-> ssub * EBGaramond-TLF/sb/tlit
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{tlsl}{
+      <-> ssub * EBGaramond-TLF/semibold/tlit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{tl}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{sc}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{n}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{tlit}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{scsl}{
-      <-> ssub * EBGaramond-TLF/mb/scit
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{scsl}{
+      <-> ssub * EBGaramond-TLF/medium/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{sl}{
+      <-> ssub * EBGaramond-TLF/medium/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{tlsl}{
+      <-> ssub * EBGaramond-TLF/medium/tlit
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-titling-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-titling-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{sl}{
-      <-> ssub * EBGaramond-TLF/mb/it
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-TLF/extrabold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{tlsl}{
-      <-> ssub * EBGaramond-TLF/mb/tlit
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{tlsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/tlit
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{m}{scsl}{
+      <-> ssub * EBGaramond-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{m}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-titling-ot1
+      <-> ssub * EBGaramond-TLF/regular/tl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-sc-ot1
+      <-> ssub * EBGaramond-TLF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-ot1
+      <-> ssub * EBGaramond-TLF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-ot1
+      <-> ssub * EBGaramond-TLF/regular/it
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-swash-ot1
+      <-> ssub * EBGaramond-TLF/regular/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{m}{sl}{
+      <-> ssub * EBGaramond-TLF/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{m}{tlsl}{
+      <-> ssub * EBGaramond-TLF/regular/tlsl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-sc-ot1
+      <-> ssub * EBGaramond-TLF/regular/scit
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{m}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-titling-ot1
+      <-> ssub * EBGaramond-TLF/regular/tlit
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-swash-ot1
+      <-> ssub * EBGaramond-TLF/regular/nw
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{m}{scsl}{
-      <-> ssub * EBGaramond-TLF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{scsl}{
+      <-> ssub * EBGaramond-TLF/semibold/scsl
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{m}{sl}{
-      <-> ssub * EBGaramond-TLF/m/it
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{tl}{
+      <-> ssub * EBGaramond-TLF/semibold/tl
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{m}{tlsl}{
-      <-> ssub * EBGaramond-TLF/m/tlit
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{sc}{
+      <-> ssub * EBGaramond-TLF/semibold/sc
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{scsl}{
-      <-> ssub * EBGaramond-TLF/b/scsl
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{n}{
+      <-> ssub * EBGaramond-TLF/semibold/n
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{tl}{
-      <-> ssub * EBGaramond-TLF/b/tl
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{it}{
+      <-> ssub * EBGaramond-TLF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{sc}{
-      <-> ssub * EBGaramond-TLF/b/sc
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{sw}{
+      <-> ssub * EBGaramond-TLF/semibold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{sl}{
+      <-> ssub * EBGaramond-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{tlsl}{
+      <-> ssub * EBGaramond-TLF/semibold/tlsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{scit}{
+      <-> ssub * EBGaramond-TLF/semibold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{tlit}{
+      <-> ssub * EBGaramond-TLF/semibold/tlit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{nw}{
+      <-> ssub * EBGaramond-TLF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{scsl}{
+      <-> ssub * EBGaramond-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{tl}{
+      <-> ssub * EBGaramond-TLF/bold/tl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{sc}{
+      <-> ssub * EBGaramond-TLF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{n}{
+      <-> ssub * EBGaramond-TLF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{it}{
+      <-> ssub * EBGaramond-TLF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{sw}{
+      <-> ssub * EBGaramond-TLF/bold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{sl}{
+      <-> ssub * EBGaramond-TLF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{tlsl}{
+      <-> ssub * EBGaramond-TLF/bold/tlsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{scit}{
+      <-> ssub * EBGaramond-TLF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{tlit}{
+      <-> ssub * EBGaramond-TLF/bold/tlit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{nw}{
+      <-> ssub * EBGaramond-TLF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{scsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{tl}{
+      <-> ssub * EBGaramond-TLF/extrabold/tl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{sc}{
+      <-> ssub * EBGaramond-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{n}{
+      <-> ssub * EBGaramond-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{it}{
+      <-> ssub * EBGaramond-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{sw}{
+      <-> ssub * EBGaramond-TLF/extrabold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{sl}{
+      <-> ssub * EBGaramond-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{tlsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/tlsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{scit}{
+      <-> ssub * EBGaramond-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{tlit}{
+      <-> ssub * EBGaramond-TLF/extrabold/tlit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{nw}{
+      <-> ssub * EBGaramond-TLF/extrabold/nw
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{n}{
       <-> ssub * EBGaramond-TLF/b/n
 }{}
 
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{sc}{
+      <-> ssub * EBGaramond-TLF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{tl}{
+      <-> ssub * EBGaramond-TLF/b/tl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{scsl}{
+      <-> ssub * EBGaramond-TLF/b/scsl
+}{}
+
 \DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{it}{
       <-> ssub * EBGaramond-TLF/b/it
 }{}
@@ -259,16 +465,16 @@
       <-> ssub * EBGaramond-TLF/b/sl
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{tlsl}{
-      <-> ssub * EBGaramond-TLF/b/tlsl
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{tlit}{
+      <-> ssub * EBGaramond-TLF/b/tlit
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{scit}{
       <-> ssub * EBGaramond-TLF/b/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{tlit}{
-      <-> ssub * EBGaramond-TLF/b/tlit
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{tlsl}{
+      <-> ssub * EBGaramond-TLF/b/tlsl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{nw}{
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-TOsF.fd b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-TOsF.fd
index a38595d0a45..8134f608184 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{OT1EBGaramond-TOsF.fd}
-    [2018/11/30 (autoinst)  Font definitions for OT1/EBGaramond-TOsF.]
+    [2019/04/07 (autoinst)  Font definitions for OT1/EBGaramond-TOsF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,178 +11,336 @@
 
 \DeclareFontFamily{OT1}{EBGaramond-TOsF}{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-ot1
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-swash-ot1
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-swash-ot1
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{scsl}{
-      <-> ssub * EBGaramond-TOsF/eb/scit
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{regular}{scsl}{
+      <-> ssub * EBGaramond-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{sl}{
-      <-> ssub * EBGaramond-TOsF/eb/it
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{regular}{sl}{
+      <-> ssub * EBGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{sc}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{n}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{it}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{scsl}{
-      <-> ssub * EBGaramond-TOsF/b/scit
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{bold}{scsl}{
+      <-> ssub * EBGaramond-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{sl}{
-      <-> ssub * EBGaramond-TOsF/b/it
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{bold}{sl}{
+      <-> ssub * EBGaramond-TOsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{sc}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{n}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{scsl}{
-      <-> ssub * EBGaramond-TOsF/sb/scit
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{sl}{
-      <-> ssub * EBGaramond-TOsF/sb/it
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{semibold}{sl}{
+      <-> ssub * EBGaramond-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{mb}{n}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{mb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{mb}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{mb}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{mb}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{mb}{scsl}{
-      <-> ssub * EBGaramond-TOsF/mb/scit
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{medium}{scsl}{
+      <-> ssub * EBGaramond-TOsF/medium/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{medium}{sl}{
+      <-> ssub * EBGaramond-TOsF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{mb}{sl}{
-      <-> ssub * EBGaramond-TOsF/mb/it
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{scsl}{
+      <-> ssub * EBGaramond-TOsF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-sc-ot1
+      <-> ssub * EBGaramond-TOsF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-ot1
+      <-> ssub * EBGaramond-TOsF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-ot1
+      <-> ssub * EBGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-sc-ot1
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{sw}{
+      <-> ssub * EBGaramond-TOsF/regular/sw
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-swash-ot1
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{sl}{
+      <-> ssub * EBGaramond-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{scit}{
+      <-> ssub * EBGaramond-TOsF/regular/scit
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-swash-ot1
+      <-> ssub * EBGaramond-TOsF/regular/nw
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{scsl}{
-      <-> ssub * EBGaramond-TOsF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{scsl}{
+      <-> ssub * EBGaramond-TOsF/semibold/scsl
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{sl}{
-      <-> ssub * EBGaramond-TOsF/m/it
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{sc}{
+      <-> ssub * EBGaramond-TOsF/semibold/sc
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{bx}{scsl}{
-      <-> ssub * EBGaramond-TOsF/b/scsl
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{n}{
+      <-> ssub * EBGaramond-TOsF/semibold/n
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{bx}{sc}{
-      <-> ssub * EBGaramond-TOsF/b/sc
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{it}{
+      <-> ssub * EBGaramond-TOsF/semibold/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{sw}{
+      <-> ssub * EBGaramond-TOsF/semibold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{sl}{
+      <-> ssub * EBGaramond-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{scit}{
+      <-> ssub * EBGaramond-TOsF/semibold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{nw}{
+      <-> ssub * EBGaramond-TOsF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{scsl}{
+      <-> ssub * EBGaramond-TOsF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{sc}{
+      <-> ssub * EBGaramond-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{n}{
+      <-> ssub * EBGaramond-TOsF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{it}{
+      <-> ssub * EBGaramond-TOsF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{sw}{
+      <-> ssub * EBGaramond-TOsF/bold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{sl}{
+      <-> ssub * EBGaramond-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{scit}{
+      <-> ssub * EBGaramond-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{nw}{
+      <-> ssub * EBGaramond-TOsF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{scsl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{sc}{
+      <-> ssub * EBGaramond-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{n}{
+      <-> ssub * EBGaramond-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{it}{
+      <-> ssub * EBGaramond-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{sw}{
+      <-> ssub * EBGaramond-TOsF/extrabold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{sl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{scit}{
+      <-> ssub * EBGaramond-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{nw}{
+      <-> ssub * EBGaramond-TOsF/extrabold/nw
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TOsF}{bx}{n}{
       <-> ssub * EBGaramond-TOsF/b/n
 }{}
 
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{bx}{sc}{
+      <-> ssub * EBGaramond-TOsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{bx}{scsl}{
+      <-> ssub * EBGaramond-TOsF/b/scsl
+}{}
+
 \DeclareFontShape{OT1}{EBGaramond-TOsF}{bx}{it}{
       <-> ssub * EBGaramond-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramondInitials-TLF.fd b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramondInitials-TLF.fd
index 6f7075b53ff..6adb4b1fd1d 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramondInitials-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramondInitials-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{OT1EBGaramondInitials-TLF.fd}
-    [2018/11/30 (autoinst)  Font definitions for OT1/EBGaramondInitials-TLF.]
+    [2019/04/07 (autoinst)  Font definitions for OT1/EBGaramondInitials-TLF.]
 
 \expandafter\ifx\csname EBGaramondInitials@scale\endcsname\relax
     \let\EBGaramondInitials@@scale\@empty
@@ -11,8 +11,21 @@
 
 \DeclareFontFamily{OT1}{EBGaramondInitials-TLF}{}
 
-\DeclareFontShape{OT1}{EBGaramondInitials-TLF}{m}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{EBGaramondInitials-TLF}{regular}{n}{
       <-> \EBGaramondInitials@@scale EBGaramondInitials-tlf-ot1
 }{}
 
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{EBGaramondInitials-TLF}{m}{n}{
+      <-> ssub * EBGaramondInitials-TLF/regular/n
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-Inf.fd b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-Inf.fd
index 4a917a218e0..24ffb535a3f 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-Inf.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{T1EBGaramond-Inf.fd}
-    [2018/11/30 (autoinst)  Font definitions for T1/EBGaramond-Inf.]
+    [2019/04/07 (autoinst)  Font definitions for T1/EBGaramond-Inf.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{T1}{EBGaramond-Inf}{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-inf-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-inf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-inf-t1
+\DeclareFontShape{T1}{EBGaramond-Inf}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{eb}{sl}{
-      <-> ssub * EBGaramond-Inf/eb/it
+\DeclareFontShape{T1}{EBGaramond-Inf}{regular}{sl}{
+      <-> ssub * EBGaramond-Inf/regular/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-inf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{b}{it}{
+\DeclareFontShape{T1}{EBGaramond-Inf}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{b}{sl}{
-      <-> ssub * EBGaramond-Inf/b/it
+\DeclareFontShape{T1}{EBGaramond-Inf}{bold}{sl}{
+      <-> ssub * EBGaramond-Inf/bold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-inf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{sb}{it}{
+\DeclareFontShape{T1}{EBGaramond-Inf}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{sb}{sl}{
-      <-> ssub * EBGaramond-Inf/sb/it
+\DeclareFontShape{T1}{EBGaramond-Inf}{semibold}{sl}{
+      <-> ssub * EBGaramond-Inf/semibold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-inf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{mb}{it}{
+\DeclareFontShape{T1}{EBGaramond-Inf}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{mb}{sl}{
-      <-> ssub * EBGaramond-Inf/mb/it
+\DeclareFontShape{T1}{EBGaramond-Inf}{medium}{sl}{
+      <-> ssub * EBGaramond-Inf/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-inf-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-inf-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{extrabold}{sl}{
+      <-> ssub * EBGaramond-Inf/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{m}{sl}{
+      <-> ssub * EBGaramond-Inf/regular/sl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-Inf}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-inf-t1
+      <-> ssub * EBGaramond-Inf/regular/n
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-Inf}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-inf-t1
+      <-> ssub * EBGaramond-Inf/regular/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{m}{sl}{
-      <-> ssub * EBGaramond-Inf/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{sb}{sl}{
+      <-> ssub * EBGaramond-Inf/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{bx}{sl}{
-      <-> ssub * EBGaramond-Inf/b/sl
+\DeclareFontShape{T1}{EBGaramond-Inf}{sb}{n}{
+      <-> ssub * EBGaramond-Inf/semibold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{sb}{it}{
+      <-> ssub * EBGaramond-Inf/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{b}{sl}{
+      <-> ssub * EBGaramond-Inf/bold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{b}{n}{
+      <-> ssub * EBGaramond-Inf/bold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{b}{it}{
+      <-> ssub * EBGaramond-Inf/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{eb}{sl}{
+      <-> ssub * EBGaramond-Inf/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{eb}{n}{
+      <-> ssub * EBGaramond-Inf/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{eb}{it}{
+      <-> ssub * EBGaramond-Inf/extrabold/it
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-Inf}{bx}{n}{
       <-> ssub * EBGaramond-Inf/b/n
 }{}
 
+\DeclareFontShape{T1}{EBGaramond-Inf}{bx}{sl}{
+      <-> ssub * EBGaramond-Inf/b/sl
+}{}
+
 \DeclareFontShape{T1}{EBGaramond-Inf}{bx}{it}{
       <-> ssub * EBGaramond-Inf/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-LF.fd b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-LF.fd
index e13b319a268..950a2111c34 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-LF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{T1EBGaramond-LF.fd}
-    [2018/11/30 (autoinst)  Font definitions for T1/EBGaramond-LF.]
+    [2019/04/07 (autoinst)  Font definitions for T1/EBGaramond-LF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,242 +11,448 @@
 
 \DeclareFontFamily{T1}{EBGaramond-LF}{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-titling-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-sc-t1
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-t1
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-t1
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-swash-t1
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-sc-t1
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-titling-t1
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-swash-t1
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{scsl}{
-      <-> ssub * EBGaramond-LF/eb/scit
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{scsl}{
+      <-> ssub * EBGaramond-LF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{sl}{
-      <-> ssub * EBGaramond-LF/eb/it
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{sl}{
+      <-> ssub * EBGaramond-LF/regular/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{tlsl}{
-      <-> ssub * EBGaramond-LF/eb/tlit
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{tlsl}{
+      <-> ssub * EBGaramond-LF/regular/tlit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{tl}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{sc}{
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{n}{
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{it}{
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{sw}{
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{scit}{
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{tlit}{
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{nw}{
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{scsl}{
-      <-> ssub * EBGaramond-LF/b/scit
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{scsl}{
+      <-> ssub * EBGaramond-LF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{sl}{
-      <-> ssub * EBGaramond-LF/b/it
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{sl}{
+      <-> ssub * EBGaramond-LF/bold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{tlsl}{
-      <-> ssub * EBGaramond-LF/b/tlit
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{tlsl}{
+      <-> ssub * EBGaramond-LF/bold/tlit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{tl}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{sc}{
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{n}{
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{it}{
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{sw}{
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{scit}{
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{tlit}{
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{nw}{
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{scsl}{
-      <-> ssub * EBGaramond-LF/sb/scit
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-LF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{sl}{
-      <-> ssub * EBGaramond-LF/sb/it
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{sl}{
+      <-> ssub * EBGaramond-LF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{tlsl}{
-      <-> ssub * EBGaramond-LF/sb/tlit
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{tlsl}{
+      <-> ssub * EBGaramond-LF/semibold/tlit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{tl}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{sc}{
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{n}{
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{it}{
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{sw}{
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{scit}{
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{tlit}{
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{nw}{
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{scsl}{
-      <-> ssub * EBGaramond-LF/mb/scit
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{scsl}{
+      <-> ssub * EBGaramond-LF/medium/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{sl}{
+      <-> ssub * EBGaramond-LF/medium/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{tlsl}{
+      <-> ssub * EBGaramond-LF/medium/tlit
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-titling-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-titling-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-LF/extrabold/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{sl}{
-      <-> ssub * EBGaramond-LF/mb/it
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-LF/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{tlsl}{
-      <-> ssub * EBGaramond-LF/mb/tlit
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{tlsl}{
+      <-> ssub * EBGaramond-LF/extrabold/tlit
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{EBGaramond-LF}{m}{scsl}{
+      <-> ssub * EBGaramond-LF/regular/scsl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{m}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-titling-t1
+      <-> ssub * EBGaramond-LF/regular/tl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-sc-t1
+      <-> ssub * EBGaramond-LF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-t1
+      <-> ssub * EBGaramond-LF/regular/n
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-t1
+      <-> ssub * EBGaramond-LF/regular/it
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-swash-t1
+      <-> ssub * EBGaramond-LF/regular/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{m}{sl}{
+      <-> ssub * EBGaramond-LF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{m}{tlsl}{
+      <-> ssub * EBGaramond-LF/regular/tlsl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-sc-t1
+      <-> ssub * EBGaramond-LF/regular/scit
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{m}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-titling-t1
+      <-> ssub * EBGaramond-LF/regular/tlit
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-swash-t1
+      <-> ssub * EBGaramond-LF/regular/nw
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{m}{scsl}{
-      <-> ssub * EBGaramond-LF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{scsl}{
+      <-> ssub * EBGaramond-LF/semibold/scsl
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{m}{sl}{
-      <-> ssub * EBGaramond-LF/m/it
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{tl}{
+      <-> ssub * EBGaramond-LF/semibold/tl
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{m}{tlsl}{
-      <-> ssub * EBGaramond-LF/m/tlit
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{sc}{
+      <-> ssub * EBGaramond-LF/semibold/sc
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{bx}{scsl}{
-      <-> ssub * EBGaramond-LF/b/scsl
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{n}{
+      <-> ssub * EBGaramond-LF/semibold/n
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{bx}{tl}{
-      <-> ssub * EBGaramond-LF/b/tl
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{it}{
+      <-> ssub * EBGaramond-LF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{bx}{sc}{
-      <-> ssub * EBGaramond-LF/b/sc
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{sw}{
+      <-> ssub * EBGaramond-LF/semibold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{sl}{
+      <-> ssub * EBGaramond-LF/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{tlsl}{
+      <-> ssub * EBGaramond-LF/semibold/tlsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{scit}{
+      <-> ssub * EBGaramond-LF/semibold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{tlit}{
+      <-> ssub * EBGaramond-LF/semibold/tlit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{nw}{
+      <-> ssub * EBGaramond-LF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{scsl}{
+      <-> ssub * EBGaramond-LF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{tl}{
+      <-> ssub * EBGaramond-LF/bold/tl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{sc}{
+      <-> ssub * EBGaramond-LF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{n}{
+      <-> ssub * EBGaramond-LF/bold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{it}{
+      <-> ssub * EBGaramond-LF/bold/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{sw}{
+      <-> ssub * EBGaramond-LF/bold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{sl}{
+      <-> ssub * EBGaramond-LF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{tlsl}{
+      <-> ssub * EBGaramond-LF/bold/tlsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{scit}{
+      <-> ssub * EBGaramond-LF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{tlit}{
+      <-> ssub * EBGaramond-LF/bold/tlit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{nw}{
+      <-> ssub * EBGaramond-LF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{scsl}{
+      <-> ssub * EBGaramond-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{tl}{
+      <-> ssub * EBGaramond-LF/extrabold/tl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{sc}{
+      <-> ssub * EBGaramond-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{n}{
+      <-> ssub * EBGaramond-LF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{it}{
+      <-> ssub * EBGaramond-LF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{sw}{
+      <-> ssub * EBGaramond-LF/extrabold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{sl}{
+      <-> ssub * EBGaramond-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{tlsl}{
+      <-> ssub * EBGaramond-LF/extrabold/tlsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{scit}{
+      <-> ssub * EBGaramond-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{tlit}{
+      <-> ssub * EBGaramond-LF/extrabold/tlit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{nw}{
+      <-> ssub * EBGaramond-LF/extrabold/nw
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{bx}{n}{
       <-> ssub * EBGaramond-LF/b/n
 }{}
 
+\DeclareFontShape{T1}{EBGaramond-LF}{bx}{sc}{
+      <-> ssub * EBGaramond-LF/b/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{bx}{tl}{
+      <-> ssub * EBGaramond-LF/b/tl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{bx}{scsl}{
+      <-> ssub * EBGaramond-LF/b/scsl
+}{}
+
 \DeclareFontShape{T1}{EBGaramond-LF}{bx}{it}{
       <-> ssub * EBGaramond-LF/b/it
 }{}
@@ -259,16 +465,16 @@
       <-> ssub * EBGaramond-LF/b/sl
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{bx}{tlsl}{
-      <-> ssub * EBGaramond-LF/b/tlsl
+\DeclareFontShape{T1}{EBGaramond-LF}{bx}{tlit}{
+      <-> ssub * EBGaramond-LF/b/tlit
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{bx}{scit}{
       <-> ssub * EBGaramond-LF/b/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{bx}{tlit}{
-      <-> ssub * EBGaramond-LF/b/tlit
+\DeclareFontShape{T1}{EBGaramond-LF}{bx}{tlsl}{
+      <-> ssub * EBGaramond-LF/b/tlsl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{bx}{nw}{
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-OsF.fd b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-OsF.fd
index 8e3020d4010..26c9ffd2c3d 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-OsF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{T1EBGaramond-OsF.fd}
-    [2018/11/30 (autoinst)  Font definitions for T1/EBGaramond-OsF.]
+    [2019/04/07 (autoinst)  Font definitions for T1/EBGaramond-OsF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,178 +11,336 @@
 
 \DeclareFontFamily{T1}{EBGaramond-OsF}{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-t1
+\DeclareFontShape{T1}{EBGaramond-OsF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-osf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-t1
+\DeclareFontShape{T1}{EBGaramond-OsF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{EBGaramond-OsF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-swash-t1
+\DeclareFontShape{T1}{EBGaramond-OsF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-osf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-swash-t1
+\DeclareFontShape{T1}{EBGaramond-OsF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-osf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{scsl}{
-      <-> ssub * EBGaramond-OsF/eb/scit
+\DeclareFontShape{T1}{EBGaramond-OsF}{regular}{scsl}{
+      <-> ssub * EBGaramond-OsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{sl}{
-      <-> ssub * EBGaramond-OsF/eb/it
+\DeclareFontShape{T1}{EBGaramond-OsF}{regular}{sl}{
+      <-> ssub * EBGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{b}{sc}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{b}{n}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-osf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{b}{it}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{b}{scit}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{b}{sw}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-osf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{b}{nw}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-osf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{b}{scsl}{
-      <-> ssub * EBGaramond-OsF/b/scit
+\DeclareFontShape{T1}{EBGaramond-OsF}{bold}{scsl}{
+      <-> ssub * EBGaramond-OsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{b}{sl}{
-      <-> ssub * EBGaramond-OsF/b/it
+\DeclareFontShape{T1}{EBGaramond-OsF}{bold}{sl}{
+      <-> ssub * EBGaramond-OsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{sc}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{n}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-osf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{it}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{scit}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{sw}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-osf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{nw}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-osf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{scsl}{
-      <-> ssub * EBGaramond-OsF/sb/scit
+\DeclareFontShape{T1}{EBGaramond-OsF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{sl}{
-      <-> ssub * EBGaramond-OsF/sb/it
+\DeclareFontShape{T1}{EBGaramond-OsF}{semibold}{sl}{
+      <-> ssub * EBGaramond-OsF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{mb}{n}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-osf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{mb}{it}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{mb}{scit}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{mb}{sw}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-osf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{mb}{nw}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-osf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{mb}{scsl}{
-      <-> ssub * EBGaramond-OsF/mb/scit
+\DeclareFontShape{T1}{EBGaramond-OsF}{medium}{scsl}{
+      <-> ssub * EBGaramond-OsF/medium/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{medium}{sl}{
+      <-> ssub * EBGaramond-OsF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{mb}{sl}{
-      <-> ssub * EBGaramond-OsF/mb/it
+\DeclareFontShape{T1}{EBGaramond-OsF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-OsF/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{m}{scsl}{
+      <-> ssub * EBGaramond-OsF/regular/scsl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-OsF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-osf-sc-t1
+      <-> ssub * EBGaramond-OsF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-OsF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-osf-t1
+      <-> ssub * EBGaramond-OsF/regular/n
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-OsF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-osf-t1
+      <-> ssub * EBGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-osf-sc-t1
+\DeclareFontShape{T1}{EBGaramond-OsF}{m}{sw}{
+      <-> ssub * EBGaramond-OsF/regular/sw
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-osf-swash-t1
+\DeclareFontShape{T1}{EBGaramond-OsF}{m}{sl}{
+      <-> ssub * EBGaramond-OsF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{m}{scit}{
+      <-> ssub * EBGaramond-OsF/regular/scit
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-OsF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-osf-swash-t1
+      <-> ssub * EBGaramond-OsF/regular/nw
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{m}{scsl}{
-      <-> ssub * EBGaramond-OsF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{scsl}{
+      <-> ssub * EBGaramond-OsF/semibold/scsl
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{m}{sl}{
-      <-> ssub * EBGaramond-OsF/m/it
+\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{sc}{
+      <-> ssub * EBGaramond-OsF/semibold/sc
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{bx}{scsl}{
-      <-> ssub * EBGaramond-OsF/b/scsl
+\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{n}{
+      <-> ssub * EBGaramond-OsF/semibold/n
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{bx}{sc}{
-      <-> ssub * EBGaramond-OsF/b/sc
+\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{it}{
+      <-> ssub * EBGaramond-OsF/semibold/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{sw}{
+      <-> ssub * EBGaramond-OsF/semibold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{sl}{
+      <-> ssub * EBGaramond-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{scit}{
+      <-> ssub * EBGaramond-OsF/semibold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{nw}{
+      <-> ssub * EBGaramond-OsF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{b}{scsl}{
+      <-> ssub * EBGaramond-OsF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{b}{sc}{
+      <-> ssub * EBGaramond-OsF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{b}{n}{
+      <-> ssub * EBGaramond-OsF/bold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{b}{it}{
+      <-> ssub * EBGaramond-OsF/bold/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{b}{sw}{
+      <-> ssub * EBGaramond-OsF/bold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{b}{sl}{
+      <-> ssub * EBGaramond-OsF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{b}{scit}{
+      <-> ssub * EBGaramond-OsF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{b}{nw}{
+      <-> ssub * EBGaramond-OsF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{scsl}{
+      <-> ssub * EBGaramond-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{sc}{
+      <-> ssub * EBGaramond-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{n}{
+      <-> ssub * EBGaramond-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{it}{
+      <-> ssub * EBGaramond-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{sw}{
+      <-> ssub * EBGaramond-OsF/extrabold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{sl}{
+      <-> ssub * EBGaramond-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{scit}{
+      <-> ssub * EBGaramond-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{nw}{
+      <-> ssub * EBGaramond-OsF/extrabold/nw
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-OsF}{bx}{n}{
       <-> ssub * EBGaramond-OsF/b/n
 }{}
 
+\DeclareFontShape{T1}{EBGaramond-OsF}{bx}{sc}{
+      <-> ssub * EBGaramond-OsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{bx}{scsl}{
+      <-> ssub * EBGaramond-OsF/b/scsl
+}{}
+
 \DeclareFontShape{T1}{EBGaramond-OsF}{bx}{it}{
       <-> ssub * EBGaramond-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-Sup.fd b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-Sup.fd
index 90ded2f1c39..102305dcdbd 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-Sup.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{T1EBGaramond-Sup.fd}
-    [2018/11/30 (autoinst)  Font definitions for T1/EBGaramond-Sup.]
+    [2019/04/07 (autoinst)  Font definitions for T1/EBGaramond-Sup.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{T1}{EBGaramond-Sup}{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-sup-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-sup-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-sup-t1
+\DeclareFontShape{T1}{EBGaramond-Sup}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{eb}{sl}{
-      <-> ssub * EBGaramond-Sup/eb/it
+\DeclareFontShape{T1}{EBGaramond-Sup}{regular}{sl}{
+      <-> ssub * EBGaramond-Sup/regular/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{b}{it}{
+\DeclareFontShape{T1}{EBGaramond-Sup}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{b}{sl}{
-      <-> ssub * EBGaramond-Sup/b/it
+\DeclareFontShape{T1}{EBGaramond-Sup}{bold}{sl}{
+      <-> ssub * EBGaramond-Sup/bold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{sb}{it}{
+\DeclareFontShape{T1}{EBGaramond-Sup}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{sb}{sl}{
-      <-> ssub * EBGaramond-Sup/sb/it
+\DeclareFontShape{T1}{EBGaramond-Sup}{semibold}{sl}{
+      <-> ssub * EBGaramond-Sup/semibold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-sup-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{mb}{it}{
+\DeclareFontShape{T1}{EBGaramond-Sup}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{mb}{sl}{
-      <-> ssub * EBGaramond-Sup/mb/it
+\DeclareFontShape{T1}{EBGaramond-Sup}{medium}{sl}{
+      <-> ssub * EBGaramond-Sup/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-sup-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{extrabold}{sl}{
+      <-> ssub * EBGaramond-Sup/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{m}{sl}{
+      <-> ssub * EBGaramond-Sup/regular/sl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-Sup}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-sup-t1
+      <-> ssub * EBGaramond-Sup/regular/n
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-Sup}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-sup-t1
+      <-> ssub * EBGaramond-Sup/regular/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{m}{sl}{
-      <-> ssub * EBGaramond-Sup/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{sb}{sl}{
+      <-> ssub * EBGaramond-Sup/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{bx}{sl}{
-      <-> ssub * EBGaramond-Sup/b/sl
+\DeclareFontShape{T1}{EBGaramond-Sup}{sb}{n}{
+      <-> ssub * EBGaramond-Sup/semibold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{sb}{it}{
+      <-> ssub * EBGaramond-Sup/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{b}{sl}{
+      <-> ssub * EBGaramond-Sup/bold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{b}{n}{
+      <-> ssub * EBGaramond-Sup/bold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{b}{it}{
+      <-> ssub * EBGaramond-Sup/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{eb}{sl}{
+      <-> ssub * EBGaramond-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{eb}{n}{
+      <-> ssub * EBGaramond-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{eb}{it}{
+      <-> ssub * EBGaramond-Sup/extrabold/it
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-Sup}{bx}{n}{
       <-> ssub * EBGaramond-Sup/b/n
 }{}
 
+\DeclareFontShape{T1}{EBGaramond-Sup}{bx}{sl}{
+      <-> ssub * EBGaramond-Sup/b/sl
+}{}
+
 \DeclareFontShape{T1}{EBGaramond-Sup}{bx}{it}{
       <-> ssub * EBGaramond-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-TLF.fd b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-TLF.fd
index 176a8fb32e6..00932a3a4ab 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{T1EBGaramond-TLF.fd}
-    [2018/11/30 (autoinst)  Font definitions for T1/EBGaramond-TLF.]
+    [2019/04/07 (autoinst)  Font definitions for T1/EBGaramond-TLF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,242 +11,448 @@
 
 \DeclareFontFamily{T1}{EBGaramond-TLF}{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-titling-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-sc-t1
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-t1
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-t1
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-swash-t1
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-titling-t1
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-swash-t1
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{scsl}{
-      <-> ssub * EBGaramond-TLF/eb/scit
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{scsl}{
+      <-> ssub * EBGaramond-TLF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{sl}{
-      <-> ssub * EBGaramond-TLF/eb/it
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{sl}{
+      <-> ssub * EBGaramond-TLF/regular/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{tlsl}{
-      <-> ssub * EBGaramond-TLF/eb/tlit
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{tlsl}{
+      <-> ssub * EBGaramond-TLF/regular/tlit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{tl}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{sc}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{n}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{it}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{sw}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{scit}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{tlit}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{nw}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{scsl}{
-      <-> ssub * EBGaramond-TLF/b/scit
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{scsl}{
+      <-> ssub * EBGaramond-TLF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{sl}{
-      <-> ssub * EBGaramond-TLF/b/it
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{sl}{
+      <-> ssub * EBGaramond-TLF/bold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{tlsl}{
-      <-> ssub * EBGaramond-TLF/b/tlit
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{tlsl}{
+      <-> ssub * EBGaramond-TLF/bold/tlit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{tl}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{sc}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{n}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{it}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{sw}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{scit}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{tlit}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{nw}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{scsl}{
-      <-> ssub * EBGaramond-TLF/sb/scit
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{sl}{
-      <-> ssub * EBGaramond-TLF/sb/it
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{sl}{
+      <-> ssub * EBGaramond-TLF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{tlsl}{
-      <-> ssub * EBGaramond-TLF/sb/tlit
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{tlsl}{
+      <-> ssub * EBGaramond-TLF/semibold/tlit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{tl}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{sc}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{n}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{it}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{sw}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{scit}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{tlit}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{nw}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{scsl}{
-      <-> ssub * EBGaramond-TLF/mb/scit
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{scsl}{
+      <-> ssub * EBGaramond-TLF/medium/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{sl}{
+      <-> ssub * EBGaramond-TLF/medium/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{tlsl}{
+      <-> ssub * EBGaramond-TLF/medium/tlit
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-titling-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-titling-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{sl}{
-      <-> ssub * EBGaramond-TLF/mb/it
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-TLF/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{tlsl}{
-      <-> ssub * EBGaramond-TLF/mb/tlit
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{tlsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/tlit
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{m}{scsl}{
+      <-> ssub * EBGaramond-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{m}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-titling-t1
+      <-> ssub * EBGaramond-TLF/regular/tl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-sc-t1
+      <-> ssub * EBGaramond-TLF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-t1
+      <-> ssub * EBGaramond-TLF/regular/n
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-t1
+      <-> ssub * EBGaramond-TLF/regular/it
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-swash-t1
+      <-> ssub * EBGaramond-TLF/regular/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{m}{sl}{
+      <-> ssub * EBGaramond-TLF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{m}{tlsl}{
+      <-> ssub * EBGaramond-TLF/regular/tlsl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-sc-t1
+      <-> ssub * EBGaramond-TLF/regular/scit
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{m}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-titling-t1
+      <-> ssub * EBGaramond-TLF/regular/tlit
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-swash-t1
+      <-> ssub * EBGaramond-TLF/regular/nw
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{m}{scsl}{
-      <-> ssub * EBGaramond-TLF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{scsl}{
+      <-> ssub * EBGaramond-TLF/semibold/scsl
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{m}{sl}{
-      <-> ssub * EBGaramond-TLF/m/it
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{tl}{
+      <-> ssub * EBGaramond-TLF/semibold/tl
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{m}{tlsl}{
-      <-> ssub * EBGaramond-TLF/m/tlit
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{sc}{
+      <-> ssub * EBGaramond-TLF/semibold/sc
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{bx}{scsl}{
-      <-> ssub * EBGaramond-TLF/b/scsl
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{n}{
+      <-> ssub * EBGaramond-TLF/semibold/n
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{bx}{tl}{
-      <-> ssub * EBGaramond-TLF/b/tl
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{it}{
+      <-> ssub * EBGaramond-TLF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{bx}{sc}{
-      <-> ssub * EBGaramond-TLF/b/sc
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{sw}{
+      <-> ssub * EBGaramond-TLF/semibold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{sl}{
+      <-> ssub * EBGaramond-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{tlsl}{
+      <-> ssub * EBGaramond-TLF/semibold/tlsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{scit}{
+      <-> ssub * EBGaramond-TLF/semibold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{tlit}{
+      <-> ssub * EBGaramond-TLF/semibold/tlit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{nw}{
+      <-> ssub * EBGaramond-TLF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{scsl}{
+      <-> ssub * EBGaramond-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{tl}{
+      <-> ssub * EBGaramond-TLF/bold/tl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{sc}{
+      <-> ssub * EBGaramond-TLF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{n}{
+      <-> ssub * EBGaramond-TLF/bold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{it}{
+      <-> ssub * EBGaramond-TLF/bold/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{sw}{
+      <-> ssub * EBGaramond-TLF/bold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{sl}{
+      <-> ssub * EBGaramond-TLF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{tlsl}{
+      <-> ssub * EBGaramond-TLF/bold/tlsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{scit}{
+      <-> ssub * EBGaramond-TLF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{tlit}{
+      <-> ssub * EBGaramond-TLF/bold/tlit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{nw}{
+      <-> ssub * EBGaramond-TLF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{scsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{tl}{
+      <-> ssub * EBGaramond-TLF/extrabold/tl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{sc}{
+      <-> ssub * EBGaramond-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{n}{
+      <-> ssub * EBGaramond-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{it}{
+      <-> ssub * EBGaramond-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{sw}{
+      <-> ssub * EBGaramond-TLF/extrabold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{sl}{
+      <-> ssub * EBGaramond-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{tlsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/tlsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{scit}{
+      <-> ssub * EBGaramond-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{tlit}{
+      <-> ssub * EBGaramond-TLF/extrabold/tlit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{nw}{
+      <-> ssub * EBGaramond-TLF/extrabold/nw
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{bx}{n}{
       <-> ssub * EBGaramond-TLF/b/n
 }{}
 
+\DeclareFontShape{T1}{EBGaramond-TLF}{bx}{sc}{
+      <-> ssub * EBGaramond-TLF/b/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{bx}{tl}{
+      <-> ssub * EBGaramond-TLF/b/tl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{bx}{scsl}{
+      <-> ssub * EBGaramond-TLF/b/scsl
+}{}
+
 \DeclareFontShape{T1}{EBGaramond-TLF}{bx}{it}{
       <-> ssub * EBGaramond-TLF/b/it
 }{}
@@ -259,16 +465,16 @@
       <-> ssub * EBGaramond-TLF/b/sl
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{bx}{tlsl}{
-      <-> ssub * EBGaramond-TLF/b/tlsl
+\DeclareFontShape{T1}{EBGaramond-TLF}{bx}{tlit}{
+      <-> ssub * EBGaramond-TLF/b/tlit
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{bx}{scit}{
       <-> ssub * EBGaramond-TLF/b/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{bx}{tlit}{
-      <-> ssub * EBGaramond-TLF/b/tlit
+\DeclareFontShape{T1}{EBGaramond-TLF}{bx}{tlsl}{
+      <-> ssub * EBGaramond-TLF/b/tlsl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{bx}{nw}{
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-TOsF.fd b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-TOsF.fd
index 319289bf61a..d46b633f7bf 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{T1EBGaramond-TOsF.fd}
-    [2018/11/30 (autoinst)  Font definitions for T1/EBGaramond-TOsF.]
+    [2019/04/07 (autoinst)  Font definitions for T1/EBGaramond-TOsF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,178 +11,336 @@
 
 \DeclareFontFamily{T1}{EBGaramond-TOsF}{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-t1
+\DeclareFontShape{T1}{EBGaramond-TOsF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-t1
+\DeclareFontShape{T1}{EBGaramond-TOsF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{EBGaramond-TOsF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-swash-t1
+\DeclareFontShape{T1}{EBGaramond-TOsF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-swash-t1
+\DeclareFontShape{T1}{EBGaramond-TOsF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{scsl}{
-      <-> ssub * EBGaramond-TOsF/eb/scit
+\DeclareFontShape{T1}{EBGaramond-TOsF}{regular}{scsl}{
+      <-> ssub * EBGaramond-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{sl}{
-      <-> ssub * EBGaramond-TOsF/eb/it
+\DeclareFontShape{T1}{EBGaramond-TOsF}{regular}{sl}{
+      <-> ssub * EBGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{sc}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{n}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{it}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{scit}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{sw}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tosf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{nw}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tosf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{scsl}{
-      <-> ssub * EBGaramond-TOsF/b/scit
+\DeclareFontShape{T1}{EBGaramond-TOsF}{bold}{scsl}{
+      <-> ssub * EBGaramond-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{sl}{
-      <-> ssub * EBGaramond-TOsF/b/it
+\DeclareFontShape{T1}{EBGaramond-TOsF}{bold}{sl}{
+      <-> ssub * EBGaramond-TOsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{sc}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{n}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{it}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{scit}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{sw}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tosf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{nw}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tosf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{scsl}{
-      <-> ssub * EBGaramond-TOsF/sb/scit
+\DeclareFontShape{T1}{EBGaramond-TOsF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{sl}{
-      <-> ssub * EBGaramond-TOsF/sb/it
+\DeclareFontShape{T1}{EBGaramond-TOsF}{semibold}{sl}{
+      <-> ssub * EBGaramond-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{mb}{n}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{mb}{it}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{mb}{scit}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{mb}{sw}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tosf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{mb}{nw}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tosf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{mb}{scsl}{
-      <-> ssub * EBGaramond-TOsF/mb/scit
+\DeclareFontShape{T1}{EBGaramond-TOsF}{medium}{scsl}{
+      <-> ssub * EBGaramond-TOsF/medium/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{medium}{sl}{
+      <-> ssub * EBGaramond-TOsF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{mb}{sl}{
-      <-> ssub * EBGaramond-TOsF/mb/it
+\DeclareFontShape{T1}{EBGaramond-TOsF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{m}{scsl}{
+      <-> ssub * EBGaramond-TOsF/regular/scsl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TOsF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-sc-t1
+      <-> ssub * EBGaramond-TOsF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TOsF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-t1
+      <-> ssub * EBGaramond-TOsF/regular/n
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TOsF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-t1
+      <-> ssub * EBGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-sc-t1
+\DeclareFontShape{T1}{EBGaramond-TOsF}{m}{sw}{
+      <-> ssub * EBGaramond-TOsF/regular/sw
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-swash-t1
+\DeclareFontShape{T1}{EBGaramond-TOsF}{m}{sl}{
+      <-> ssub * EBGaramond-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{m}{scit}{
+      <-> ssub * EBGaramond-TOsF/regular/scit
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TOsF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-swash-t1
+      <-> ssub * EBGaramond-TOsF/regular/nw
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{m}{scsl}{
-      <-> ssub * EBGaramond-TOsF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{scsl}{
+      <-> ssub * EBGaramond-TOsF/semibold/scsl
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{m}{sl}{
-      <-> ssub * EBGaramond-TOsF/m/it
+\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{sc}{
+      <-> ssub * EBGaramond-TOsF/semibold/sc
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{bx}{scsl}{
-      <-> ssub * EBGaramond-TOsF/b/scsl
+\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{n}{
+      <-> ssub * EBGaramond-TOsF/semibold/n
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{bx}{sc}{
-      <-> ssub * EBGaramond-TOsF/b/sc
+\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{it}{
+      <-> ssub * EBGaramond-TOsF/semibold/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{sw}{
+      <-> ssub * EBGaramond-TOsF/semibold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{sl}{
+      <-> ssub * EBGaramond-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{scit}{
+      <-> ssub * EBGaramond-TOsF/semibold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{nw}{
+      <-> ssub * EBGaramond-TOsF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{scsl}{
+      <-> ssub * EBGaramond-TOsF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{sc}{
+      <-> ssub * EBGaramond-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{n}{
+      <-> ssub * EBGaramond-TOsF/bold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{it}{
+      <-> ssub * EBGaramond-TOsF/bold/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{sw}{
+      <-> ssub * EBGaramond-TOsF/bold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{sl}{
+      <-> ssub * EBGaramond-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{scit}{
+      <-> ssub * EBGaramond-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{nw}{
+      <-> ssub * EBGaramond-TOsF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{scsl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{sc}{
+      <-> ssub * EBGaramond-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{n}{
+      <-> ssub * EBGaramond-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{it}{
+      <-> ssub * EBGaramond-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{sw}{
+      <-> ssub * EBGaramond-TOsF/extrabold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{sl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{scit}{
+      <-> ssub * EBGaramond-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{nw}{
+      <-> ssub * EBGaramond-TOsF/extrabold/nw
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TOsF}{bx}{n}{
       <-> ssub * EBGaramond-TOsF/b/n
 }{}
 
+\DeclareFontShape{T1}{EBGaramond-TOsF}{bx}{sc}{
+      <-> ssub * EBGaramond-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{bx}{scsl}{
+      <-> ssub * EBGaramond-TOsF/b/scsl
+}{}
+
 \DeclareFontShape{T1}{EBGaramond-TOsF}{bx}{it}{
       <-> ssub * EBGaramond-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramondInitials-TLF.fd b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramondInitials-TLF.fd
index 1020c52c94d..fed21cce302 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramondInitials-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramondInitials-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{T1EBGaramondInitials-TLF.fd}
-    [2018/11/30 (autoinst)  Font definitions for T1/EBGaramondInitials-TLF.]
+    [2019/04/07 (autoinst)  Font definitions for T1/EBGaramondInitials-TLF.]
 
 \expandafter\ifx\csname EBGaramondInitials@scale\endcsname\relax
     \let\EBGaramondInitials@@scale\@empty
@@ -11,8 +11,21 @@
 
 \DeclareFontFamily{T1}{EBGaramondInitials-TLF}{}
 
-\DeclareFontShape{T1}{EBGaramondInitials-TLF}{m}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{EBGaramondInitials-TLF}{regular}{n}{
       <-> \EBGaramondInitials@@scale EBGaramondInitials-tlf-t1
 }{}
 
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{EBGaramondInitials-TLF}{m}{n}{
+      <-> ssub * EBGaramondInitials-TLF/regular/n
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-LF.fd b/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-LF.fd
index 1dad2ff5536..f5f00a922f3 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-LF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{TS1EBGaramond-LF.fd}
-    [2018/11/30 (autoinst)  Font definitions for TS1/EBGaramond-LF.]
+    [2019/04/07 (autoinst)  Font definitions for TS1/EBGaramond-LF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{TS1}{EBGaramond-LF}{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-ts1
+\DeclareFontShape{TS1}{EBGaramond-LF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{eb}{sl}{
-      <-> ssub * EBGaramond-LF/eb/it
+\DeclareFontShape{TS1}{EBGaramond-LF}{regular}{sl}{
+      <-> ssub * EBGaramond-LF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{b}{it}{
+\DeclareFontShape{TS1}{EBGaramond-LF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{b}{sl}{
-      <-> ssub * EBGaramond-LF/b/it
+\DeclareFontShape{TS1}{EBGaramond-LF}{bold}{sl}{
+      <-> ssub * EBGaramond-LF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{sb}{it}{
+\DeclareFontShape{TS1}{EBGaramond-LF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{sb}{sl}{
-      <-> ssub * EBGaramond-LF/sb/it
+\DeclareFontShape{TS1}{EBGaramond-LF}{semibold}{sl}{
+      <-> ssub * EBGaramond-LF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{mb}{it}{
+\DeclareFontShape{TS1}{EBGaramond-LF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{mb}{sl}{
-      <-> ssub * EBGaramond-LF/mb/it
+\DeclareFontShape{TS1}{EBGaramond-LF}{medium}{sl}{
+      <-> ssub * EBGaramond-LF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-LF/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{m}{sl}{
+      <-> ssub * EBGaramond-LF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-LF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-ts1
+      <-> ssub * EBGaramond-LF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-LF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-ts1
+      <-> ssub * EBGaramond-LF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{m}{sl}{
-      <-> ssub * EBGaramond-LF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{sb}{sl}{
+      <-> ssub * EBGaramond-LF/semibold/sl
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{bx}{sl}{
-      <-> ssub * EBGaramond-LF/b/sl
+\DeclareFontShape{TS1}{EBGaramond-LF}{sb}{n}{
+      <-> ssub * EBGaramond-LF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{sb}{it}{
+      <-> ssub * EBGaramond-LF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{b}{sl}{
+      <-> ssub * EBGaramond-LF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{b}{n}{
+      <-> ssub * EBGaramond-LF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{b}{it}{
+      <-> ssub * EBGaramond-LF/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{eb}{sl}{
+      <-> ssub * EBGaramond-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{eb}{n}{
+      <-> ssub * EBGaramond-LF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{eb}{it}{
+      <-> ssub * EBGaramond-LF/extrabold/it
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-LF}{bx}{n}{
       <-> ssub * EBGaramond-LF/b/n
 }{}
 
+\DeclareFontShape{TS1}{EBGaramond-LF}{bx}{sl}{
+      <-> ssub * EBGaramond-LF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{EBGaramond-LF}{bx}{it}{
       <-> ssub * EBGaramond-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-OsF.fd b/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-OsF.fd
index 49364da855b..9e5447163ee 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-OsF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{TS1EBGaramond-OsF.fd}
-    [2018/11/30 (autoinst)  Font definitions for TS1/EBGaramond-OsF.]
+    [2019/04/07 (autoinst)  Font definitions for TS1/EBGaramond-OsF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{TS1}{EBGaramond-OsF}{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-ts1
+\DeclareFontShape{TS1}{EBGaramond-OsF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{eb}{sl}{
-      <-> ssub * EBGaramond-OsF/eb/it
+\DeclareFontShape{TS1}{EBGaramond-OsF}{regular}{sl}{
+      <-> ssub * EBGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{b}{it}{
+\DeclareFontShape{TS1}{EBGaramond-OsF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{b}{sl}{
-      <-> ssub * EBGaramond-OsF/b/it
+\DeclareFontShape{TS1}{EBGaramond-OsF}{bold}{sl}{
+      <-> ssub * EBGaramond-OsF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{sb}{it}{
+\DeclareFontShape{TS1}{EBGaramond-OsF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{sb}{sl}{
-      <-> ssub * EBGaramond-OsF/sb/it
+\DeclareFontShape{TS1}{EBGaramond-OsF}{semibold}{sl}{
+      <-> ssub * EBGaramond-OsF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{mb}{it}{
+\DeclareFontShape{TS1}{EBGaramond-OsF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{mb}{sl}{
-      <-> ssub * EBGaramond-OsF/mb/it
+\DeclareFontShape{TS1}{EBGaramond-OsF}{medium}{sl}{
+      <-> ssub * EBGaramond-OsF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-OsF/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{m}{sl}{
+      <-> ssub * EBGaramond-OsF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-OsF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-osf-ts1
+      <-> ssub * EBGaramond-OsF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-OsF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-osf-ts1
+      <-> ssub * EBGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{m}{sl}{
-      <-> ssub * EBGaramond-OsF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{sb}{sl}{
+      <-> ssub * EBGaramond-OsF/semibold/sl
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{bx}{sl}{
-      <-> ssub * EBGaramond-OsF/b/sl
+\DeclareFontShape{TS1}{EBGaramond-OsF}{sb}{n}{
+      <-> ssub * EBGaramond-OsF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{sb}{it}{
+      <-> ssub * EBGaramond-OsF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{b}{sl}{
+      <-> ssub * EBGaramond-OsF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{b}{n}{
+      <-> ssub * EBGaramond-OsF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{b}{it}{
+      <-> ssub * EBGaramond-OsF/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{eb}{sl}{
+      <-> ssub * EBGaramond-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{eb}{n}{
+      <-> ssub * EBGaramond-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{eb}{it}{
+      <-> ssub * EBGaramond-OsF/extrabold/it
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-OsF}{bx}{n}{
       <-> ssub * EBGaramond-OsF/b/n
 }{}
 
+\DeclareFontShape{TS1}{EBGaramond-OsF}{bx}{sl}{
+      <-> ssub * EBGaramond-OsF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{EBGaramond-OsF}{bx}{it}{
       <-> ssub * EBGaramond-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-TLF.fd b/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-TLF.fd
index f58a9fbc96a..366d84d19dc 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{TS1EBGaramond-TLF.fd}
-    [2018/11/30 (autoinst)  Font definitions for TS1/EBGaramond-TLF.]
+    [2019/04/07 (autoinst)  Font definitions for TS1/EBGaramond-TLF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{TS1}{EBGaramond-TLF}{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{EBGaramond-TLF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{eb}{sl}{
-      <-> ssub * EBGaramond-TLF/eb/it
+\DeclareFontShape{TS1}{EBGaramond-TLF}{regular}{sl}{
+      <-> ssub * EBGaramond-TLF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{b}{it}{
+\DeclareFontShape{TS1}{EBGaramond-TLF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{b}{sl}{
-      <-> ssub * EBGaramond-TLF/b/it
+\DeclareFontShape{TS1}{EBGaramond-TLF}{bold}{sl}{
+      <-> ssub * EBGaramond-TLF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{sb}{it}{
+\DeclareFontShape{TS1}{EBGaramond-TLF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{sb}{sl}{
-      <-> ssub * EBGaramond-TLF/sb/it
+\DeclareFontShape{TS1}{EBGaramond-TLF}{semibold}{sl}{
+      <-> ssub * EBGaramond-TLF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{mb}{it}{
+\DeclareFontShape{TS1}{EBGaramond-TLF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{mb}{sl}{
-      <-> ssub * EBGaramond-TLF/mb/it
+\DeclareFontShape{TS1}{EBGaramond-TLF}{medium}{sl}{
+      <-> ssub * EBGaramond-TLF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-TLF/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{m}{sl}{
+      <-> ssub * EBGaramond-TLF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-TLF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-ts1
+      <-> ssub * EBGaramond-TLF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-TLF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-ts1
+      <-> ssub * EBGaramond-TLF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{m}{sl}{
-      <-> ssub * EBGaramond-TLF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{sb}{sl}{
+      <-> ssub * EBGaramond-TLF/semibold/sl
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{bx}{sl}{
-      <-> ssub * EBGaramond-TLF/b/sl
+\DeclareFontShape{TS1}{EBGaramond-TLF}{sb}{n}{
+      <-> ssub * EBGaramond-TLF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{sb}{it}{
+      <-> ssub * EBGaramond-TLF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{b}{sl}{
+      <-> ssub * EBGaramond-TLF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{b}{n}{
+      <-> ssub * EBGaramond-TLF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{b}{it}{
+      <-> ssub * EBGaramond-TLF/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{eb}{sl}{
+      <-> ssub * EBGaramond-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{eb}{n}{
+      <-> ssub * EBGaramond-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{eb}{it}{
+      <-> ssub * EBGaramond-TLF/extrabold/it
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-TLF}{bx}{n}{
       <-> ssub * EBGaramond-TLF/b/n
 }{}
 
+\DeclareFontShape{TS1}{EBGaramond-TLF}{bx}{sl}{
+      <-> ssub * EBGaramond-TLF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{EBGaramond-TLF}{bx}{it}{
       <-> ssub * EBGaramond-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-TOsF.fd b/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-TOsF.fd
index 6ef946beb80..49a0ee85a5a 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{TS1EBGaramond-TOsF.fd}
-    [2018/11/30 (autoinst)  Font definitions for TS1/EBGaramond-TOsF.]
+    [2019/04/07 (autoinst)  Font definitions for TS1/EBGaramond-TOsF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{TS1}{EBGaramond-TOsF}{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{eb}{sl}{
-      <-> ssub * EBGaramond-TOsF/eb/it
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{regular}{sl}{
+      <-> ssub * EBGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{b}{it}{
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{b}{sl}{
-      <-> ssub * EBGaramond-TOsF/b/it
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{bold}{sl}{
+      <-> ssub * EBGaramond-TOsF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{sb}{it}{
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{sb}{sl}{
-      <-> ssub * EBGaramond-TOsF/sb/it
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{semibold}{sl}{
+      <-> ssub * EBGaramond-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{mb}{it}{
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{mb}{sl}{
-      <-> ssub * EBGaramond-TOsF/mb/it
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{medium}{sl}{
+      <-> ssub * EBGaramond-TOsF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{m}{sl}{
+      <-> ssub * EBGaramond-TOsF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-TOsF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-ts1
+      <-> ssub * EBGaramond-TOsF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-TOsF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-ts1
+      <-> ssub * EBGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{m}{sl}{
-      <-> ssub * EBGaramond-TOsF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{sb}{sl}{
+      <-> ssub * EBGaramond-TOsF/semibold/sl
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{bx}{sl}{
-      <-> ssub * EBGaramond-TOsF/b/sl
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{sb}{n}{
+      <-> ssub * EBGaramond-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{sb}{it}{
+      <-> ssub * EBGaramond-TOsF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{b}{sl}{
+      <-> ssub * EBGaramond-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{b}{n}{
+      <-> ssub * EBGaramond-TOsF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{b}{it}{
+      <-> ssub * EBGaramond-TOsF/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{eb}{sl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{eb}{n}{
+      <-> ssub * EBGaramond-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{eb}{it}{
+      <-> ssub * EBGaramond-TOsF/extrabold/it
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-TOsF}{bx}{n}{
       <-> ssub * EBGaramond-TOsF/b/n
 }{}
 
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{bx}{sl}{
+      <-> ssub * EBGaramond-TOsF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{EBGaramond-TOsF}{bx}{it}{
       <-> ssub * EBGaramond-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramondInitials-TLF.fd b/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramondInitials-TLF.fd
index bc715e1febe..5b378780be9 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramondInitials-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramondInitials-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{TS1EBGaramondInitials-TLF.fd}
-    [2018/11/30 (autoinst)  Font definitions for TS1/EBGaramondInitials-TLF.]
+    [2019/04/07 (autoinst)  Font definitions for TS1/EBGaramondInitials-TLF.]
 
 \expandafter\ifx\csname EBGaramondInitials@scale\endcsname\relax
     \let\EBGaramondInitials@@scale\@empty
@@ -11,8 +11,21 @@
 
 \DeclareFontFamily{TS1}{EBGaramondInitials-TLF}{}
 
-\DeclareFontShape{TS1}{EBGaramondInitials-TLF}{m}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{EBGaramondInitials-TLF}{regular}{n}{
       <-> \EBGaramondInitials@@scale EBGaramondInitials-tlf-ts1
 }{}
 
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{EBGaramondInitials-TLF}{m}{n}{
+      <-> ssub * EBGaramondInitials-TLF/regular/n
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/ebgaramond.sty b/Master/texmf-dist/tex/latex/ebgaramond/ebgaramond.sty
index 7cfd7dfbb0c..3e93c61ef26 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/ebgaramond.sty
+++ b/Master/texmf-dist/tex/latex/ebgaramond/ebgaramond.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{ebgaramond}
-    [2018/11/30 (Bob Tennent and autoinst)  Style file for EB Garamond fonts.]
+    [2018/04/07 (Bob Tennent and autoinst)  Style file for EB Garamond fonts.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
@@ -81,16 +81,17 @@
     \def\ebgaramond@figurealign{}
   \fi
   \ifebgaramond@medium
-    \def\mdseries@rm{mb}
+    \def\mdseries@rm{medium}
   \else
-    \def\mdseries@rm{m}
+    \def\mdseries@rm{regular}
   \fi
+  \def\seriesdefault{\mdseries@rm}
   \ifebgaramond@semibold
-    \def\bfseries@rm{sb}
+    \def\bfseries@rm{semibold}
   \else\ifebgaramond@extrabold
-    \def\bfseries@rm{eb}
+    \def\bfseries@rm{extrabold}
   \else
-    \def\bfseries@rm{b}
+    \def\bfseries@rm{bold}
   \fi\fi
 
 \fi
@@ -178,7 +179,7 @@
   \fa@naming@exception{shape}{{it}{sw}}{sw}
 
 
-  \def\initials{\fontfamily{EBGaramondInitials-TLF}\fontseries{m}\selectfont}
+  \def\initials{\fontfamily{EBGaramondInitials-TLF}\fontseries{regular}\selectfont}
   \DeclareTextFontCommand{\oldstylenums}{\fontfamily{EBGaramond-\ebgaramond@figurealign OsF}\selectfont}
   \DeclareTextFontCommand{\liningnums}{\fontfamily{EBGaramond-\ebgaramond@figurealign LF}\selectfont}
   \DeclareTextFontCommand{\textin}{\initials}