summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/fonts/enc
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-11-08 21:40:29 +0000
committerKarl Berry <karl@freefriends.org>2020-11-08 21:40:29 +0000
commit91b5f65b3bfbc997ba30f0d3f74799ab0c6ed233 (patch)
tree69dc024bcf6db425527b5a3022a149fe203a98cc /Master/texmf-dist/fonts/enc
parenta8c19b29aed474830de22b40ec4e51984f08f956 (diff)
baskervaldx (8nov20)
git-svn-id: svn://tug.org/texlive/trunk@56883 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/fonts/enc')
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_23jm4j.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_jmvj36.enc)20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2445cl.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ea64ih.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2kku7k.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_shb4ap.enc)15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2n2qka.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2xv27p.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2bp5ef.enc)15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2zeho7.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_krjs6b.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_34qyyt.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_uhxou6.enc)15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_4f5bev.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_524fcc.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_556rta.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_5p6atn.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_upsxpb.enc)13
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_5zt4ml.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6dnovg.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6lr3v3.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_537kn6.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6rdtju.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6xreh4.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_7d54ky.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_nak3zo.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_7i75ol.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_7nnme4.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ahc6ab.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_67xtiz.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ak7beg.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_jd6ty7.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_aorlch.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_3omoui.enc)20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_auq4k5.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_awcfcx.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ax2yo2.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_xyk42r.enc)20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ax7osu.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_4kmser.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_c3asvt.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_4ksy5y.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ck4t6h.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_cl2iyt.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2sm4i7.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_clcsgf.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_3lvabu.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_coqtyh.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_cv7nez.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_cgzxx6.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_d7elqy.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_d7lahw.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_e3qxqg.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_dbb2hd.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_rtdlfq.enc)20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_dw7i6y.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_edkp5z.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_xsxsev.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ezfzzx.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_go57dj.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_feassy.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_hkyy53.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_g4f2qe.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_wy43ep.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_g5xsbp.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_gar3zb.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_gjwmpg.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_h4nqsn.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ik76ei.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ilkd46.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_itooof.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_n57xi2.enc)13
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_jwmruw.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_k3ascw.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_k6hbcl.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_kq7kv3.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_l44ess.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ne5zxs.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_lewyuf.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_lozoyg.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_lxdjmd.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6mioll.enc)20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_m4qttc.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_igsfta.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_m5lkgj.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_mu6kzn.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_mvsyl4.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_mys6kl.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_nt5h45.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_nwv7yn.enc63
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ofzzxu.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_7453eo.enc)20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_pqcihf.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_n3xo7h.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_puztjr.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_riybhr.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_rosua2.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_bs5d7e.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_scthrl.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_oue4qy.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_sv3nex.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_nq5ldf.enc)13
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_teykvl.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_gsgxts.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_tfcpq3.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6tdhgo.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_tnmdy3.enc63
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_tv7w6k.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_7qmldf.enc)13
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_uguye6.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6rwo65.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_untte3.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_upot5e.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_uy4eps.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_v577lu.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_hg6ru4.enc)20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_wg6wcc.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_bgypte.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_wvrs5w.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_xbckbj.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_xebzk2.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_xjuza2.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_xotpaa.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_caye23.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_y62qbt.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_y77okd.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_rzwiio.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_yk4dqp.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_l7sulo.enc)20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ymibyh.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_zag37q.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_zb3hlf.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_zey2cz.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_zkqdv4.enc66
92 files changed, 2058 insertions, 1953 deletions
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_jmvj36.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_23jm4j.enc
index dad2c3e2931..06d858aa5a0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_jmvj36.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_23jm4j.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_jmvj36mpo2tpwkft3ibr7h7ijd
-% Encoding created by otftotfm on Wed Nov 26 10:47:27 2014
+%%AutoEnc_23jm4j5tiz3kvifx7wsju2mdwc
+% Encoding created by otftotfm on Sat Nov 7 12:05:10 2020
% Command line follows encoding
-/AutoEnc_jmvj36mpo2tpwkft3ibr7h7ijd [
+/AutoEnc_23jm4j5tiz3kvifx7wsju2mdwc [
%00
- /fi /Euro /f_f_i /f_f /fraction /dotaccent /hungarumlaut /ogonek
- /fl /f_f_l /.notdef /f_j /f_f_j /.notdef /.notdef /.notdef
+ /f_f_i /Euro /f_f /f_f_l /fraction /dotaccent /hungarumlaut /ogonek
+ /f_j /f_f_j /.notdef /.notdef /fi /fl /.notdef /.notdef
%10
/dotlessi /dotlessj /asciigrave /asciiacute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -35,7 +35,7 @@
/lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
%A0
- /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/asciidieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
/degree /plusminus /two.superior /three.superior /asciiacute /uni00B5 /pilcrow /periodcentered
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=tnum Baskervaldx-Reg.otf
-% Baskervaldx-Reg-tlf-ly1'
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-Reg.otf Baskervaldx-Reg-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ea64ih.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2445cl.enc
index 7b28537a5b7..295a1608798 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ea64ih.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2445cl.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_ea64ihnp7ogf52iubdmbsa3pse
-% Encoding created by otftotfm on Wed Nov 26 10:46:18 2014
+%%AutoEnc_2445clcjz4phmdtjcoc2a4h5rd
+% Encoding created by otftotfm on Sat Nov 7 12:04:45 2020
% Command line follows encoding
-/AutoEnc_ea64ihnp7ogf52iubdmbsa3pse [
+/AutoEnc_2445clcjz4phmdtjcoc2a4h5rd [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
%10
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /f_i /f_f_i /f_f /f_l /f_f_l
+ /f_i /dotlessi /dotlessj /f_f_i /f_f /f_l /f_f_l /f_j
%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=lnum --feature=pnum Baskervaldx-Bol.otf
-% Baskervaldx-Bol-lf-t1'
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-Bol.otf Baskervaldx-Bol-lf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_shb4ap.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2kku7k.enc
index 478381420c7..19a0352f41f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_shb4ap.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2kku7k.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_shb4apftokonopwhj7byaqq3ud
-% Encoding created by otftotfm on Wed Nov 26 10:46:15 2014
+%%AutoEnc_2kku7kcm5wly7dybkda76rsdpf
+% Encoding created by otftotfm on Sat Nov 7 12:04:44 2020
% Command line follows encoding
-/AutoEnc_shb4apftokonopwhj7byaqq3ud [
+/AutoEnc_2kku7kcm5wly7dybkda76rsdpf [
%00
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
@@ -51,16 +51,13 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
- /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ts1
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.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 Baskervaldx-Bol.otf
-% Baskervaldx-Bol-tlf-ts1'
+% --force --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
+% --feature=pnum --x-height=440 Baskervaldx-Bol.otf Baskervaldx-Bol-osf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2n2qka.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2n2qka.enc
deleted file mode 100644
index e37a170d58e..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2n2qka.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_2n2qkajweopftoho3pgz2hqvee
-% Encoding created by otftotfm on Wed Nov 26 10:46:59 2014
-% Command line follows encoding
-/AutoEnc_2n2qkajweopftoho3pgz2hqvee [
-%00
- /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
- /f_f_i /f_f_l /.notdef /f_j /f_f_j /c_t /s_p /s_t
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
- /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /tilde /dieresis
-%80
- /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
- /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
- /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
- /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
-%A0
- /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
- /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
-%B0
- /degree /plusminus /two.superior /three.superior /acute /uni00B5 /paragraph /periodcentered
- /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
-% --feature=kern --feature=liga --feature=onum --feature=pnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-BolIta.otf
-% Baskervaldx-BolIta-osf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2bp5ef.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2xv27p.enc
index 0034b1bfb66..3f5cc016718 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2bp5ef.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2xv27p.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_2bp5effzy2xa2j36m3z52imxte
-% Encoding created by otftotfm on Wed Nov 26 10:47:32 2014
+%%AutoEnc_2xv27pysyywohrijxesrvjqzpf
+% Encoding created by otftotfm on Sat Nov 7 12:05:07 2020
% Command line follows encoding
-/AutoEnc_2bp5effzy2xa2j36m3z52imxte [
+/AutoEnc_2xv27pysyywohrijxesrvjqzpf [
%00
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
@@ -51,16 +51,13 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
- /f_f_l /f_f_i /f_f /fl /l /fi /i /f
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ts1
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.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 Baskervaldx-Reg.otf
-% Baskervaldx-Reg-tlf-ts1'
+% --force --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
+% --feature=pnum --x-height=440 Baskervaldx-Reg.otf Baskervaldx-Reg-osf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_krjs6b.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2zeho7.enc
index 075d490a019..51ecbfa90d6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_krjs6b.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2zeho7.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_krjs6bwk3xre3vxqwnapkxks7d
-% Encoding created by otftotfm on Wed Nov 26 10:47:28 2014
+%%AutoEnc_2zeho7tpl4cb2wmvwdwxorkwad
+% Encoding created by otftotfm on Sat Nov 7 12:05:10 2020
% Command line follows encoding
-/AutoEnc_krjs6bwk3xre3vxqwnapkxks7d [
+/AutoEnc_2zeho7tpl4cb2wmvwdwxorkwad [
%00
/asciigrave /asciiacute /circumflex /tilde /asciidieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
%10
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /fi /f_f_i /f_f /fl /f_f_l
+ /f_f_i /dotlessi /dotlessj /f_f /fi /fl /f_f_l /f_j
%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero /one /two /three /four /five /six /seven
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=lnum --feature=tnum Baskervaldx-Reg.otf
-% Baskervaldx-Reg-tlf-t1'
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-Reg.otf Baskervaldx-Reg-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_uhxou6.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_34qyyt.enc
index 35159aab431..7dbc25591b0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_uhxou6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_34qyyt.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_uhxou65ippehbswinwbbkuza5c
-% Encoding created by otftotfm on Wed Nov 26 10:46:50 2014
+%%AutoEnc_34qyytgb6qceg62ob7xrvohske
+% Encoding created by otftotfm on Sat Nov 7 12:04:57 2020
% Command line follows encoding
-/AutoEnc_uhxou65ippehbswinwbbkuza5c [
+/AutoEnc_34qyytgb6qceg62ob7xrvohske [
%00
/f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
/f_f_i /f_f_l /.notdef /f_j /f_f_j /.notdef /.notdef /.notdef
@@ -35,7 +35,7 @@
/lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
%A0
- /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
/degree /plusminus /two.superior /three.superior /acute /uni00B5 /paragraph /periodcentered
@@ -57,9 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=tnum Baskervaldx-BolIta.otf
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-BolIta.otf
% Baskervaldx-BolIta-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_4f5bev.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_4f5bev.enc
deleted file mode 100644
index ee36527fc35..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_4f5bev.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_4f5bev732umzmvxphjwohmqhof
-% Encoding created by otftotfm on Wed Nov 26 10:46:53 2014
-% Command line follows encoding
-/AutoEnc_4f5bev732umzmvxphjwohmqhof [
-%00
- /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
- /f_f_i /f_f_l /.notdef /f_j /f_f_j /c_t /s_p /s_t
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
- /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /tilde /dieresis
-%80
- /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
- /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
- /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
- /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
-%A0
- /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
- /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
-%B0
- /degree /plusminus /two.superior /three.superior /acute /uni00B5 /paragraph /periodcentered
- /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
-% --feature=kern --feature=liga --feature=onum --feature=tnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-BolIta.otf
-% Baskervaldx-BolIta-tosf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_524fcc.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_524fcc.enc
new file mode 100644
index 00000000000..860f89c14da
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_524fcc.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_524fccsk63ruknvfqih7oyfq5b
+% Encoding created by otftotfm on Sat Nov 7 12:04:49 2020
+% Command line follows encoding
+/AutoEnc_524fccsk63ruknvfqih7oyfq5b [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_i /f_f_i /f_f /f_l /f_f_l /f_j /f_f_j /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --x-height=440 Baskervaldx-Bol.otf Baskervaldx-Bol-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_556rta.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_556rta.enc
new file mode 100644
index 00000000000..a7e46093b56
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_556rta.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_556rtaluhcrdhujrkozipjsytd
+% Encoding created by otftotfm on Sat Nov 7 12:04:52 2020
+% Command line follows encoding
+/AutoEnc_556rtaluhcrdhujrkozipjsytd [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_f /f_i /f_l /f_f_i /f_f_l /f_j /f_f_j /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --x-height=440 Baskervaldx-BolIta.otf Baskervaldx-BolIta-lf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_upsxpb.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_5p6atn.enc
index b0187e0b705..665d781bc03 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_upsxpb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_5p6atn.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_upsxpbkttxizbjsq4ijpozrdva
-% Encoding created by otftotfm on Wed Nov 26 10:46:16 2014
+%%AutoEnc_5p6atnwvj2mdytoxgijggxmjwg
+% Encoding created by otftotfm on Sat Nov 7 12:04:49 2020
% Command line follows encoding
-/AutoEnc_upsxpbkttxizbjsq4ijpozrdva [
+/AutoEnc_5p6atnwvj2mdytoxgijggxmjwg [
%00
/.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -35,7 +35,7 @@
/lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
%A0
- /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
/degree /plusminus /two.superior /three.superior /acute /uni00B5 /paragraph /periodcentered
@@ -57,9 +57,8 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=sups --ligkern=* {KL} * Baskervaldx-Bol.otf
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sups
+% --ligkern=* {KL} * --x-height=440 Baskervaldx-Bol.otf
% Baskervaldx-Bol-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_5zt4ml.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_5zt4ml.enc
deleted file mode 100644
index ef2399432eb..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_5zt4ml.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_5zt4mlas6lf56cvtjcmhj2g36e
-% Encoding created by otftotfm on Wed Nov 26 10:46:34 2014
-% Command line follows encoding
-/AutoEnc_5zt4mlas6lf56cvtjcmhj2g36e [
-%00
- /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
- /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
-%10
- /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /f_i /f_f_i /f_f /f_l /f_f_l
-%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
- /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
- /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
- /Lacute /Lcaron /Lslash /Nacute /Ncaron /f_f_j /Ohungarumlaut /Racute
-%90
- /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
- /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /dcroat /section
-%A0
- /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
- /lacute /lcaron /lslash /nacute /ncaron /c_t /ohungarumlaut /racute
-%B0
- /rcaron /sacute /scaron /scedilla /tcaron /tcedilla /uhungarumlaut /uring
- /ydieresis /zacute /zcaron /zdotaccent /.notdef /exclamdown /questiondown /sterling
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
-% --feature=kern --feature=liga --feature=onum --feature=pnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-Bol.otf
-% Baskervaldx-Bol-osf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6dnovg.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6dnovg.enc
new file mode 100644
index 00000000000..faa52aaf3f7
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6dnovg.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_6dnovg3dvjob6kjhfwfmlskxzb
+% Encoding created by otftotfm on Sat Nov 7 12:04:51 2020
+% Command line follows encoding
+/AutoEnc_6dnovg3dvjob6kjhfwfmlskxzb [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_f /f_i /f_l /f_f_i /f_f_l /f_j /f_f_j /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --x-height=440 Baskervaldx-BolIta.otf Baskervaldx-BolIta-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_537kn6.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6lr3v3.enc
index ed993d3b5a0..d97c3b70dc9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_537kn6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6lr3v3.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_537kn6ba73uberfipyse56uvxe
-% Encoding created by otftotfm on Wed Nov 26 10:46:44 2014
+%%AutoEnc_6lr3v3cnyme2fq6ng3y3ro37ra
+% Encoding created by otftotfm on Sat Nov 7 12:04:53 2020
% Command line follows encoding
-/AutoEnc_537kn6ba73uberfipyse56uvxe [
+/AutoEnc_6lr3v3cnyme2fq6ng3y3ro37ra [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
%10
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
+ /f_f /dotlessi /dotlessj /f_i /f_l /f_f_i /f_f_l /f_j
%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=lnum --feature=pnum Baskervaldx-BolIta.otf
-% Baskervaldx-BolIta-lf-t1'
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-BolIta.otf Baskervaldx-BolIta-lf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6rdtju.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6rdtju.enc
deleted file mode 100644
index cfa5f9e3a56..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6rdtju.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_6rdtjuwbf2t5gb6swrvdwpvl7e
-% Encoding created by otftotfm on Wed Nov 26 10:46:48 2014
-% Command line follows encoding
-/AutoEnc_6rdtjuwbf2t5gb6swrvdwpvl7e [
-%00
- /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
- /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
-%10
- /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
-%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
- /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
- /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
- /Lacute /Lcaron /Lslash /Nacute /Ncaron /f_f_j /Ohungarumlaut /Racute
-%90
- /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
- /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /dcroat /section
-%A0
- /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
- /lacute /lcaron /lslash /nacute /ncaron /c_t /ohungarumlaut /racute
-%B0
- /rcaron /sacute /scaron /scedilla /tcaron /tcedilla /uhungarumlaut /uring
- /ydieresis /zacute /zcaron /zdotaccent /.notdef /exclamdown /questiondown /sterling
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
-% --feature=kern --feature=liga --feature=lnum --feature=pnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-BolIta.otf
-% Baskervaldx-BolIta-lf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6xreh4.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6xreh4.enc
new file mode 100644
index 00000000000..39663e87c55
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6xreh4.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_6xreh4pnrjysuqn5f53dm4wo3g
+% Encoding created by otftotfm on Sat Nov 7 12:04:42 2020
+% Command line follows encoding
+/AutoEnc_6xreh4pnrjysuqn5f53dm4wo3g [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_i /f_f_i /f_f /f_l /f_f_l /f_j /f_f_j /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --x-height=440 Baskervaldx-Bol.otf Baskervaldx-Bol-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_nak3zo.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_7d54ky.enc
index 651e4091611..63b6aaa50b5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_nak3zo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_7d54ky.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_nak3zoy6h2sr64uctnwo4ojq3g
-% Encoding created by otftotfm on Wed Nov 26 10:46:12 2014
+%%AutoEnc_7d54kyoaxvmol2t35c7iq3y6xe
+% Encoding created by otftotfm on Sat Nov 7 12:04:48 2020
% Command line follows encoding
-/AutoEnc_nak3zoy6h2sr64uctnwo4ojq3g [
+/AutoEnc_7d54kyoaxvmol2t35c7iq3y6xe [
%00
/grave.sc /acute.sc /circumflex.sc /tilde.sc /dieresis.sc /hungarumlaut /ring.sc /caron
/breve.sc /macron.sc /dotaccent.sc /cedilla.sc /ogonek.sc /quotesinglbase /guilsinglleft /guilsinglright
@@ -11,7 +11,7 @@
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
/.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
%20
- /.notdef /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero /one /two /three /four /five /six /seven
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Baskervaldx-Bol.otf
-% Baskervaldx-Bol-tlf-sc-t1'
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Bol.otf Baskervaldx-Bol-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_7i75ol.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_7i75ol.enc
new file mode 100644
index 00000000000..47101f22ce4
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_7i75ol.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_7i75olkkciwec6d43j3mtt2bdb
+% Encoding created by otftotfm on Sat Nov 7 12:04:46 2020
+% Command line follows encoding
+/AutoEnc_7i75olkkciwec6d43j3mtt2bdb [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave.sc /acute.sc /caron /breve.sc /macron.sc /ring.sc
+ /cedilla.sc /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /colon /semicolon /exclamdown /equal /questiondown /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex.sc /dotaccent.sc
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde.sc /dieresis.sc
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --feature=smcp --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Bol.otf Baskervaldx-Bol-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_7nnme4.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_7nnme4.enc
deleted file mode 100644
index 9e2fe42ded1..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_7nnme4.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_7nnme4u5np63ko4nj4ngyw5k3f
-% Encoding created by otftotfm on Wed Nov 26 10:46:33 2014
-% Command line follows encoding
-/AutoEnc_7nnme4u5np63ko4nj4ngyw5k3f [
-%00
- /f_i /Euro /f_f_i /f_f /fraction /dotaccent /hungarumlaut /ogonek
- /f_l /f_f_l /.notdef /f_j /f_f_j /c_t /s_p /s_t
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
- /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /tilde /dieresis
-%80
- /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
- /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
- /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
- /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
-%A0
- /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
- /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
-%B0
- /degree /plusminus /two.superior /three.superior /acute /uni00B5 /paragraph /periodcentered
- /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
-% --feature=kern --feature=liga --feature=onum --feature=pnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-Bol.otf
-% Baskervaldx-Bol-osf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_67xtiz.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ahc6ab.enc
index c775c382a4d..2481ae026d4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_67xtiz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ahc6ab.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_67xtiz4c2nzuafmebsl4qbw6of
-% Encoding created by otftotfm on Wed Nov 26 10:46:10 2014
+%%AutoEnc_ahc6abgeimtyzud7lckd5gb3he
+% Encoding created by otftotfm on Sat Nov 7 12:04:47 2020
% Command line follows encoding
-/AutoEnc_67xtiz4c2nzuafmebsl4qbw6of [
+/AutoEnc_ahc6abgeimtyzud7lckd5gb3he [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
%10
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /f_i /f_f_i /f_f /f_l /f_f_l
+ /f_i /dotlessi /dotlessj /f_f_i /f_f /f_l /f_f_l /f_j
%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero /one /two /three /four /five /six /seven
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=lnum --feature=tnum Baskervaldx-Bol.otf
-% Baskervaldx-Bol-tlf-t1'
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-Bol.otf Baskervaldx-Bol-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_jd6ty7.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ak7beg.enc
index 140bd78e84c..2b8d31e5f44 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_jd6ty7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ak7beg.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_jd6ty7lt7fjglglq4zp75m5lsc
-% Encoding created by otftotfm on Wed Nov 26 10:46:31 2014
+%%AutoEnc_ak7beglb5xupddvuzzmqvyvlub
+% Encoding created by otftotfm on Sat Nov 7 12:04:44 2020
% Command line follows encoding
-/AutoEnc_jd6ty7lt7fjglglq4zp75m5lsc [
+/AutoEnc_ak7beglb5xupddvuzzmqvyvlub [
%00
/.notdef /Euro /.notdef /.notdef /fraction /dotaccent.sc /hungarumlaut /ogonek.sc
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -35,7 +35,7 @@
/lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde.sc /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
%A0
- /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis.sc /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron.sc
%B0
/degree /plusminus /two.superior /three.superior /acute.sc /uni00B5 /paragraph /periodcentered
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Baskervaldx-Bol.otf
-% Baskervaldx-Bol-osf-sc-ly1'
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Bol.otf Baskervaldx-Bol-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_3omoui.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_aorlch.enc
index 02916e308a3..69189d986ce 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_3omoui.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_aorlch.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_3omouiwhvzbb3rhd2rwq4gvpee
-% Encoding created by otftotfm on Wed Nov 26 10:47:42 2014
+%%AutoEnc_aorlch2moob47bw2wj2kgq2chg
+% Encoding created by otftotfm on Sat Nov 7 12:05:13 2020
% Command line follows encoding
-/AutoEnc_3omouiwhvzbb3rhd2rwq4gvpee [
+/AutoEnc_aorlch2moob47bw2wj2kgq2chg [
%00
/.notdef /Euro /.notdef /.notdef /fraction /dotaccent.sc /hungarumlaut /ogonek.sc
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /f_i.sc /f_l.sc /.notdef /.notdef
%10
/dotlessi /dotlessj /grave.sc /acute.sc /caron /breve.sc /macron.sc /ring.sc
/cedilla.sc /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -35,7 +35,7 @@
/lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde.sc /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
%A0
- /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis.sc /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron.sc
%B0
/degree /plusminus /two.superior /three.superior /acute.sc /uni00B5 /pilcrow /periodcentered
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Baskervaldx-Reg.otf
-% Baskervaldx-Reg-tosf-sc-ly1'
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Reg.otf Baskervaldx-Reg-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_auq4k5.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_auq4k5.enc
new file mode 100644
index 00000000000..83873776b50
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_auq4k5.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_auq4k5bmamac2evbci4vhavgoa
+% Encoding created by otftotfm on Sat Nov 7 12:05:08 2020
+% Command line follows encoding
+/AutoEnc_auq4k5bmamac2evbci4vhavgoa [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /asciigrave /asciiacute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /asciidieresis
+%80
+ /f_f_i /f_f /f_f_l /f_j /f_f_j /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --x-height=440 Baskervaldx-Reg.otf Baskervaldx-Reg-lf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_awcfcx.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_awcfcx.enc
deleted file mode 100644
index 19c4110c4c7..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_awcfcx.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_awcfcxpoch2u5qntbnuuo646wc
-% Encoding created by otftotfm on Wed Nov 26 10:46:40 2014
-% Command line follows encoding
-/AutoEnc_awcfcxpoch2u5qntbnuuo646wc [
-%00
- /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
- /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
-%10
- /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
-%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
- /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
- /Lacute /Lcaron /Lslash /Nacute /Ncaron /f_f_j /Ohungarumlaut /Racute
-%90
- /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
- /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /dcroat /section
-%A0
- /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
- /lacute /lcaron /lslash /nacute /ncaron /c_t /ohungarumlaut /racute
-%B0
- /rcaron /sacute /scaron /scedilla /tcaron /tcedilla /uhungarumlaut /uring
- /ydieresis /zacute /zcaron /zdotaccent /.notdef /exclamdown /questiondown /sterling
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
-% --feature=kern --feature=liga --feature=lnum --feature=tnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-BolIta.otf
-% Baskervaldx-BolIta-tlf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_xyk42r.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ax2yo2.enc
index d3f1cb97491..8e576d9a2d1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_xyk42r.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ax2yo2.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_xyk42r2kagozkqeyeosyfbqxac
-% Encoding created by otftotfm on Wed Nov 26 10:47:28 2014
+%%AutoEnc_ax2yo2md7mqvdlsmzz5ptqbusa
+% Encoding created by otftotfm on Sat Nov 7 12:05:10 2020
% Command line follows encoding
-/AutoEnc_xyk42r2kagozkqeyeosyfbqxac [
+/AutoEnc_ax2yo2md7mqvdlsmzz5ptqbusa [
%00
/.notdef /Euro /.notdef /.notdef /fraction /dotaccent.sc /hungarumlaut /ogonek.sc
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /f_i.sc /f_l.sc /.notdef /.notdef
%10
/dotlessi /dotlessj /grave.sc /acute.sc /caron /breve.sc /macron.sc /ring.sc
/cedilla.sc /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -35,7 +35,7 @@
/lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde.sc /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
%A0
- /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis.sc /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron.sc
%B0
/degree /plusminus /two.superior /three.superior /acute.sc /uni00B5 /pilcrow /periodcentered
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Baskervaldx-Reg.otf
-% Baskervaldx-Reg-tlf-sc-ly1'
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Reg.otf Baskervaldx-Reg-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_4kmser.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ax7osu.enc
index 5bc98c6f921..d91367539ab 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_4kmser.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ax7osu.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_4kmsercbz4m5meb2nx4u7vdcjb
-% Encoding created by otftotfm on Wed Nov 26 10:46:17 2014
+%%AutoEnc_ax7osueln5h74x4wjzienucs4c
+% Encoding created by otftotfm on Sat Nov 7 12:04:45 2020
% Command line follows encoding
-/AutoEnc_4kmsercbz4m5meb2nx4u7vdcjb [
+/AutoEnc_ax7osueln5h74x4wjzienucs4c [
%00
/f_i /Euro /f_f_i /f_f /fraction /dotaccent /hungarumlaut /ogonek
/f_l /f_f_l /.notdef /f_j /f_f_j /.notdef /.notdef /.notdef
@@ -35,7 +35,7 @@
/lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
%A0
- /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
/degree /plusminus /two.superior /three.superior /acute /uni00B5 /paragraph /periodcentered
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=pnum Baskervaldx-Bol.otf
-% Baskervaldx-Bol-lf-ly1'
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-Bol.otf Baskervaldx-Bol-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_4ksy5y.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_c3asvt.enc
index 978a8d6ee55..28331449e6e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_4ksy5y.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_c3asvt.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_4ksy5ybdn4t7s5y23p4y2jhuzd
-% Encoding created by otftotfm on Wed Nov 26 10:46:56 2014
+%%AutoEnc_c3asvtrmceaurcmitku3ovyigd
+% Encoding created by otftotfm on Sat Nov 7 12:04:43 2020
% Command line follows encoding
-/AutoEnc_4ksy5ybdn4t7s5y23p4y2jhuzd [
+/AutoEnc_c3asvtrmceaurcmitku3ovyigd [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
%10
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
+ /f_i /dotlessi /dotlessj /f_f_i /f_f /f_l /f_f_l /f_j
%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=onum --feature=pnum Baskervaldx-BolIta.otf
-% Baskervaldx-BolIta-osf-t1'
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-Bol.otf Baskervaldx-Bol-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ck4t6h.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ck4t6h.enc
deleted file mode 100644
index 79936dc8075..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ck4t6h.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_ck4t6hhrgdojv6n4fek5gsl7rc
-% Encoding created by otftotfm on Wed Nov 26 10:47:31 2014
-% Command line follows encoding
-/AutoEnc_ck4t6hhrgdojv6n4fek5gsl7rc [
-%00
- /asciigrave /asciiacute /circumflex /tilde /asciidieresis /hungarumlaut /ring /caron
- /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
-%10
- /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /fi /f_f_i /f_f /fl /f_f_l
-%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
- /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
- /Lacute /Lcaron /Lslash /Nacute /Ncaron /f_f_j /Ohungarumlaut /Racute
-%90
- /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
- /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /dcroat /section
-%A0
- /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
- /lacute /lcaron /lslash /nacute /ncaron /c_t /ohungarumlaut /racute
-%B0
- /rcaron /sacute /scaron /scedilla /tcaron /tcedilla /uhungarumlaut /uring
- /ydieresis /zacute /zcaron /zdotaccent /.notdef /exclamdown /questiondown /sterling
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
-% --feature=kern --feature=liga --feature=lnum --feature=tnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-Reg.otf
-% Baskervaldx-Reg-tlf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2sm4i7.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_cl2iyt.enc
index 4154f8a6af2..8acc3d573a5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_2sm4i7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_cl2iyt.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_2sm4i7ybzqn3edyqvuwibywavc
-% Encoding created by otftotfm on Wed Nov 26 10:46:55 2014
+%%AutoEnc_cl2iyt4q4gotnepwo7qht5pffe
+% Encoding created by otftotfm on Sat Nov 7 12:04:51 2020
% Command line follows encoding
-/AutoEnc_2sm4i7ybzqn3edyqvuwibywavc [
+/AutoEnc_cl2iyt4q4gotnepwo7qht5pffe [
%00
/f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
/f_f_i /f_f_l /.notdef /f_j /f_f_j /.notdef /.notdef /.notdef
@@ -35,7 +35,7 @@
/lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
%A0
- /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
/degree /plusminus /two.superior /three.superior /acute /uni00B5 /paragraph /periodcentered
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=pnum Baskervaldx-BolIta.otf
-% Baskervaldx-BolIta-osf-ly1'
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-BolIta.otf Baskervaldx-BolIta-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_3lvabu.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_clcsgf.enc
index 1791cfae6ae..ff44a7681c3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_3lvabu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_clcsgf.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_3lvabun3v7feuo22rapd6ty55h
-% Encoding created by otftotfm on Wed Nov 26 10:46:50 2014
+%%AutoEnc_clcsgfmsxiejpujbrvzfl7l73a
+% Encoding created by otftotfm on Sat Nov 7 12:04:57 2020
% Command line follows encoding
-/AutoEnc_3lvabun3v7feuo22rapd6ty55h [
+/AutoEnc_clcsgfmsxiejpujbrvzfl7l73a [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
%10
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
+ /f_f /dotlessi /dotlessj /f_i /f_l /f_f_i /f_f_l /f_j
%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=onum --feature=tnum Baskervaldx-BolIta.otf
-% Baskervaldx-BolIta-tosf-t1'
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-BolIta.otf Baskervaldx-BolIta-tosf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_coqtyh.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_coqtyh.enc
deleted file mode 100644
index e532b1e3c85..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_coqtyh.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_coqtyhutav3shublov3v7mj7lc
-% Encoding created by otftotfm on Wed Nov 26 10:46:21 2014
-% Command line follows encoding
-/AutoEnc_coqtyhutav3shublov3v7mj7lc [
-%00
- /f_i /Euro /f_f_i /f_f /fraction /dotaccent /hungarumlaut /ogonek
- /f_l /f_f_l /.notdef /f_j /f_f_j /c_t /s_p /s_t
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
- /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /tilde /dieresis
-%80
- /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
- /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
- /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
- /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
-%A0
- /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
- /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
-%B0
- /degree /plusminus /two.superior /three.superior /acute /uni00B5 /paragraph /periodcentered
- /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
-% --feature=kern --feature=liga --feature=lnum --feature=pnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-Bol.otf
-% Baskervaldx-Bol-lf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_cgzxx6.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_cv7nez.enc
index dc14c902d61..576c163554b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_cgzxx6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_cv7nez.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_cgzxx6ewplrmdwqquic426ss3e
-% Encoding created by otftotfm on Wed Nov 26 10:46:19 2014
+%%AutoEnc_cv7nezwnux743su522xyzonyzd
+% Encoding created by otftotfm on Sat Nov 7 12:04:46 2020
% Command line follows encoding
-/AutoEnc_cgzxx6ewplrmdwqquic426ss3e [
+/AutoEnc_cv7nezwnux743su522xyzonyzd [
%00
/.notdef /Euro /.notdef /.notdef /fraction /dotaccent.sc /hungarumlaut /ogonek.sc
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -35,7 +35,7 @@
/lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde.sc /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
%A0
- /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis.sc /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron.sc
%B0
/degree /plusminus /two.superior /three.superior /acute.sc /uni00B5 /paragraph /periodcentered
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Baskervaldx-Bol.otf
-% Baskervaldx-Bol-lf-sc-ly1'
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Bol.otf Baskervaldx-Bol-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_d7elqy.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_d7elqy.enc
new file mode 100644
index 00000000000..cdb284fa764
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_d7elqy.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_d7elqy62lxefkr7upajub5jsuh
+% Encoding created by otftotfm on Sat Nov 7 12:04:54 2020
+% Command line follows encoding
+/AutoEnc_d7elqy62lxefkr7upajub5jsuh [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_f /f_i /f_l /f_f_i /f_f_l /f_j /f_f_j /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --x-height=440 Baskervaldx-BolIta.otf Baskervaldx-BolIta-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_e3qxqg.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_d7lahw.enc
index f92a5ea10b4..ea4d893ffe8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_e3qxqg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_d7lahw.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_e3qxqgeazymdg47uwypn2e2qnb
-% Encoding created by otftotfm on Wed Nov 26 10:46:20 2014
+%%AutoEnc_d7lahwfwba4chqxsug6zj4gxle
+% Encoding created by otftotfm on Sat Nov 7 12:04:46 2020
% Command line follows encoding
-/AutoEnc_e3qxqgeazymdg47uwypn2e2qnb [
+/AutoEnc_d7lahwfwba4chqxsug6zj4gxle [
%00
/grave.sc /acute.sc /circumflex.sc /tilde.sc /dieresis.sc /hungarumlaut /ring.sc /caron
/breve.sc /macron.sc /dotaccent.sc /cedilla.sc /ogonek.sc /quotesinglbase /guilsinglleft /guilsinglright
@@ -11,7 +11,7 @@
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
/.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
%20
- /.notdef /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Baskervaldx-Bol.otf
-% Baskervaldx-Bol-lf-sc-t1'
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Bol.otf Baskervaldx-Bol-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_rtdlfq.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_dbb2hd.enc
index dfd50ef1399..cb956b7167e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_rtdlfq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_dbb2hd.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_rtdlfqr5ewqbprjow2dsfhg4fd
-% Encoding created by otftotfm on Wed Nov 26 10:47:47 2014
+%%AutoEnc_dbb2hdz4mxoqmb2atvvicvsmlc
+% Encoding created by otftotfm on Sat Nov 7 12:05:06 2020
% Command line follows encoding
-/AutoEnc_rtdlfqr5ewqbprjow2dsfhg4fd [
+/AutoEnc_dbb2hdz4mxoqmb2atvvicvsmlc [
%00
- /fi /Euro /f_f_i /f_f /fraction /dotaccent /hungarumlaut /ogonek
- /fl /f_f_l /.notdef /f_j /f_f_j /.notdef /.notdef /.notdef
+ /f_f_i /Euro /f_f /f_f_l /fraction /dotaccent /hungarumlaut /ogonek
+ /f_j /f_f_j /.notdef /.notdef /fi /fl /.notdef /.notdef
%10
/dotlessi /dotlessj /asciigrave /asciiacute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -35,7 +35,7 @@
/lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
%A0
- /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/asciidieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
/degree /plusminus /two.superior /three.superior /asciiacute /uni00B5 /pilcrow /periodcentered
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=pnum Baskervaldx-Reg.otf
-% Baskervaldx-Reg-osf-ly1'
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-Reg.otf Baskervaldx-Reg-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_dw7i6y.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_dw7i6y.enc
new file mode 100644
index 00000000000..d75497fe28e
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_dw7i6y.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_dw7i6yqyoyj4nzcygmonfyng2g
+% Encoding created by otftotfm on Sat Nov 7 12:04:43 2020
+% Command line follows encoding
+/AutoEnc_dw7i6yqyoyj4nzcygmonfyng2g [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave.sc /acute.sc /caron /breve.sc /macron.sc /ring.sc
+ /cedilla.sc /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /exclamdown /equal /questiondown /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex.sc /dotaccent.sc
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde.sc /dieresis.sc
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=pnum --feature=smcp --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Bol.otf Baskervaldx-Bol-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_xsxsev.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_edkp5z.enc
index 5e0abd17daa..da17c0a67ff 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_xsxsev.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_edkp5z.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_xsxsevpg2qipsxcksahzn25fwc
-% Encoding created by otftotfm on Wed Nov 26 10:46:11 2014
+%%AutoEnc_edkp5znu7fq4fhbngk4zsedhsb
+% Encoding created by otftotfm on Sat Nov 7 12:04:48 2020
% Command line follows encoding
-/AutoEnc_xsxsevpg2qipsxcksahzn25fwc [
+/AutoEnc_edkp5znu7fq4fhbngk4zsedhsb [
%00
/.notdef /Euro /.notdef /.notdef /fraction /dotaccent.sc /hungarumlaut /ogonek.sc
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -35,7 +35,7 @@
/lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde.sc /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
%A0
- /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis.sc /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron.sc
%B0
/degree /plusminus /two.superior /three.superior /acute.sc /uni00B5 /paragraph /periodcentered
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Baskervaldx-Bol.otf
-% Baskervaldx-Bol-tlf-sc-ly1'
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Bol.otf Baskervaldx-Bol-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_go57dj.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ezfzzx.enc
index 703ca45dde8..93bdc574df6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_go57dj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ezfzzx.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_go57djce3ddm7cn5a4ebqy2rbg
-% Encoding created by otftotfm on Wed Nov 26 10:46:25 2014
+%%AutoEnc_ezfzzx4ozwtgay3k3tu37bfaga
+% Encoding created by otftotfm on Sat Nov 7 12:04:50 2020
% Command line follows encoding
-/AutoEnc_go57djce3ddm7cn5a4ebqy2rbg [
+/AutoEnc_ezfzzx4ozwtgay3k3tu37bfaga [
%00
/.notdef /Euro /.notdef /.notdef /fraction /dotaccent.sc /hungarumlaut /ogonek.sc
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -35,7 +35,7 @@
/lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde.sc /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
%A0
- /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis.sc /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron.sc
%B0
/degree /plusminus /two.superior /three.superior /acute.sc /uni00B5 /paragraph /periodcentered
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Baskervaldx-Bol.otf
-% Baskervaldx-Bol-tosf-sc-ly1'
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Bol.otf Baskervaldx-Bol-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_hkyy53.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_feassy.enc
index 83b482c5246..e5347c4922c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_hkyy53.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_feassy.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_hkyy53opu3r35juonqhadrjise
-% Encoding created by otftotfm on Wed Nov 26 10:47:35 2014
+%%AutoEnc_feassyeh55xyfqcdeyj6hguvxe
+% Encoding created by otftotfm on Sat Nov 7 12:05:08 2020
% Command line follows encoding
-/AutoEnc_hkyy53opu3r35juonqhadrjise [
+/AutoEnc_feassyeh55xyfqcdeyj6hguvxe [
%00
/asciigrave /asciiacute /circumflex /tilde /asciidieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
%10
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /fi /f_f_i /f_f /fl /f_f_l
+ /f_f_i /dotlessi /dotlessj /f_f /fi /fl /f_f_l /f_j
%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=lnum --feature=pnum Baskervaldx-Reg.otf
-% Baskervaldx-Reg-lf-t1'
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-Reg.otf Baskervaldx-Reg-lf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_wy43ep.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_g4f2qe.enc
index f3a9d489036..d294994f49e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_wy43ep.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_g4f2qe.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_wy43ep7xflao4h3a6ji7dklueb
-% Encoding created by otftotfm on Wed Nov 26 10:46:23 2014
+%%AutoEnc_g4f2qe63swp76txfyq737xky3g
+% Encoding created by otftotfm on Sat Nov 7 12:04:49 2020
% Command line follows encoding
-/AutoEnc_wy43ep7xflao4h3a6ji7dklueb [
+/AutoEnc_g4f2qe63swp76txfyq737xky3g [
%00
/f_i /Euro /f_f_i /f_f /fraction /dotaccent /hungarumlaut /ogonek
/f_l /f_f_l /.notdef /f_j /f_f_j /.notdef /.notdef /.notdef
@@ -35,7 +35,7 @@
/lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
%A0
- /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
/degree /plusminus /two.superior /three.superior /acute /uni00B5 /paragraph /periodcentered
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=tnum Baskervaldx-Bol.otf
-% Baskervaldx-Bol-tosf-ly1'
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-Bol.otf Baskervaldx-Bol-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_g5xsbp.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_g5xsbp.enc
new file mode 100644
index 00000000000..b85f784a5fc
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_g5xsbp.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_g5xsbpya7iluds6igafdbo7gce
+% Encoding created by otftotfm on Sat Nov 7 12:05:08 2020
+% Command line follows encoding
+/AutoEnc_g5xsbpya7iluds6igafdbo7gce [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /f_i.sc /f_l.sc /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave.sc /acute.sc /caron /breve.sc /macron.sc /ring.sc
+ /cedilla.sc /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /colon /semicolon /exclamdown /equal /questiondown /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex.sc /dotaccent.sc
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde.sc /dieresis.sc
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --feature=smcp --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Reg.otf Baskervaldx-Reg-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_gar3zb.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_gar3zb.enc
deleted file mode 100644
index 5c2adcfa276..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_gar3zb.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_gar3zbd2qzw6w3t4yxsu246aof
-% Encoding created by otftotfm on Wed Nov 26 10:47:51 2014
-% Command line follows encoding
-/AutoEnc_gar3zbd2qzw6w3t4yxsu246aof [
-%00
- /asciigrave /asciiacute /circumflex /tilde /asciidieresis /hungarumlaut /ring /caron
- /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
-%10
- /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /fi /f_f_i /f_f /fl /f_f_l
-%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
- /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
- /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
- /Lacute /Lcaron /Lslash /Nacute /Ncaron /f_f_j /Ohungarumlaut /Racute
-%90
- /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
- /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /dcroat /section
-%A0
- /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
- /lacute /lcaron /lslash /nacute /ncaron /c_t /ohungarumlaut /racute
-%B0
- /rcaron /sacute /scaron /scedilla /tcaron /tcedilla /uhungarumlaut /uring
- /ydieresis /zacute /zcaron /zdotaccent /.notdef /exclamdown /questiondown /sterling
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
-% --feature=kern --feature=liga --feature=onum --feature=pnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-Reg.otf
-% Baskervaldx-Reg-osf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_gjwmpg.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_gjwmpg.enc
deleted file mode 100644
index b70be536c11..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_gjwmpg.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_gjwmpgwr4l3wuzivfotxvjpitc
-% Encoding created by otftotfm on Wed Nov 26 10:46:47 2014
-% Command line follows encoding
-/AutoEnc_gjwmpgwr4l3wuzivfotxvjpitc [
-%00
- /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
- /f_f_i /f_f_l /.notdef /f_j /f_f_j /c_t /s_p /s_t
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
- /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /tilde /dieresis
-%80
- /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
- /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
- /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
- /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
-%A0
- /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
- /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
-%B0
- /degree /plusminus /two.superior /three.superior /acute /uni00B5 /paragraph /periodcentered
- /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
-% --feature=kern --feature=liga --feature=lnum --feature=pnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-BolIta.otf
-% Baskervaldx-BolIta-lf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_h4nqsn.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_h4nqsn.enc
deleted file mode 100644
index 11c80e0e176..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_h4nqsn.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_h4nqsnqdpq6lzmvngmod3mx4ac
-% Encoding created by otftotfm on Wed Nov 26 10:47:44 2014
-% Command line follows encoding
-/AutoEnc_h4nqsnqdpq6lzmvngmod3mx4ac [
-%00
- /fi /Euro /f_f_i /f_f /fraction /dotaccent /hungarumlaut /ogonek
- /fl /f_f_l /.notdef /f_j /f_f_j /c_t /s_p /s_t
-%10
- /dotlessi /dotlessj /asciigrave /asciiacute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
- /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /tilde /asciidieresis
-%80
- /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
- /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
- /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
- /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
-%A0
- /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
- /asciidieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
-%B0
- /degree /plusminus /two.superior /three.superior /asciiacute /uni00B5 /pilcrow /periodcentered
- /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
-% --feature=kern --feature=liga --feature=onum --feature=tnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-Reg.otf
-% Baskervaldx-Reg-tosf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ik76ei.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ik76ei.enc
deleted file mode 100644
index 036bf992eb3..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ik76ei.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_ik76ei3opythdxyr5g7iixmu7b
-% Encoding created by otftotfm on Wed Nov 26 10:47:38 2014
-% Command line follows encoding
-/AutoEnc_ik76ei3opythdxyr5g7iixmu7b [
-%00
- /fi /Euro /f_f_i /f_f /fraction /dotaccent /hungarumlaut /ogonek
- /fl /f_f_l /.notdef /f_j /f_f_j /c_t /s_p /s_t
-%10
- /dotlessi /dotlessj /asciigrave /asciiacute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
- /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /tilde /asciidieresis
-%80
- /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
- /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
- /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
- /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
-%A0
- /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
- /asciidieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
-%B0
- /degree /plusminus /two.superior /three.superior /asciiacute /uni00B5 /pilcrow /periodcentered
- /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
-% --feature=kern --feature=liga --feature=lnum --feature=pnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-Reg.otf
-% Baskervaldx-Reg-lf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ilkd46.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ilkd46.enc
deleted file mode 100644
index a4f5753bce4..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ilkd46.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_ilkd46aigfzqhg3le4fcpfocqf
-% Encoding created by otftotfm on Wed Nov 26 10:46:13 2014
-% Command line follows encoding
-/AutoEnc_ilkd46aigfzqhg3le4fcpfocqf [
-%00
- /f_i /Euro /f_f_i /f_f /fraction /dotaccent /hungarumlaut /ogonek
- /f_l /f_f_l /.notdef /f_j /f_f_j /c_t /s_p /s_t
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /tilde /dieresis
-%80
- /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
- /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
- /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
- /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
-%A0
- /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
- /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
-%B0
- /degree /plusminus /two.superior /three.superior /acute /uni00B5 /paragraph /periodcentered
- /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
-% --feature=kern --feature=liga --feature=lnum --feature=tnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-Bol.otf
-% Baskervaldx-Bol-tlf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_n57xi2.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_itooof.enc
index 2fc14c67dbf..517463a9d55 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_n57xi2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_itooof.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_n57xi2j73egfgmbfeoa4j2jgxf
-% Encoding created by otftotfm on Wed Nov 26 10:47:33 2014
+%%AutoEnc_itooofapbjcbqioljlelckteib
+% Encoding created by otftotfm on Sat Nov 7 12:05:11 2020
% Command line follows encoding
-/AutoEnc_n57xi2j73egfgmbfeoa4j2jgxf [
+/AutoEnc_itooofapbjcbqioljlelckteib [
%00
/.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -35,7 +35,7 @@
/lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
%A0
- /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/asciidieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
/degree /plusminus /two.superior /three.superior /asciiacute /uni00B5 /pilcrow /periodcentered
@@ -57,9 +57,8 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=sups --ligkern=* {KL} * Baskervaldx-Reg.otf
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sups
+% --ligkern=* {KL} * --x-height=440 Baskervaldx-Reg.otf
% Baskervaldx-Reg-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_jwmruw.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_jwmruw.enc
deleted file mode 100644
index e5b69b3da9b..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_jwmruw.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_jwmruw33a36orlze755tmbq3la
-% Encoding created by otftotfm on Wed Nov 26 10:46:22 2014
-% Command line follows encoding
-/AutoEnc_jwmruw33a36orlze755tmbq3la [
-%00
- /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
- /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
-%10
- /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /f_i /f_f_i /f_f /f_l /f_f_l
-%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
- /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
- /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
- /Lacute /Lcaron /Lslash /Nacute /Ncaron /f_f_j /Ohungarumlaut /Racute
-%90
- /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
- /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /dcroat /section
-%A0
- /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
- /lacute /lcaron /lslash /nacute /ncaron /c_t /ohungarumlaut /racute
-%B0
- /rcaron /sacute /scaron /scedilla /tcaron /tcedilla /uhungarumlaut /uring
- /ydieresis /zacute /zcaron /zdotaccent /.notdef /exclamdown /questiondown /sterling
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
-% --feature=kern --feature=liga --feature=lnum --feature=pnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-Bol.otf
-% Baskervaldx-Bol-lf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_k3ascw.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_k3ascw.enc
deleted file mode 100644
index 8757553f038..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_k3ascw.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_k3ascwzjjkfh6otcjzhd5s3gbd
-% Encoding created by otftotfm on Wed Nov 26 10:46:54 2014
-% Command line follows encoding
-/AutoEnc_k3ascwzjjkfh6otcjzhd5s3gbd [
-%00
- /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
- /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
-%10
- /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
-%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
- /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
- /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
- /Lacute /Lcaron /Lslash /Nacute /Ncaron /f_f_j /Ohungarumlaut /Racute
-%90
- /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
- /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /dcroat /section
-%A0
- /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
- /lacute /lcaron /lslash /nacute /ncaron /c_t /ohungarumlaut /racute
-%B0
- /rcaron /sacute /scaron /scedilla /tcaron /tcedilla /uhungarumlaut /uring
- /ydieresis /zacute /zcaron /zdotaccent /.notdef /exclamdown /questiondown /sterling
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
-% --feature=kern --feature=liga --feature=onum --feature=tnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-BolIta.otf
-% Baskervaldx-BolIta-tosf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_k6hbcl.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_k6hbcl.enc
deleted file mode 100644
index f7ec17ff4e9..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_k6hbcl.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_k6hbclrljuzqnly4lfzqassguh
-% Encoding created by otftotfm on Wed Nov 26 10:47:39 2014
-% Command line follows encoding
-/AutoEnc_k6hbclrljuzqnly4lfzqassguh [
-%00
- /asciigrave /asciiacute /circumflex /tilde /asciidieresis /hungarumlaut /ring /caron
- /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
-%10
- /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /fi /f_f_i /f_f /fl /f_f_l
-%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
- /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
- /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
- /Lacute /Lcaron /Lslash /Nacute /Ncaron /f_f_j /Ohungarumlaut /Racute
-%90
- /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
- /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /dcroat /section
-%A0
- /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
- /lacute /lcaron /lslash /nacute /ncaron /c_t /ohungarumlaut /racute
-%B0
- /rcaron /sacute /scaron /scedilla /tcaron /tcedilla /uhungarumlaut /uring
- /ydieresis /zacute /zcaron /zdotaccent /.notdef /exclamdown /questiondown /sterling
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
-% --feature=kern --feature=liga --feature=lnum --feature=pnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-Reg.otf
-% Baskervaldx-Reg-lf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_kq7kv3.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_kq7kv3.enc
new file mode 100644
index 00000000000..8c66afb49c5
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_kq7kv3.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_kq7kv3jrblhc66hwjivsgccozc
+% Encoding created by otftotfm on Sat Nov 7 12:04:47 2020
+% Command line follows encoding
+/AutoEnc_kq7kv3jrblhc66hwjivsgccozc [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave.sc /acute.sc /caron /breve.sc /macron.sc /ring.sc
+ /cedilla.sc /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex.sc /dotaccent.sc
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde.sc /dieresis.sc
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=smcp --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Bol.otf Baskervaldx-Bol-tlf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ne5zxs.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_l44ess.enc
index 653a2ab110b..aec3505519f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ne5zxs.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_l44ess.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_ne5zxstbeebowqqxaysb5mv7re
-% Encoding created by otftotfm on Wed Nov 26 10:46:09 2014
+%%AutoEnc_l44esskt5qgh2qbbbj6xyf5qod
+% Encoding created by otftotfm on Sat Nov 7 12:04:47 2020
% Command line follows encoding
-/AutoEnc_ne5zxstbeebowqqxaysb5mv7re [
+/AutoEnc_l44esskt5qgh2qbbbj6xyf5qod [
%00
/f_i /Euro /f_f_i /f_f /fraction /dotaccent /hungarumlaut /ogonek
/f_l /f_f_l /.notdef /f_j /f_f_j /.notdef /.notdef /.notdef
@@ -35,7 +35,7 @@
/lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
%A0
- /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
/degree /plusminus /two.superior /three.superior /acute /uni00B5 /paragraph /periodcentered
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=tnum Baskervaldx-Bol.otf
-% Baskervaldx-Bol-tlf-ly1'
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-Bol.otf Baskervaldx-Bol-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_lewyuf.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_lewyuf.enc
deleted file mode 100644
index dd585f09694..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_lewyuf.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_lewyuf3qsaln6hawzmxijsooma
-% Encoding created by otftotfm on Wed Nov 26 10:47:00 2014
-% Command line follows encoding
-/AutoEnc_lewyuf3qsaln6hawzmxijsooma [
-%00
- /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
- /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
-%10
- /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
-%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
- /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
- /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
- /Lacute /Lcaron /Lslash /Nacute /Ncaron /f_f_j /Ohungarumlaut /Racute
-%90
- /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
- /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /dcroat /section
-%A0
- /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
- /lacute /lcaron /lslash /nacute /ncaron /c_t /ohungarumlaut /racute
-%B0
- /rcaron /sacute /scaron /scedilla /tcaron /tcedilla /uhungarumlaut /uring
- /ydieresis /zacute /zcaron /zdotaccent /.notdef /exclamdown /questiondown /sterling
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
-% --feature=kern --feature=liga --feature=onum --feature=pnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-BolIta.otf
-% Baskervaldx-BolIta-osf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_lozoyg.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_lozoyg.enc
new file mode 100644
index 00000000000..9882819ecf7
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_lozoyg.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_lozoygnii2a656syolm5qp3msh
+% Encoding created by otftotfm on Sat Nov 7 12:05:09 2020
+% Command line follows encoding
+/AutoEnc_lozoygnii2a656syolm5qp3msh [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /asciigrave /asciiacute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /asciidieresis
+%80
+ /f_f_i /f_f /f_f_l /f_j /f_f_j /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --x-height=440 Baskervaldx-Reg.otf Baskervaldx-Reg-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6mioll.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_lxdjmd.enc
index 30542edc368..88c0e7fb8da 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6mioll.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_lxdjmd.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_6miolll6pbhws7mlvmt4lp5uwa
-% Encoding created by otftotfm on Wed Nov 26 10:47:40 2014
+%%AutoEnc_lxdjmdo3yi4uakbhthdmytxbwa
+% Encoding created by otftotfm on Sat Nov 7 12:05:12 2020
% Command line follows encoding
-/AutoEnc_6miolll6pbhws7mlvmt4lp5uwa [
+/AutoEnc_lxdjmdo3yi4uakbhthdmytxbwa [
%00
- /fi /Euro /f_f_i /f_f /fraction /dotaccent /hungarumlaut /ogonek
- /fl /f_f_l /.notdef /f_j /f_f_j /.notdef /.notdef /.notdef
+ /f_f_i /Euro /f_f /f_f_l /fraction /dotaccent /hungarumlaut /ogonek
+ /f_j /f_f_j /.notdef /.notdef /fi /fl /.notdef /.notdef
%10
/dotlessi /dotlessj /asciigrave /asciiacute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -35,7 +35,7 @@
/lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
%A0
- /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/asciidieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
/degree /plusminus /two.superior /three.superior /asciiacute /uni00B5 /pilcrow /periodcentered
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=tnum Baskervaldx-Reg.otf
-% Baskervaldx-Reg-tosf-ly1'
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-Reg.otf Baskervaldx-Reg-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_igsfta.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_m4qttc.enc
index 51684a082e8..e11ea2bb88d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_igsfta.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_m4qttc.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_igsftan376in67jjj7errel7nh
-% Encoding created by otftotfm on Wed Nov 26 10:46:37 2014
+%%AutoEnc_m4qttcde34bbuljb5qell65msf
+% Encoding created by otftotfm on Sat Nov 7 12:04:55 2020
% Command line follows encoding
-/AutoEnc_igsftan376in67jjj7errel7nh [
+/AutoEnc_m4qttcde34bbuljb5qell65msf [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
%10
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
+ /f_f /dotlessi /dotlessj /f_i /f_l /f_f_i /f_f_l /f_j
%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero /one /two /three /four /five /six /seven
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=lnum --feature=tnum Baskervaldx-BolIta.otf
-% Baskervaldx-BolIta-tlf-t1'
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-BolIta.otf Baskervaldx-BolIta-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_m5lkgj.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_m5lkgj.enc
new file mode 100644
index 00000000000..11d973c0476
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_m5lkgj.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_m5lkgj4qudin4jpdjjpepu5fbd
+% Encoding created by otftotfm on Sat Nov 7 12:04:47 2020
+% Command line follows encoding
+/AutoEnc_m5lkgj4qudin4jpdjjpepu5fbd [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_i /f_f_i /f_f /f_l /f_f_l /f_j /f_f_j /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --x-height=440 Baskervaldx-Bol.otf Baskervaldx-Bol-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_mu6kzn.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_mu6kzn.enc
new file mode 100644
index 00000000000..abdf9fdb2e6
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_mu6kzn.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_mu6kznnzps66qklk67wmv7h4da
+% Encoding created by otftotfm on Sat Nov 7 12:05:09 2020
+% Command line follows encoding
+/AutoEnc_mu6kznnzps66qklk67wmv7h4da [
+%00
+ /grave.sc /acute.sc /circumflex.sc /tilde.sc /dieresis.sc /hungarumlaut /ring.sc /caron
+ /breve.sc /macron.sc /dotaccent.sc /cedilla.sc /ogonek.sc /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /.notdef /dotlessi /dotlessj /.notdef /f_i.sc /f_l.sc /.notdef /.notdef
+%20
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /.notdef /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /dcroat /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /.notdef /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /tcedilla.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /.notdef /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Reg.otf Baskervaldx-Reg-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_mvsyl4.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_mvsyl4.enc
deleted file mode 100644
index 06e726ae929..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_mvsyl4.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_mvsyl476dsmy3guqxezsy7vxed
-% Encoding created by otftotfm on Wed Nov 26 10:47:45 2014
-% Command line follows encoding
-/AutoEnc_mvsyl476dsmy3guqxezsy7vxed [
-%00
- /asciigrave /asciiacute /circumflex /tilde /asciidieresis /hungarumlaut /ring /caron
- /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
-%10
- /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /fi /f_f_i /f_f /fl /f_f_l
-%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
- /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
- /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
- /Lacute /Lcaron /Lslash /Nacute /Ncaron /f_f_j /Ohungarumlaut /Racute
-%90
- /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
- /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /dcroat /section
-%A0
- /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
- /lacute /lcaron /lslash /nacute /ncaron /c_t /ohungarumlaut /racute
-%B0
- /rcaron /sacute /scaron /scedilla /tcaron /tcedilla /uhungarumlaut /uring
- /ydieresis /zacute /zcaron /zdotaccent /.notdef /exclamdown /questiondown /sterling
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
-% --feature=kern --feature=liga --feature=onum --feature=tnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-Reg.otf
-% Baskervaldx-Reg-tosf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_mys6kl.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_mys6kl.enc
new file mode 100644
index 00000000000..2e8039f487f
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_mys6kl.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_mys6klhd76vnvtmeil6vkj424e
+% Encoding created by otftotfm on Sat Nov 7 12:04:50 2020
+% Command line follows encoding
+/AutoEnc_mys6klhd76vnvtmeil6vkj424e [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave.sc /acute.sc /caron /breve.sc /macron.sc /ring.sc
+ /cedilla.sc /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex.sc /dotaccent.sc
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde.sc /dieresis.sc
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=smcp --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Bol.otf Baskervaldx-Bol-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_nt5h45.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_nt5h45.enc
new file mode 100644
index 00000000000..69f74191c8b
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_nt5h45.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_nt5h45y27oslrvknavjpqhhksf
+% Encoding created by otftotfm on Sat Nov 7 12:05:07 2020
+% Command line follows encoding
+/AutoEnc_nt5h45y27oslrvknavjpqhhksf [
+%00
+ /grave.sc /acute.sc /circumflex.sc /tilde.sc /dieresis.sc /hungarumlaut /ring.sc /caron
+ /breve.sc /macron.sc /dotaccent.sc /cedilla.sc /ogonek.sc /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /.notdef /dotlessi /dotlessj /.notdef /f_i.sc /f_l.sc /.notdef /.notdef
+%20
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /.notdef /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /dcroat /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /.notdef /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /tcedilla.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /.notdef /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Reg.otf Baskervaldx-Reg-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_nwv7yn.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_nwv7yn.enc
new file mode 100644
index 00000000000..33fb2a2668e
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_nwv7yn.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_nwv7yngw254iit73oyg3eru5va
+% Encoding created by otftotfm on Sat Nov 7 12:04:48 2020
+% Command line follows encoding
+/AutoEnc_nwv7yngw254iit73oyg3eru5va [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
+ /eight.superior /nine.superior /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=sups --ligkern=* {KL} *
+% --x-height=440 Baskervaldx-Bol.otf Baskervaldx-Bol-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_7453eo.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ofzzxu.enc
index 4b4cec85c05..4915bcf01a3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_7453eo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ofzzxu.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_7453eonxzs5hwyebhfnhjsil4c
-% Encoding created by otftotfm on Wed Nov 26 10:47:48 2014
+%%AutoEnc_ofzzxugvjt4iveoitsf54pjbya
+% Encoding created by otftotfm on Sat Nov 7 12:05:07 2020
% Command line follows encoding
-/AutoEnc_7453eonxzs5hwyebhfnhjsil4c [
+/AutoEnc_ofzzxugvjt4iveoitsf54pjbya [
%00
/.notdef /Euro /.notdef /.notdef /fraction /dotaccent.sc /hungarumlaut /ogonek.sc
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /f_i.sc /f_l.sc /.notdef /.notdef
%10
/dotlessi /dotlessj /grave.sc /acute.sc /caron /breve.sc /macron.sc /ring.sc
/cedilla.sc /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -35,7 +35,7 @@
/lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde.sc /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
%A0
- /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis.sc /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron.sc
%B0
/degree /plusminus /two.superior /three.superior /acute.sc /uni00B5 /pilcrow /periodcentered
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Baskervaldx-Reg.otf
-% Baskervaldx-Reg-osf-sc-ly1'
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Reg.otf Baskervaldx-Reg-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_n3xo7h.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_pqcihf.enc
index 66ee94ee861..637c0c9a7cd 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_n3xo7h.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_pqcihf.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_n3xo7h7iv2l6dvi3egu2wbohfb
-% Encoding created by otftotfm on Wed Nov 26 10:46:30 2014
+%%AutoEnc_pqcihfd54ntbmr34t6v44kzvth
+% Encoding created by otftotfm on Sat Nov 7 12:04:43 2020
% Command line follows encoding
-/AutoEnc_n3xo7h7iv2l6dvi3egu2wbohfb [
+/AutoEnc_pqcihfd54ntbmr34t6v44kzvth [
%00
/f_i /Euro /f_f_i /f_f /fraction /dotaccent /hungarumlaut /ogonek
/f_l /f_f_l /.notdef /f_j /f_f_j /.notdef /.notdef /.notdef
@@ -35,7 +35,7 @@
/lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
%A0
- /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
/degree /plusminus /two.superior /three.superior /acute /uni00B5 /paragraph /periodcentered
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=pnum Baskervaldx-Bol.otf
-% Baskervaldx-Bol-osf-ly1'
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-Bol.otf Baskervaldx-Bol-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_puztjr.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_puztjr.enc
new file mode 100644
index 00000000000..fe89ebe8a52
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_puztjr.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_puztjr6hxbzqpwlgnhv3rvj63g
+% Encoding created by otftotfm on Sat Nov 7 12:05:13 2020
+% Command line follows encoding
+/AutoEnc_puztjr6hxbzqpwlgnhv3rvj63g [
+%00
+ /grave.sc /acute.sc /circumflex.sc /tilde.sc /dieresis.sc /hungarumlaut /ring.sc /caron
+ /breve.sc /macron.sc /dotaccent.sc /cedilla.sc /ogonek.sc /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /.notdef /dotlessi /dotlessj /.notdef /f_i.sc /f_l.sc /.notdef /.notdef
+%20
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /.notdef /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /dcroat /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /.notdef /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /tcedilla.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /.notdef /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Reg.otf Baskervaldx-Reg-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_riybhr.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_riybhr.enc
deleted file mode 100644
index fba88cfe96f..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_riybhr.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_riybhrcgg6wqki2tenmyifz32a
-% Encoding created by otftotfm on Wed Nov 26 10:46:39 2014
-% Command line follows encoding
-/AutoEnc_riybhrcgg6wqki2tenmyifz32a [
-%00
- /f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
- /f_f_i /f_f_l /.notdef /f_j /f_f_j /c_t /s_p /s_t
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /tilde /dieresis
-%80
- /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
- /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
- /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
- /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
-%A0
- /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
- /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
-%B0
- /degree /plusminus /two.superior /three.superior /acute /uni00B5 /paragraph /periodcentered
- /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
-% --feature=kern --feature=liga --feature=lnum --feature=tnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-BolIta.otf
-% Baskervaldx-BolIta-tlf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_bs5d7e.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_rosua2.enc
index 4a571c6aba7..faa2f3d44ff 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_bs5d7e.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_rosua2.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_bs5d7ei3xmstv7sjvwdos53yvb
-% Encoding created by otftotfm on Wed Nov 26 10:46:44 2014
+%%AutoEnc_rosua27w2vgdmvie6r6idz6fef
+% Encoding created by otftotfm on Sat Nov 7 12:04:53 2020
% Command line follows encoding
-/AutoEnc_bs5d7ei3xmstv7sjvwdos53yvb [
+/AutoEnc_rosua27w2vgdmvie6r6idz6fef [
%00
/f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
/f_f_i /f_f_l /.notdef /f_j /f_f_j /.notdef /.notdef /.notdef
@@ -35,7 +35,7 @@
/lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
%A0
- /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
/degree /plusminus /two.superior /three.superior /acute /uni00B5 /paragraph /periodcentered
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=pnum Baskervaldx-BolIta.otf
-% Baskervaldx-BolIta-lf-ly1'
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-BolIta.otf Baskervaldx-BolIta-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_oue4qy.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_scthrl.enc
index f36da9f6784..35cc3f17842 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_oue4qy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_scthrl.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_oue4qyerrcw2puyw6njes2itgh
-% Encoding created by otftotfm on Wed Nov 26 10:46:32 2014
+%%AutoEnc_scthrlgrf46g4ru7ugsqmu4eqe
+% Encoding created by otftotfm on Sat Nov 7 12:04:44 2020
% Command line follows encoding
-/AutoEnc_oue4qyerrcw2puyw6njes2itgh [
+/AutoEnc_scthrlgrf46g4ru7ugsqmu4eqe [
%00
/grave.sc /acute.sc /circumflex.sc /tilde.sc /dieresis.sc /hungarumlaut /ring.sc /caron
/breve.sc /macron.sc /dotaccent.sc /cedilla.sc /ogonek.sc /quotesinglbase /guilsinglleft /guilsinglright
@@ -11,7 +11,7 @@
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
/.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
%20
- /.notdef /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Baskervaldx-Bol.otf
-% Baskervaldx-Bol-osf-sc-t1'
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Bol.otf Baskervaldx-Bol-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_nq5ldf.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_sv3nex.enc
index 4466b3feb7e..c15b13a3a7e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_nq5ldf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_sv3nex.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_nq5ldftdw4dhoi2xp3aujky3sh
-% Encoding created by otftotfm on Wed Nov 26 10:46:16 2014
+%%AutoEnc_sv3nexcib6b6wigtpzf5xaedoa
+% Encoding created by otftotfm on Sat Nov 7 12:04:49 2020
% Command line follows encoding
-/AutoEnc_nq5ldftdw4dhoi2xp3aujky3sh [
+/AutoEnc_sv3nexcib6b6wigtpzf5xaedoa [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -11,7 +11,7 @@
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
/.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
@@ -57,9 +57,8 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=sups --ligkern=* {KL} * Baskervaldx-Bol.otf
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=sups
+% --ligkern=* {KL} * --x-height=440 Baskervaldx-Bol.otf
% Baskervaldx-Bol-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_gsgxts.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_teykvl.enc
index 4d41cd21451..3363a4f3261 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_gsgxts.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_teykvl.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_gsgxtszcp6ptuximzpygmeb22g
-% Encoding created by otftotfm on Wed Nov 26 10:47:47 2014
+%%AutoEnc_teykvlyihbqgynxcl6fj4fqxwg
+% Encoding created by otftotfm on Sat Nov 7 12:05:06 2020
% Command line follows encoding
-/AutoEnc_gsgxtszcp6ptuximzpygmeb22g [
+/AutoEnc_teykvlyihbqgynxcl6fj4fqxwg [
%00
/asciigrave /asciiacute /circumflex /tilde /asciidieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
%10
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /fi /f_f_i /f_f /fl /f_f_l
+ /f_f_i /dotlessi /dotlessj /f_f /fi /fl /f_f_l /f_j
%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=onum --feature=pnum Baskervaldx-Reg.otf
-% Baskervaldx-Reg-osf-t1'
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-Reg.otf Baskervaldx-Reg-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6tdhgo.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_tfcpq3.enc
index d9a53cd9c8e..efa04c00fc4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6tdhgo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_tfcpq3.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_6tdhgouks3ohvzhehei7hpqe3e
-% Encoding created by otftotfm on Wed Nov 26 10:46:26 2014
+%%AutoEnc_tfcpq3saobldyjjcnflq6e7ebb
+% Encoding created by otftotfm on Sat Nov 7 12:04:50 2020
% Command line follows encoding
-/AutoEnc_6tdhgouks3ohvzhehei7hpqe3e [
+/AutoEnc_tfcpq3saobldyjjcnflq6e7ebb [
%00
/grave.sc /acute.sc /circumflex.sc /tilde.sc /dieresis.sc /hungarumlaut /ring.sc /caron
/breve.sc /macron.sc /dotaccent.sc /cedilla.sc /ogonek.sc /quotesinglbase /guilsinglleft /guilsinglright
@@ -11,7 +11,7 @@
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
/.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
%20
- /.notdef /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Baskervaldx-Bol.otf
-% Baskervaldx-Bol-tosf-sc-t1'
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Bol.otf Baskervaldx-Bol-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_tnmdy3.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_tnmdy3.enc
new file mode 100644
index 00000000000..b7fda5b64ab
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_tnmdy3.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_tnmdy3nn4cay2wi3zjvuptcvud
+% Encoding created by otftotfm on Sat Nov 7 12:05:11 2020
+% Command line follows encoding
+/AutoEnc_tnmdy3nn4cay2wi3zjvuptcvud [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /asciigrave /asciiacute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
+ /eight.superior /nine.superior /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /asciidieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=sups --ligkern=* {KL} *
+% --x-height=440 Baskervaldx-Reg.otf Baskervaldx-Reg-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_7qmldf.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_tv7w6k.enc
index 13e91f8c5b5..3c7305c8cf8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_7qmldf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_tv7w6k.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_7qmldfdim5zyn7jn27ypqicuxa
-% Encoding created by otftotfm on Wed Nov 26 10:47:34 2014
+%%AutoEnc_tv7w6kbvjbicouxtdr5lk2ityg
+% Encoding created by otftotfm on Sat Nov 7 12:05:11 2020
% Command line follows encoding
-/AutoEnc_7qmldfdim5zyn7jn27ypqicuxa [
+/AutoEnc_tv7w6kbvjbicouxtdr5lk2ityg [
%00
/asciigrave /asciiacute /circumflex /tilde /asciidieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -11,7 +11,7 @@
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
/.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
@@ -57,9 +57,8 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=sups --ligkern=* {KL} * Baskervaldx-Reg.otf
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=sups
+% --ligkern=* {KL} * --x-height=440 Baskervaldx-Reg.otf
% Baskervaldx-Reg-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6rwo65.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_uguye6.enc
index 6429b72ddcc..dede2135831 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_6rwo65.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_uguye6.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_6rwo65dvp33jselpjz7gqnt3hc
-% Encoding created by otftotfm on Wed Nov 26 10:46:24 2014
+%%AutoEnc_uguye6ff5lwmzzjfq5jmztufde
+% Encoding created by otftotfm on Sat Nov 7 12:04:49 2020
% Command line follows encoding
-/AutoEnc_6rwo65dvp33jselpjz7gqnt3hc [
+/AutoEnc_uguye6ff5lwmzzjfq5jmztufde [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
%10
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /f_i /f_f_i /f_f /f_l /f_f_l
+ /f_i /dotlessi /dotlessj /f_f_i /f_f /f_l /f_f_l /f_j
%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=onum --feature=tnum Baskervaldx-Bol.otf
-% Baskervaldx-Bol-tosf-t1'
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-Bol.otf Baskervaldx-Bol-tosf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_untte3.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_untte3.enc
deleted file mode 100644
index 8194d18a8e8..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_untte3.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_untte3zw5lnazywvzsipsratgd
-% Encoding created by otftotfm on Wed Nov 26 10:47:30 2014
-% Command line follows encoding
-/AutoEnc_untte3zw5lnazywvzsipsratgd [
-%00
- /fi /Euro /f_f_i /f_f /fraction /dotaccent /hungarumlaut /ogonek
- /fl /f_f_l /.notdef /f_j /f_f_j /c_t /s_p /s_t
-%10
- /dotlessi /dotlessj /asciigrave /asciiacute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /tilde /asciidieresis
-%80
- /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
- /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
- /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
- /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
-%A0
- /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
- /asciidieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
-%B0
- /degree /plusminus /two.superior /three.superior /asciiacute /uni00B5 /pilcrow /periodcentered
- /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
-% --feature=kern --feature=liga --feature=lnum --feature=tnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-Reg.otf
-% Baskervaldx-Reg-tlf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_upot5e.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_upot5e.enc
new file mode 100644
index 00000000000..31ff74cff95
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_upot5e.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_upot5er32yh7aqefwsrm3dhb3c
+% Encoding created by otftotfm on Sat Nov 7 12:04:56 2020
+% Command line follows encoding
+/AutoEnc_upot5er32yh7aqefwsrm3dhb3c [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_f /f_i /f_l /f_f_i /f_f_l /f_j /f_f_j /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --x-height=440 Baskervaldx-BolIta.otf Baskervaldx-BolIta-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_uy4eps.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_uy4eps.enc
new file mode 100644
index 00000000000..fe0ddfad779
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_uy4eps.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_uy4epss7oqjsigv7zvwm76cnpg
+% Encoding created by otftotfm on Sat Nov 7 12:05:11 2020
+% Command line follows encoding
+/AutoEnc_uy4epss7oqjsigv7zvwm76cnpg [
+%00
+ /grave.sc /acute.sc /circumflex.sc /tilde.sc /dieresis.sc /hungarumlaut /ring.sc /caron
+ /breve.sc /macron.sc /dotaccent.sc /cedilla.sc /ogonek.sc /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /.notdef /dotlessi /dotlessj /.notdef /f_i.sc /f_l.sc /.notdef /.notdef
+%20
+ /space /exclam.sc /quotedbl /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /.notdef /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /dcroat /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /.notdef /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /tcedilla.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /.notdef /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Reg.otf Baskervaldx-Reg-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_hg6ru4.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_v577lu.enc
index 9d9d19ba1b8..edcb5fa2822 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_hg6ru4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_v577lu.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_hg6ru4yk2nsgfw4vfjnnr7dxfa
-% Encoding created by otftotfm on Wed Nov 26 10:47:36 2014
+%%AutoEnc_v577lubdhwnj456zi2kdiffvvh
+% Encoding created by otftotfm on Sat Nov 7 12:05:09 2020
% Command line follows encoding
-/AutoEnc_hg6ru4yk2nsgfw4vfjnnr7dxfa [
+/AutoEnc_v577lubdhwnj456zi2kdiffvvh [
%00
/.notdef /Euro /.notdef /.notdef /fraction /dotaccent.sc /hungarumlaut /ogonek.sc
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /f_i.sc /f_l.sc /.notdef /.notdef
%10
/dotlessi /dotlessj /grave.sc /acute.sc /caron /breve.sc /macron.sc /ring.sc
/cedilla.sc /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -35,7 +35,7 @@
/lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde.sc /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
%A0
- /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis.sc /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron.sc
%B0
/degree /plusminus /two.superior /three.superior /acute.sc /uni00B5 /pilcrow /periodcentered
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Baskervaldx-Reg.otf
-% Baskervaldx-Reg-lf-sc-ly1'
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Reg.otf Baskervaldx-Reg-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_bgypte.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_wg6wcc.enc
index 71d06e6244c..7eb82bbe998 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_bgypte.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_wg6wcc.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_bgypterpgy2zbrvlzarqnmgesh
-% Encoding created by otftotfm on Wed Nov 26 10:46:30 2014
+%%AutoEnc_wg6wcchsl6sooj7cwnaxear35d
+% Encoding created by otftotfm on Sat Nov 7 12:04:51 2020
% Command line follows encoding
-/AutoEnc_bgypterpgy2zbrvlzarqnmgesh [
+/AutoEnc_wg6wcchsl6sooj7cwnaxear35d [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
%10
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /f_i /f_f_i /f_f /f_l /f_f_l
+ /f_f /dotlessi /dotlessj /f_i /f_l /f_f_i /f_f_l /f_j
%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=onum --feature=pnum Baskervaldx-Bol.otf
-% Baskervaldx-Bol-osf-t1'
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-BolIta.otf Baskervaldx-BolIta-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_wvrs5w.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_wvrs5w.enc
deleted file mode 100644
index e519c4fe3c5..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_wvrs5w.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_wvrs5wkuggjzpkf2dkyingyljd
-% Encoding created by otftotfm on Wed Nov 26 10:46:27 2014
-% Command line follows encoding
-/AutoEnc_wvrs5wkuggjzpkf2dkyingyljd [
-%00
- /f_i /Euro /f_f_i /f_f /fraction /dotaccent /hungarumlaut /ogonek
- /f_l /f_f_l /.notdef /f_j /f_f_j /c_t /s_p /s_t
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
- /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /tilde /dieresis
-%80
- /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
- /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
- /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
- /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
-%A0
- /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
- /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
-%B0
- /degree /plusminus /two.superior /three.superior /acute /uni00B5 /paragraph /periodcentered
- /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
-% --feature=kern --feature=liga --feature=onum --feature=tnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-Bol.otf
-% Baskervaldx-Bol-tosf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_xbckbj.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_xbckbj.enc
deleted file mode 100644
index d20a0b0dced..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_xbckbj.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_xbckbjmhsegmdrx6d7z3s2yexb
-% Encoding created by otftotfm on Wed Nov 26 10:46:14 2014
-% Command line follows encoding
-/AutoEnc_xbckbjmhsegmdrx6d7z3s2yexb [
-%00
- /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
- /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
-%10
- /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /f_i /f_f_i /f_f /f_l /f_f_l
-%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
- /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
- /Lacute /Lcaron /Lslash /Nacute /Ncaron /f_f_j /Ohungarumlaut /Racute
-%90
- /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
- /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /dcroat /section
-%A0
- /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
- /lacute /lcaron /lslash /nacute /ncaron /c_t /ohungarumlaut /racute
-%B0
- /rcaron /sacute /scaron /scedilla /tcaron /tcedilla /uhungarumlaut /uring
- /ydieresis /zacute /zcaron /zdotaccent /.notdef /exclamdown /questiondown /sterling
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
-% --feature=kern --feature=liga --feature=lnum --feature=tnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-Bol.otf
-% Baskervaldx-Bol-tlf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_xebzk2.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_xebzk2.enc
new file mode 100644
index 00000000000..6f902f73b02
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_xebzk2.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_xebzk252otkn3sjoycu4f7ijfb
+% Encoding created by otftotfm on Sat Nov 7 12:04:45 2020
+% Command line follows encoding
+/AutoEnc_xebzk252otkn3sjoycu4f7ijfb [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_i /f_f_i /f_f /f_l /f_f_l /f_j /f_f_j /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --x-height=440 Baskervaldx-Bol.otf Baskervaldx-Bol-lf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_xjuza2.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_xjuza2.enc
deleted file mode 100644
index 46794caeb48..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_xjuza2.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_xjuza2tiuy4c22hy2gw7xgrueh
-% Encoding created by otftotfm on Wed Nov 26 10:47:50 2014
-% Command line follows encoding
-/AutoEnc_xjuza2tiuy4c22hy2gw7xgrueh [
-%00
- /fi /Euro /f_f_i /f_f /fraction /dotaccent /hungarumlaut /ogonek
- /fl /f_f_l /.notdef /f_j /f_f_j /c_t /s_p /s_t
-%10
- /dotlessi /dotlessj /asciigrave /asciiacute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
- /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /tilde /asciidieresis
-%80
- /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
- /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
-%90
- /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
- /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
-%A0
- /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
- /asciidieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
-%B0
- /degree /plusminus /two.superior /three.superior /asciiacute /uni00B5 /pilcrow /periodcentered
- /cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
-% --feature=kern --feature=liga --feature=onum --feature=pnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-Reg.otf
-% Baskervaldx-Reg-osf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_caye23.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_xotpaa.enc
index 34bd9813c78..bb651caaede 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_caye23.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_xotpaa.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_caye23teauovtetualagkuzeoc
-% Encoding created by otftotfm on Wed Nov 26 10:46:36 2014
+%%AutoEnc_xotpaaq2oytwtzwo7nwcak6phc
+% Encoding created by otftotfm on Sat Nov 7 12:04:54 2020
% Command line follows encoding
-/AutoEnc_caye23teauovtetualagkuzeoc [
+/AutoEnc_xotpaaq2oytwtzwo7nwcak6phc [
%00
/f_f /Euro /f_i /f_l /fraction /dotaccent /hungarumlaut /ogonek
/f_f_i /f_f_l /.notdef /f_j /f_f_j /.notdef /.notdef /.notdef
@@ -35,7 +35,7 @@
/lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
%A0
- /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
/degree /plusminus /two.superior /three.superior /acute /uni00B5 /paragraph /periodcentered
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=tnum Baskervaldx-BolIta.otf
-% Baskervaldx-BolIta-tlf-ly1'
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-BolIta.otf Baskervaldx-BolIta-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_y62qbt.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_y62qbt.enc
new file mode 100644
index 00000000000..1fbd0a06c74
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_y62qbt.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_y62qbtjammfityzwww4y2njpih
+% Encoding created by otftotfm on Sat Nov 7 12:05:10 2020
+% Command line follows encoding
+/AutoEnc_y62qbtjammfityzwww4y2njpih [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /f_i.sc /f_l.sc /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave.sc /acute.sc /caron /breve.sc /macron.sc /ring.sc
+ /cedilla.sc /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex.sc /dotaccent.sc
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde.sc /dieresis.sc
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=smcp --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Reg.otf Baskervaldx-Reg-tlf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_rzwiio.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_y77okd.enc
index c162f951502..ea018c98e70 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_rzwiio.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_y77okd.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_rzwiiogzflmtizblvjia2h4osf
-% Encoding created by otftotfm on Wed Nov 26 10:47:41 2014
+%%AutoEnc_y77okdkhzdothzhvxf5bykfayh
+% Encoding created by otftotfm on Sat Nov 7 12:05:12 2020
% Command line follows encoding
-/AutoEnc_rzwiiogzflmtizblvjia2h4osf [
+/AutoEnc_y77okdkhzdothzhvxf5bykfayh [
%00
/asciigrave /asciiacute /circumflex /tilde /asciidieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
%10
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /fi /f_f_i /f_f /fl /f_f_l
+ /f_f_i /dotlessi /dotlessj /f_f /fi /fl /f_f_l /f_j
%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=onum --feature=tnum Baskervaldx-Reg.otf
-% Baskervaldx-Reg-tosf-t1'
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-Reg.otf Baskervaldx-Reg-tosf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_l7sulo.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_yk4dqp.enc
index 645ce7c54ba..ee716348098 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_l7sulo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_yk4dqp.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_l7sulopud3322goevbbcoq5ved
-% Encoding created by otftotfm on Wed Nov 26 10:47:34 2014
+%%AutoEnc_yk4dqp2hppqmbt7cudzwz4r6ob
+% Encoding created by otftotfm on Sat Nov 7 12:05:08 2020
% Command line follows encoding
-/AutoEnc_l7sulopud3322goevbbcoq5ved [
+/AutoEnc_yk4dqp2hppqmbt7cudzwz4r6ob [
%00
- /fi /Euro /f_f_i /f_f /fraction /dotaccent /hungarumlaut /ogonek
- /fl /f_f_l /.notdef /f_j /f_f_j /.notdef /.notdef /.notdef
+ /f_f_i /Euro /f_f /f_f_l /fraction /dotaccent /hungarumlaut /ogonek
+ /f_j /f_f_j /.notdef /.notdef /fi /fl /.notdef /.notdef
%10
/dotlessi /dotlessj /asciigrave /asciiacute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -35,7 +35,7 @@
/lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
%A0
- /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
/asciidieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
/degree /plusminus /two.superior /three.superior /asciiacute /uni00B5 /pilcrow /periodcentered
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
% --vf-directory=texmf/fonts/vf/public/baskervaldx
% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=pnum Baskervaldx-Reg.otf
-% Baskervaldx-Reg-lf-ly1'
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --x-height=440 Baskervaldx-Reg.otf Baskervaldx-Reg-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ymibyh.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ymibyh.enc
deleted file mode 100644
index 24aa6cb8163..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_ymibyh.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_ymibyhu5nhixfb4akzp6gaoe4f
-% Encoding created by otftotfm on Wed Nov 26 10:46:28 2014
-% Command line follows encoding
-/AutoEnc_ymibyhu5nhixfb4akzp6gaoe4f [
-%00
- /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
- /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
-%10
- /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
- /f_j /dotlessi /dotlessj /f_i /f_f_i /f_f /f_l /f_f_l
-%20
- /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
- /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
- /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
- /Lacute /Lcaron /Lslash /Nacute /Ncaron /f_f_j /Ohungarumlaut /Racute
-%90
- /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcedilla /Uhungarumlaut /Uring
- /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /dcroat /section
-%A0
- /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
- /lacute /lcaron /lslash /nacute /ncaron /c_t /ohungarumlaut /racute
-%B0
- /rcaron /sacute /scaron /scedilla /tcaron /tcedilla /uhungarumlaut /uring
- /ydieresis /zacute /zcaron /zdotaccent /.notdef /exclamdown /questiondown /sterling
-%C0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-%D0
- /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
- /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
-%E0
- /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-%F0
- /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
- /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
-% --vf-directory=texmf/fonts/vf/public/baskervaldx
-% --type1-directory=texmf/fonts/type1/public/baskervaldx
-% --truetype-directory=texmf/fonts/truetype/public/baskervaldx
-% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
-% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dlig
-% --feature=kern --feature=liga --feature=onum --feature=tnum
-% --include-alternates=*.swash --feature=aalt Baskervaldx-Bol.otf
-% Baskervaldx-Bol-tosf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_zag37q.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_zag37q.enc
new file mode 100644
index 00000000000..9bf01b83e22
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_zag37q.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_zag37qd5knyi2zt2smz2ojhokd
+% Encoding created by otftotfm on Sat Nov 7 12:05:07 2020
+% Command line follows encoding
+/AutoEnc_zag37qd5knyi2zt2smz2ojhokd [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /f_i.sc /f_l.sc /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave.sc /acute.sc /caron /breve.sc /macron.sc /ring.sc
+ /cedilla.sc /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /exclamdown /equal /questiondown /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex.sc /dotaccent.sc
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde.sc /dieresis.sc
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=pnum --feature=smcp --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Reg.otf Baskervaldx-Reg-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_zb3hlf.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_zb3hlf.enc
new file mode 100644
index 00000000000..535922c3ea5
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_zb3hlf.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_zb3hlfm4fx343rwbb5prg57h3h
+% Encoding created by otftotfm on Sat Nov 7 12:05:12 2020
+% Command line follows encoding
+/AutoEnc_zb3hlfm4fx343rwbb5prg57h3h [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /asciigrave /asciiacute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /asciidieresis
+%80
+ /f_f_i /f_f /f_f_l /f_j /f_f_j /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --x-height=440 Baskervaldx-Reg.otf Baskervaldx-Reg-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_zey2cz.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_zey2cz.enc
new file mode 100644
index 00000000000..405c0c7911b
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_zey2cz.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_zey2czbewat4o7ikrhejlrmfjb
+% Encoding created by otftotfm on Sat Nov 7 12:05:06 2020
+% Command line follows encoding
+/AutoEnc_zey2czbewat4o7ikrhejlrmfjb [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /asciigrave /asciiacute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /asciidieresis
+%80
+ /f_f_i /f_f /f_f_l /f_j /f_f_j /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --x-height=440 Baskervaldx-Reg.otf Baskervaldx-Reg-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_zkqdv4.enc b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_zkqdv4.enc
new file mode 100644
index 00000000000..0570fc0fd7e
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervaldx/zbv_zkqdv4.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_zkqdv4mxi2aqf7jza4fycpy2dh
+% Encoding created by otftotfm on Sat Nov 7 12:05:12 2020
+% Command line follows encoding
+/AutoEnc_zkqdv4mxi2aqf7jza4fycpy2dh [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni2126 /.notdef /f_i.sc /f_l.sc /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave.sc /acute.sc /caron /breve.sc /macron.sc /ring.sc
+ /cedilla.sc /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedblright /numbersign /dollar /percent /ampersand.sc /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question.sc
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex.sc /dotaccent.sc
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde.sc /dieresis.sc
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=texmf/fonts/tfm/public/baskervaldx
+% --vf-directory=texmf/fonts/vf/public/baskervaldx
+% --type1-directory=texmf/fonts/type1/public/baskervaldx
+% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
+% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=smcp --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall --x-height=440
+% Baskervaldx-Reg.otf Baskervaldx-Reg-tosf-sc-ot1'