summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-12-07 03:01:14 +0000
committerNorbert Preining <norbert@preining.info>2020-12-07 03:01:14 +0000
commit3fd16c4afc6febb1c1ecfbf6a6e3c15b01bf59e2 (patch)
tree24af459bceae0b9708e25240a8590c6296e4fb4a /fonts
parent7012128d63a0714e598d910f1a5111af1ffa31e5 (diff)
CTAN sync 202012070301
Diffstat (limited to 'fonts')
-rw-r--r--fonts/baskervaldx/README7
-rw-r--r--fonts/baskervaldx/doc/baskervaldx-doc.pdfbin206555 -> 200336 bytes
-rw-r--r--fonts/baskervaldx/enc/zbv_23jm4j.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_2445cl.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_2kku7k.enc4
-rw-r--r--fonts/baskervaldx/enc/zbv_2n2qka.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_2xv27p.enc4
-rw-r--r--fonts/baskervaldx/enc/zbv_2zeho7.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_34qyyt.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_4f5bev.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_524fcc.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_556rta.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_5p6atn.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_5zt4ml.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_6dnovg.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_6lr3v3.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_6rdtju.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_6xreh4.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_7d54ky.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_7i75ol.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_7nnme4.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_ahc6ab.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_ak7beg.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_aorlch.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_auq4k5.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_awcfcx.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_ax2yo2.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_ax7osu.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_c3asvt.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_ck4t6h.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_cl2iyt.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_clcsgf.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_coqtyh.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_cv7nez.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_d7elqy.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_d7lahw.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_dbb2hd.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_dw7i6y.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_edkp5z.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_ezfzzx.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_feassy.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_g4f2qe.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_g5xsbp.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_gar3zb.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_gjwmpg.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_h4nqsn.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_ik76ei.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_ilkd46.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_itooof.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_jwmruw.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_k3ascw.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_k6hbcl.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_kq7kv3.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_l44ess.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_lewyuf.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_lozoyg.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_lxdjmd.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_m4qttc.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_m5lkgj.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_mu6kzn.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_mvsyl4.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_mys6kl.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_nt5h45.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_nwv7yn.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_ofzzxu.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_pqcihf.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_puztjr.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_riybhr.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_rosua2.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_scthrl.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_sv3nex.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_teykvl.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_tfcpq3.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_tnmdy3.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_tv7w6k.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_uguye6.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_untte3.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_upot5e.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_uy4eps.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_v577lu.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_wg6wcc.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_wvrs5w.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_xbckbj.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_xebzk2.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_xjuza2.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_xotpaa.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_y62qbt.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_y77okd.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_yk4dqp.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_ymibyh.enc66
-rw-r--r--fonts/baskervaldx/enc/zbv_zag37q.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_zb3hlf.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_zey2cz.enc2
-rw-r--r--fonts/baskervaldx/enc/zbv_zkqdv4.enc2
-rw-r--r--fonts/baskervaldx/map/Baskervaldx.map89
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Bol-lf-swash-ly1--base.tfmbin0 -> 1956 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Bol-lf-swash-ly1.tfmbin0 -> 9772 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Bol-lf-swash-t1--base.tfmbin0 -> 1864 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Bol-lf-swash-t1.tfmbin0 -> 9156 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Bol-osf-swash-ly1--base.tfmbin0 -> 1952 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Bol-osf-swash-ly1.tfmbin0 -> 9768 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Bol-osf-swash-t1--base.tfmbin0 -> 1860 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Bol-osf-swash-t1.tfmbin0 -> 9152 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Bol-tlf-swash-ly1--base.tfmbin0 -> 1932 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Bol-tlf-swash-ly1.tfmbin0 -> 9748 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Bol-tlf-swash-t1--base.tfmbin0 -> 1840 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Bol-tlf-swash-t1.tfmbin0 -> 9132 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Bol-tosf-swash-ly1--base.tfmbin0 -> 1932 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Bol-tosf-swash-ly1.tfmbin0 -> 9748 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Bol-tosf-swash-t1--base.tfmbin0 -> 1840 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Bol-tosf-swash-t1.tfmbin0 -> 9132 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-BolIta-lf-swash-ly1--base.tfmbin0 -> 2208 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-BolIta-lf-swash-ly1.tfmbin0 -> 9504 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-BolIta-lf-swash-t1--base.tfmbin0 -> 2084 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-BolIta-lf-swash-t1.tfmbin0 -> 8844 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-BolIta-osf-swash-ly1--base.tfmbin0 -> 2200 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-BolIta-osf-swash-ly1.tfmbin0 -> 9496 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-BolIta-osf-swash-t1--base.tfmbin0 -> 2080 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-BolIta-osf-swash-t1.tfmbin0 -> 8840 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-BolIta-tlf-swash-ly1--base.tfmbin0 -> 2172 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-BolIta-tlf-swash-ly1.tfmbin0 -> 9468 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-BolIta-tlf-swash-t1--base.tfmbin0 -> 2048 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-BolIta-tlf-swash-t1.tfmbin0 -> 8808 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-BolIta-tosf-swash-ly1--base.tfmbin0 -> 2172 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-BolIta-tosf-swash-ly1.tfmbin0 -> 9468 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-BolIta-tosf-swash-t1--base.tfmbin0 -> 2048 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-BolIta-tosf-swash-t1.tfmbin0 -> 8808 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Ita-lf-swash-ly1--base.tfmbin0 -> 2180 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Ita-lf-swash-ly1.tfmbin0 -> 10496 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Ita-lf-swash-t1--base.tfmbin0 -> 2076 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Ita-lf-swash-t1.tfmbin0 -> 9824 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Ita-osf-swash-ly1--base.tfmbin0 -> 2180 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Ita-osf-swash-ly1.tfmbin0 -> 10496 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Ita-osf-swash-t1--base.tfmbin0 -> 2072 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Ita-osf-swash-t1.tfmbin0 -> 9820 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Ita-tlf-swash-ly1--base.tfmbin0 -> 2156 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Ita-tlf-swash-ly1.tfmbin0 -> 10472 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Ita-tlf-swash-t1--base.tfmbin0 -> 2048 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Ita-tlf-swash-t1.tfmbin0 -> 9796 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Ita-tosf-swash-ly1--base.tfmbin0 -> 2152 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Ita-tosf-swash-ly1.tfmbin0 -> 10468 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Ita-tosf-swash-t1--base.tfmbin0 -> 2044 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Ita-tosf-swash-t1.tfmbin0 -> 9792 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Reg-lf-swash-ly1--base.tfmbin0 -> 1892 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Reg-lf-swash-ly1.tfmbin0 -> 9524 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Reg-lf-swash-t1--base.tfmbin0 -> 1840 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Reg-lf-swash-t1.tfmbin0 -> 8984 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Reg-osf-swash-ly1--base.tfmbin0 -> 1896 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Reg-osf-swash-ly1.tfmbin0 -> 9528 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Reg-osf-swash-t1--base.tfmbin0 -> 1844 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Reg-osf-swash-t1.tfmbin0 -> 8988 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Reg-tlf-swash-ly1--base.tfmbin0 -> 1872 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Reg-tlf-swash-ly1.tfmbin0 -> 9504 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Reg-tlf-swash-t1--base.tfmbin0 -> 1816 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Reg-tlf-swash-t1.tfmbin0 -> 8960 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Reg-tosf-swash-ly1--base.tfmbin0 -> 1872 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Reg-tosf-swash-ly1.tfmbin0 -> 9504 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Reg-tosf-swash-t1--base.tfmbin0 -> 1816 bytes
-rw-r--r--fonts/baskervaldx/tfm/Baskervaldx-Reg-tosf-swash-t1.tfmbin0 -> 8960 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Bol-lf-swash-ly1.vfbin0 -> 1736 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Bol-lf-swash-t1.vfbin0 -> 1776 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Bol-osf-swash-ly1.vfbin0 -> 1736 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Bol-osf-swash-t1.vfbin0 -> 1776 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Bol-tlf-swash-ly1.vfbin0 -> 1736 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Bol-tlf-swash-t1.vfbin0 -> 1776 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Bol-tosf-swash-ly1.vfbin0 -> 1736 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Bol-tosf-swash-t1.vfbin0 -> 1780 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-BolIta-lf-swash-ly1.vfbin0 -> 1740 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-BolIta-lf-swash-t1.vfbin0 -> 1780 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-BolIta-osf-swash-ly1.vfbin0 -> 1740 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-BolIta-osf-swash-t1.vfbin0 -> 1780 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-BolIta-tlf-swash-ly1.vfbin0 -> 1740 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-BolIta-tlf-swash-t1.vfbin0 -> 1780 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-BolIta-tosf-swash-ly1.vfbin0 -> 1740 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-BolIta-tosf-swash-t1.vfbin0 -> 1784 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Ita-lf-swash-ly1.vfbin0 -> 1736 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Ita-lf-swash-t1.vfbin0 -> 1776 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Ita-osf-swash-ly1.vfbin0 -> 1736 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Ita-osf-swash-t1.vfbin0 -> 1776 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Ita-tlf-swash-ly1.vfbin0 -> 1736 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Ita-tlf-swash-t1.vfbin0 -> 1776 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Ita-tosf-swash-ly1.vfbin0 -> 1736 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Ita-tosf-swash-t1.vfbin0 -> 1780 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Reg-lf-swash-ly1.vfbin0 -> 1736 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Reg-lf-swash-t1.vfbin0 -> 1772 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Reg-osf-swash-ly1.vfbin0 -> 1736 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Reg-osf-swash-t1.vfbin0 -> 1776 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Reg-tlf-swash-ly1.vfbin0 -> 1736 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Reg-tlf-swash-t1.vfbin0 -> 1776 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Reg-tosf-swash-ly1.vfbin0 -> 1736 bytes
-rw-r--r--fonts/baskervaldx/vf/Baskervaldx-Reg-tosf-swash-t1.vfbin0 -> 1776 bytes
-rw-r--r--fonts/utilities/cjk-gs-integrate/ChangeLog120
-rw-r--r--fonts/utilities/cjk-gs-integrate/README.md14
-rwxr-xr-xfonts/utilities/cjk-gs-integrate/cjk-gs-integrate.pl619
194 files changed, 2187 insertions, 386 deletions
diff --git a/fonts/baskervaldx/README b/fonts/baskervaldx/README
index 876482c8f5..2b65cd910c 100644
--- a/fonts/baskervaldx/README
+++ b/fonts/baskervaldx/README
@@ -12,12 +12,15 @@ NOTICE.txt;
http://www.ctan.org/license/lppl1.3
for the details of that license.
-Current version: 1.075, 2020/11/07
+Current version: 1.076, 2020/12/05
+
+Changes in version 1.076
+Re-added the missing components (tfm, vf, enc, map entries) required so that the "swash" versions function as documented.
Changes in version 1.075
1. Corrected the order of the GPOS tables so that proper kerning takes place in the text fonts.
2. Added OT1 encoded fonts.
-3. Reworked \textcircled so that is functional one more.
+3. Reworked \textcircled so that is functional once more.
Changes in version 1.074
Removed from the otf files the rlig lookups that made substitutions of, e.g., \oe for oe, in opentype tex.
diff --git a/fonts/baskervaldx/doc/baskervaldx-doc.pdf b/fonts/baskervaldx/doc/baskervaldx-doc.pdf
index d28315b5d5..cf3cb12b59 100644
--- a/fonts/baskervaldx/doc/baskervaldx-doc.pdf
+++ b/fonts/baskervaldx/doc/baskervaldx-doc.pdf
Binary files differ
diff --git a/fonts/baskervaldx/enc/zbv_23jm4j.enc b/fonts/baskervaldx/enc/zbv_23jm4j.enc
index 06d858aa5a..59a478d5ea 100644
--- a/fonts/baskervaldx/enc/zbv_23jm4j.enc
+++ b/fonts/baskervaldx/enc/zbv_23jm4j.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_23jm4j5tiz3kvifx7wsju2mdwc
-% Encoding created by otftotfm on Sat Nov 7 12:05:10 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:06 2020
% Command line follows encoding
/AutoEnc_23jm4j5tiz3kvifx7wsju2mdwc [
%00
diff --git a/fonts/baskervaldx/enc/zbv_2445cl.enc b/fonts/baskervaldx/enc/zbv_2445cl.enc
index 295a160879..e9b34915d6 100644
--- a/fonts/baskervaldx/enc/zbv_2445cl.enc
+++ b/fonts/baskervaldx/enc/zbv_2445cl.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_2445clcjz4phmdtjcoc2a4h5rd
-% Encoding created by otftotfm on Sat Nov 7 12:04:45 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:39 2020
% Command line follows encoding
/AutoEnc_2445clcjz4phmdtjcoc2a4h5rd [
%00
diff --git a/fonts/baskervaldx/enc/zbv_2kku7k.enc b/fonts/baskervaldx/enc/zbv_2kku7k.enc
index 19a0352f41..224eefaddf 100644
--- a/fonts/baskervaldx/enc/zbv_2kku7k.enc
+++ b/fonts/baskervaldx/enc/zbv_2kku7k.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_2kku7kcm5wly7dybkda76rsdpf
-% Encoding created by otftotfm on Sat Nov 7 12:04:44 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:40 2020
% Command line follows encoding
/AutoEnc_2kku7kcm5wly7dybkda76rsdpf [
%00
@@ -60,4 +60,4 @@
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
% --force --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=pnum --x-height=440 Baskervaldx-Bol.otf Baskervaldx-Bol-osf-ts1'
+% --feature=pnum --x-height=440 Baskervaldx-Bol.otf Baskervaldx-Bol-lf-ts1'
diff --git a/fonts/baskervaldx/enc/zbv_2n2qka.enc b/fonts/baskervaldx/enc/zbv_2n2qka.enc
new file mode 100644
index 0000000000..e37a170d58
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_2n2qka.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_2xv27p.enc b/fonts/baskervaldx/enc/zbv_2xv27p.enc
index 3f5cc01671..0347bba07f 100644
--- a/fonts/baskervaldx/enc/zbv_2xv27p.enc
+++ b/fonts/baskervaldx/enc/zbv_2xv27p.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_2xv27pysyywohrijxesrvjqzpf
-% Encoding created by otftotfm on Sat Nov 7 12:05:07 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:05 2020
% Command line follows encoding
/AutoEnc_2xv27pysyywohrijxesrvjqzpf [
%00
@@ -60,4 +60,4 @@
% --encoding-directory=texmf/fonts/enc/dvips/baskervaldx
% --map-file=texmf/fonts/map/dvips/baskervaldx/Baskervaldx.map --no-updmap
% --force --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=pnum --x-height=440 Baskervaldx-Reg.otf Baskervaldx-Reg-osf-ts1'
+% --feature=pnum --x-height=440 Baskervaldx-Reg.otf Baskervaldx-Reg-lf-ts1'
diff --git a/fonts/baskervaldx/enc/zbv_2zeho7.enc b/fonts/baskervaldx/enc/zbv_2zeho7.enc
index 51ecbfa90d..22cbe46ee2 100644
--- a/fonts/baskervaldx/enc/zbv_2zeho7.enc
+++ b/fonts/baskervaldx/enc/zbv_2zeho7.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_2zeho7tpl4cb2wmvwdwxorkwad
-% Encoding created by otftotfm on Sat Nov 7 12:05:10 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:06 2020
% Command line follows encoding
/AutoEnc_2zeho7tpl4cb2wmvwdwxorkwad [
%00
diff --git a/fonts/baskervaldx/enc/zbv_34qyyt.enc b/fonts/baskervaldx/enc/zbv_34qyyt.enc
index 7dbc25591b..7ea17329bf 100644
--- a/fonts/baskervaldx/enc/zbv_34qyyt.enc
+++ b/fonts/baskervaldx/enc/zbv_34qyyt.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_34qyytgb6qceg62ob7xrvohske
-% Encoding created by otftotfm on Sat Nov 7 12:04:57 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:54 2020
% Command line follows encoding
/AutoEnc_34qyytgb6qceg62ob7xrvohske [
%00
diff --git a/fonts/baskervaldx/enc/zbv_4f5bev.enc b/fonts/baskervaldx/enc/zbv_4f5bev.enc
new file mode 100644
index 0000000000..ee36527fc3
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_4f5bev.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_524fcc.enc b/fonts/baskervaldx/enc/zbv_524fcc.enc
index 860f89c14d..3dd016dfee 100644
--- a/fonts/baskervaldx/enc/zbv_524fcc.enc
+++ b/fonts/baskervaldx/enc/zbv_524fcc.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_524fccsk63ruknvfqih7oyfq5b
-% Encoding created by otftotfm on Sat Nov 7 12:04:49 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:45 2020
% Command line follows encoding
/AutoEnc_524fccsk63ruknvfqih7oyfq5b [
%00
diff --git a/fonts/baskervaldx/enc/zbv_556rta.enc b/fonts/baskervaldx/enc/zbv_556rta.enc
index a7e46093b5..d9170ce209 100644
--- a/fonts/baskervaldx/enc/zbv_556rta.enc
+++ b/fonts/baskervaldx/enc/zbv_556rta.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_556rtaluhcrdhujrkozipjsytd
-% Encoding created by otftotfm on Sat Nov 7 12:04:52 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:47 2020
% Command line follows encoding
/AutoEnc_556rtaluhcrdhujrkozipjsytd [
%00
diff --git a/fonts/baskervaldx/enc/zbv_5p6atn.enc b/fonts/baskervaldx/enc/zbv_5p6atn.enc
index 665d781bc0..2256138d2b 100644
--- a/fonts/baskervaldx/enc/zbv_5p6atn.enc
+++ b/fonts/baskervaldx/enc/zbv_5p6atn.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_5p6atnwvj2mdytoxgijggxmjwg
-% Encoding created by otftotfm on Sat Nov 7 12:04:49 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:45 2020
% Command line follows encoding
/AutoEnc_5p6atnwvj2mdytoxgijggxmjwg [
%00
diff --git a/fonts/baskervaldx/enc/zbv_5zt4ml.enc b/fonts/baskervaldx/enc/zbv_5zt4ml.enc
new file mode 100644
index 0000000000..ef2399432e
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_5zt4ml.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_6dnovg.enc b/fonts/baskervaldx/enc/zbv_6dnovg.enc
index faa52aaf3f..569c95c6a0 100644
--- a/fonts/baskervaldx/enc/zbv_6dnovg.enc
+++ b/fonts/baskervaldx/enc/zbv_6dnovg.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_6dnovg3dvjob6kjhfwfmlskxzb
-% Encoding created by otftotfm on Sat Nov 7 12:04:51 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:51 2020
% Command line follows encoding
/AutoEnc_6dnovg3dvjob6kjhfwfmlskxzb [
%00
diff --git a/fonts/baskervaldx/enc/zbv_6lr3v3.enc b/fonts/baskervaldx/enc/zbv_6lr3v3.enc
index d97c3b70dc..2b90386a07 100644
--- a/fonts/baskervaldx/enc/zbv_6lr3v3.enc
+++ b/fonts/baskervaldx/enc/zbv_6lr3v3.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_6lr3v3cnyme2fq6ng3y3ro37ra
-% Encoding created by otftotfm on Sat Nov 7 12:04:53 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:47 2020
% Command line follows encoding
/AutoEnc_6lr3v3cnyme2fq6ng3y3ro37ra [
%00
diff --git a/fonts/baskervaldx/enc/zbv_6rdtju.enc b/fonts/baskervaldx/enc/zbv_6rdtju.enc
new file mode 100644
index 0000000000..cfa5f9e3a5
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_6rdtju.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_6xreh4.enc b/fonts/baskervaldx/enc/zbv_6xreh4.enc
index 39663e87c5..03fd7d4626 100644
--- a/fonts/baskervaldx/enc/zbv_6xreh4.enc
+++ b/fonts/baskervaldx/enc/zbv_6xreh4.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_6xreh4pnrjysuqn5f53dm4wo3g
-% Encoding created by otftotfm on Sat Nov 7 12:04:42 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:43 2020
% Command line follows encoding
/AutoEnc_6xreh4pnrjysuqn5f53dm4wo3g [
%00
diff --git a/fonts/baskervaldx/enc/zbv_7d54ky.enc b/fonts/baskervaldx/enc/zbv_7d54ky.enc
index 63b6aaa50b..b766a4de73 100644
--- a/fonts/baskervaldx/enc/zbv_7d54ky.enc
+++ b/fonts/baskervaldx/enc/zbv_7d54ky.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_7d54kyoaxvmol2t35c7iq3y6xe
-% Encoding created by otftotfm on Sat Nov 7 12:04:48 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:42 2020
% Command line follows encoding
/AutoEnc_7d54kyoaxvmol2t35c7iq3y6xe [
%00
diff --git a/fonts/baskervaldx/enc/zbv_7i75ol.enc b/fonts/baskervaldx/enc/zbv_7i75ol.enc
index 47101f22ce..213380cc0a 100644
--- a/fonts/baskervaldx/enc/zbv_7i75ol.enc
+++ b/fonts/baskervaldx/enc/zbv_7i75ol.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_7i75olkkciwec6d43j3mtt2bdb
-% Encoding created by otftotfm on Sat Nov 7 12:04:46 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:39 2020
% Command line follows encoding
/AutoEnc_7i75olkkciwec6d43j3mtt2bdb [
%00
diff --git a/fonts/baskervaldx/enc/zbv_7nnme4.enc b/fonts/baskervaldx/enc/zbv_7nnme4.enc
new file mode 100644
index 0000000000..9e2fe42ded
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_7nnme4.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_ahc6ab.enc b/fonts/baskervaldx/enc/zbv_ahc6ab.enc
index 2481ae026d..0d0db7e729 100644
--- a/fonts/baskervaldx/enc/zbv_ahc6ab.enc
+++ b/fonts/baskervaldx/enc/zbv_ahc6ab.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ahc6abgeimtyzud7lckd5gb3he
-% Encoding created by otftotfm on Sat Nov 7 12:04:47 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:41 2020
% Command line follows encoding
/AutoEnc_ahc6abgeimtyzud7lckd5gb3he [
%00
diff --git a/fonts/baskervaldx/enc/zbv_ak7beg.enc b/fonts/baskervaldx/enc/zbv_ak7beg.enc
index 2b8d31e5f4..f2fe41924e 100644
--- a/fonts/baskervaldx/enc/zbv_ak7beg.enc
+++ b/fonts/baskervaldx/enc/zbv_ak7beg.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ak7beglb5xupddvuzzmqvyvlub
-% Encoding created by otftotfm on Sat Nov 7 12:04:44 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:44 2020
% Command line follows encoding
/AutoEnc_ak7beglb5xupddvuzzmqvyvlub [
%00
diff --git a/fonts/baskervaldx/enc/zbv_aorlch.enc b/fonts/baskervaldx/enc/zbv_aorlch.enc
index 69189d986c..251385de2c 100644
--- a/fonts/baskervaldx/enc/zbv_aorlch.enc
+++ b/fonts/baskervaldx/enc/zbv_aorlch.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_aorlch2moob47bw2wj2kgq2chg
-% Encoding created by otftotfm on Sat Nov 7 12:05:13 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:11 2020
% Command line follows encoding
/AutoEnc_aorlch2moob47bw2wj2kgq2chg [
%00
diff --git a/fonts/baskervaldx/enc/zbv_auq4k5.enc b/fonts/baskervaldx/enc/zbv_auq4k5.enc
index 83873776b5..b6338ee3b2 100644
--- a/fonts/baskervaldx/enc/zbv_auq4k5.enc
+++ b/fonts/baskervaldx/enc/zbv_auq4k5.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_auq4k5bmamac2evbci4vhavgoa
-% Encoding created by otftotfm on Sat Nov 7 12:05:08 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:04 2020
% Command line follows encoding
/AutoEnc_auq4k5bmamac2evbci4vhavgoa [
%00
diff --git a/fonts/baskervaldx/enc/zbv_awcfcx.enc b/fonts/baskervaldx/enc/zbv_awcfcx.enc
new file mode 100644
index 0000000000..19c4110c4c
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_awcfcx.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_ax2yo2.enc b/fonts/baskervaldx/enc/zbv_ax2yo2.enc
index 8e576d9a2d..1881353a6a 100644
--- a/fonts/baskervaldx/enc/zbv_ax2yo2.enc
+++ b/fonts/baskervaldx/enc/zbv_ax2yo2.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ax2yo2md7mqvdlsmzz5ptqbusa
-% Encoding created by otftotfm on Sat Nov 7 12:05:10 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:07 2020
% Command line follows encoding
/AutoEnc_ax2yo2md7mqvdlsmzz5ptqbusa [
%00
diff --git a/fonts/baskervaldx/enc/zbv_ax7osu.enc b/fonts/baskervaldx/enc/zbv_ax7osu.enc
index d91367539a..93d5236ffe 100644
--- a/fonts/baskervaldx/enc/zbv_ax7osu.enc
+++ b/fonts/baskervaldx/enc/zbv_ax7osu.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ax7osueln5h74x4wjzienucs4c
-% Encoding created by otftotfm on Sat Nov 7 12:04:45 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:39 2020
% Command line follows encoding
/AutoEnc_ax7osueln5h74x4wjzienucs4c [
%00
diff --git a/fonts/baskervaldx/enc/zbv_c3asvt.enc b/fonts/baskervaldx/enc/zbv_c3asvt.enc
index 28331449e6..6968d31b3e 100644
--- a/fonts/baskervaldx/enc/zbv_c3asvt.enc
+++ b/fonts/baskervaldx/enc/zbv_c3asvt.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_c3asvtrmceaurcmitku3ovyigd
-% Encoding created by otftotfm on Sat Nov 7 12:04:43 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:43 2020
% Command line follows encoding
/AutoEnc_c3asvtrmceaurcmitku3ovyigd [
%00
diff --git a/fonts/baskervaldx/enc/zbv_ck4t6h.enc b/fonts/baskervaldx/enc/zbv_ck4t6h.enc
new file mode 100644
index 0000000000..79936dc807
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_ck4t6h.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_cl2iyt.enc b/fonts/baskervaldx/enc/zbv_cl2iyt.enc
index 8acc3d573a..23f3369e58 100644
--- a/fonts/baskervaldx/enc/zbv_cl2iyt.enc
+++ b/fonts/baskervaldx/enc/zbv_cl2iyt.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_cl2iyt4q4gotnepwo7qht5pffe
-% Encoding created by otftotfm on Sat Nov 7 12:04:51 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:51 2020
% Command line follows encoding
/AutoEnc_cl2iyt4q4gotnepwo7qht5pffe [
%00
diff --git a/fonts/baskervaldx/enc/zbv_clcsgf.enc b/fonts/baskervaldx/enc/zbv_clcsgf.enc
index ff44a7681c..5c614986c6 100644
--- a/fonts/baskervaldx/enc/zbv_clcsgf.enc
+++ b/fonts/baskervaldx/enc/zbv_clcsgf.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_clcsgfmsxiejpujbrvzfl7l73a
-% Encoding created by otftotfm on Sat Nov 7 12:04:57 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:54 2020
% Command line follows encoding
/AutoEnc_clcsgfmsxiejpujbrvzfl7l73a [
%00
diff --git a/fonts/baskervaldx/enc/zbv_coqtyh.enc b/fonts/baskervaldx/enc/zbv_coqtyh.enc
new file mode 100644
index 0000000000..e532b1e3c8
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_coqtyh.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_cv7nez.enc b/fonts/baskervaldx/enc/zbv_cv7nez.enc
index 576c163554..3256658cb9 100644
--- a/fonts/baskervaldx/enc/zbv_cv7nez.enc
+++ b/fonts/baskervaldx/enc/zbv_cv7nez.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_cv7nezwnux743su522xyzonyzd
-% Encoding created by otftotfm on Sat Nov 7 12:04:46 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:40 2020
% Command line follows encoding
/AutoEnc_cv7nezwnux743su522xyzonyzd [
%00
diff --git a/fonts/baskervaldx/enc/zbv_d7elqy.enc b/fonts/baskervaldx/enc/zbv_d7elqy.enc
index cdb284fa76..9e4695822f 100644
--- a/fonts/baskervaldx/enc/zbv_d7elqy.enc
+++ b/fonts/baskervaldx/enc/zbv_d7elqy.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_d7elqy62lxefkr7upajub5jsuh
-% Encoding created by otftotfm on Sat Nov 7 12:04:54 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:49 2020
% Command line follows encoding
/AutoEnc_d7elqy62lxefkr7upajub5jsuh [
%00
diff --git a/fonts/baskervaldx/enc/zbv_d7lahw.enc b/fonts/baskervaldx/enc/zbv_d7lahw.enc
index ea4d893ffe..22b99e9a35 100644
--- a/fonts/baskervaldx/enc/zbv_d7lahw.enc
+++ b/fonts/baskervaldx/enc/zbv_d7lahw.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_d7lahwfwba4chqxsug6zj4gxle
-% Encoding created by otftotfm on Sat Nov 7 12:04:46 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:40 2020
% Command line follows encoding
/AutoEnc_d7lahwfwba4chqxsug6zj4gxle [
%00
diff --git a/fonts/baskervaldx/enc/zbv_dbb2hd.enc b/fonts/baskervaldx/enc/zbv_dbb2hd.enc
index cb956b7167..9c18d2d160 100644
--- a/fonts/baskervaldx/enc/zbv_dbb2hd.enc
+++ b/fonts/baskervaldx/enc/zbv_dbb2hd.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_dbb2hdz4mxoqmb2atvvicvsmlc
-% Encoding created by otftotfm on Sat Nov 7 12:05:06 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:08 2020
% Command line follows encoding
/AutoEnc_dbb2hdz4mxoqmb2atvvicvsmlc [
%00
diff --git a/fonts/baskervaldx/enc/zbv_dw7i6y.enc b/fonts/baskervaldx/enc/zbv_dw7i6y.enc
index d75497fe28..1f203e691b 100644
--- a/fonts/baskervaldx/enc/zbv_dw7i6y.enc
+++ b/fonts/baskervaldx/enc/zbv_dw7i6y.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_dw7i6yqyoyj4nzcygmonfyng2g
-% Encoding created by otftotfm on Sat Nov 7 12:04:43 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:43 2020
% Command line follows encoding
/AutoEnc_dw7i6yqyoyj4nzcygmonfyng2g [
%00
diff --git a/fonts/baskervaldx/enc/zbv_edkp5z.enc b/fonts/baskervaldx/enc/zbv_edkp5z.enc
index da17c0a67f..bf5f73fe54 100644
--- a/fonts/baskervaldx/enc/zbv_edkp5z.enc
+++ b/fonts/baskervaldx/enc/zbv_edkp5z.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_edkp5znu7fq4fhbngk4zsedhsb
-% Encoding created by otftotfm on Sat Nov 7 12:04:48 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:42 2020
% Command line follows encoding
/AutoEnc_edkp5znu7fq4fhbngk4zsedhsb [
%00
diff --git a/fonts/baskervaldx/enc/zbv_ezfzzx.enc b/fonts/baskervaldx/enc/zbv_ezfzzx.enc
index 93bdc574df..0b0585ecfd 100644
--- a/fonts/baskervaldx/enc/zbv_ezfzzx.enc
+++ b/fonts/baskervaldx/enc/zbv_ezfzzx.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ezfzzx4ozwtgay3k3tu37bfaga
-% Encoding created by otftotfm on Sat Nov 7 12:04:50 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:46 2020
% Command line follows encoding
/AutoEnc_ezfzzx4ozwtgay3k3tu37bfaga [
%00
diff --git a/fonts/baskervaldx/enc/zbv_feassy.enc b/fonts/baskervaldx/enc/zbv_feassy.enc
index e5347c4922..e8a90ce350 100644
--- a/fonts/baskervaldx/enc/zbv_feassy.enc
+++ b/fonts/baskervaldx/enc/zbv_feassy.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_feassyeh55xyfqcdeyj6hguvxe
-% Encoding created by otftotfm on Sat Nov 7 12:05:08 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:04 2020
% Command line follows encoding
/AutoEnc_feassyeh55xyfqcdeyj6hguvxe [
%00
diff --git a/fonts/baskervaldx/enc/zbv_g4f2qe.enc b/fonts/baskervaldx/enc/zbv_g4f2qe.enc
index d294994f49..10bdb67d95 100644
--- a/fonts/baskervaldx/enc/zbv_g4f2qe.enc
+++ b/fonts/baskervaldx/enc/zbv_g4f2qe.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_g4f2qe63swp76txfyq737xky3g
-% Encoding created by otftotfm on Sat Nov 7 12:04:49 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:45 2020
% Command line follows encoding
/AutoEnc_g4f2qe63swp76txfyq737xky3g [
%00
diff --git a/fonts/baskervaldx/enc/zbv_g5xsbp.enc b/fonts/baskervaldx/enc/zbv_g5xsbp.enc
index b85f784a5f..1d624f29d4 100644
--- a/fonts/baskervaldx/enc/zbv_g5xsbp.enc
+++ b/fonts/baskervaldx/enc/zbv_g5xsbp.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_g5xsbpya7iluds6igafdbo7gce
-% Encoding created by otftotfm on Sat Nov 7 12:05:08 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:04 2020
% Command line follows encoding
/AutoEnc_g5xsbpya7iluds6igafdbo7gce [
%00
diff --git a/fonts/baskervaldx/enc/zbv_gar3zb.enc b/fonts/baskervaldx/enc/zbv_gar3zb.enc
new file mode 100644
index 0000000000..5c2adcfa27
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_gar3zb.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_gjwmpg.enc b/fonts/baskervaldx/enc/zbv_gjwmpg.enc
new file mode 100644
index 0000000000..b70be536c1
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_gjwmpg.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_h4nqsn.enc b/fonts/baskervaldx/enc/zbv_h4nqsn.enc
new file mode 100644
index 0000000000..11c80e0e17
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_h4nqsn.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_ik76ei.enc b/fonts/baskervaldx/enc/zbv_ik76ei.enc
new file mode 100644
index 0000000000..036bf992eb
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_ik76ei.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_ilkd46.enc b/fonts/baskervaldx/enc/zbv_ilkd46.enc
new file mode 100644
index 0000000000..a4f5753bce
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_ilkd46.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_itooof.enc b/fonts/baskervaldx/enc/zbv_itooof.enc
index 517463a9d5..13260652e1 100644
--- a/fonts/baskervaldx/enc/zbv_itooof.enc
+++ b/fonts/baskervaldx/enc/zbv_itooof.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_itooofapbjcbqioljlelckteib
-% Encoding created by otftotfm on Sat Nov 7 12:05:11 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:10 2020
% Command line follows encoding
/AutoEnc_itooofapbjcbqioljlelckteib [
%00
diff --git a/fonts/baskervaldx/enc/zbv_jwmruw.enc b/fonts/baskervaldx/enc/zbv_jwmruw.enc
new file mode 100644
index 0000000000..e5b69b3da9
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_jwmruw.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_k3ascw.enc b/fonts/baskervaldx/enc/zbv_k3ascw.enc
new file mode 100644
index 0000000000..8757553f03
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_k3ascw.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_k6hbcl.enc b/fonts/baskervaldx/enc/zbv_k6hbcl.enc
new file mode 100644
index 0000000000..f7ec17ff4e
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_k6hbcl.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_kq7kv3.enc b/fonts/baskervaldx/enc/zbv_kq7kv3.enc
index 8c66afb49c..105bf1ab40 100644
--- a/fonts/baskervaldx/enc/zbv_kq7kv3.enc
+++ b/fonts/baskervaldx/enc/zbv_kq7kv3.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_kq7kv3jrblhc66hwjivsgccozc
-% Encoding created by otftotfm on Sat Nov 7 12:04:47 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:41 2020
% Command line follows encoding
/AutoEnc_kq7kv3jrblhc66hwjivsgccozc [
%00
diff --git a/fonts/baskervaldx/enc/zbv_l44ess.enc b/fonts/baskervaldx/enc/zbv_l44ess.enc
index aec3505519..8574d5cd2c 100644
--- a/fonts/baskervaldx/enc/zbv_l44ess.enc
+++ b/fonts/baskervaldx/enc/zbv_l44ess.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_l44esskt5qgh2qbbbj6xyf5qod
-% Encoding created by otftotfm on Sat Nov 7 12:04:47 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:41 2020
% Command line follows encoding
/AutoEnc_l44esskt5qgh2qbbbj6xyf5qod [
%00
diff --git a/fonts/baskervaldx/enc/zbv_lewyuf.enc b/fonts/baskervaldx/enc/zbv_lewyuf.enc
new file mode 100644
index 0000000000..dd585f0969
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_lewyuf.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_lozoyg.enc b/fonts/baskervaldx/enc/zbv_lozoyg.enc
index 9882819ecf..09cd4cdd5b 100644
--- a/fonts/baskervaldx/enc/zbv_lozoyg.enc
+++ b/fonts/baskervaldx/enc/zbv_lozoyg.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_lozoygnii2a656syolm5qp3msh
-% Encoding created by otftotfm on Sat Nov 7 12:05:09 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:06 2020
% Command line follows encoding
/AutoEnc_lozoygnii2a656syolm5qp3msh [
%00
diff --git a/fonts/baskervaldx/enc/zbv_lxdjmd.enc b/fonts/baskervaldx/enc/zbv_lxdjmd.enc
index 88c0e7fb8d..e85275280f 100644
--- a/fonts/baskervaldx/enc/zbv_lxdjmd.enc
+++ b/fonts/baskervaldx/enc/zbv_lxdjmd.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_lxdjmdo3yi4uakbhthdmytxbwa
-% Encoding created by otftotfm on Sat Nov 7 12:05:12 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:10 2020
% Command line follows encoding
/AutoEnc_lxdjmdo3yi4uakbhthdmytxbwa [
%00
diff --git a/fonts/baskervaldx/enc/zbv_m4qttc.enc b/fonts/baskervaldx/enc/zbv_m4qttc.enc
index e11ea2bb88..f436f56807 100644
--- a/fonts/baskervaldx/enc/zbv_m4qttc.enc
+++ b/fonts/baskervaldx/enc/zbv_m4qttc.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_m4qttcde34bbuljb5qell65msf
-% Encoding created by otftotfm on Sat Nov 7 12:04:55 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:49 2020
% Command line follows encoding
/AutoEnc_m4qttcde34bbuljb5qell65msf [
%00
diff --git a/fonts/baskervaldx/enc/zbv_m5lkgj.enc b/fonts/baskervaldx/enc/zbv_m5lkgj.enc
index 11d973c047..85b1b16b62 100644
--- a/fonts/baskervaldx/enc/zbv_m5lkgj.enc
+++ b/fonts/baskervaldx/enc/zbv_m5lkgj.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_m5lkgj4qudin4jpdjjpepu5fbd
-% Encoding created by otftotfm on Sat Nov 7 12:04:47 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:41 2020
% Command line follows encoding
/AutoEnc_m5lkgj4qudin4jpdjjpepu5fbd [
%00
diff --git a/fonts/baskervaldx/enc/zbv_mu6kzn.enc b/fonts/baskervaldx/enc/zbv_mu6kzn.enc
index abdf9fdb2e..bb200d7db8 100644
--- a/fonts/baskervaldx/enc/zbv_mu6kzn.enc
+++ b/fonts/baskervaldx/enc/zbv_mu6kzn.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_mu6kznnzps66qklk67wmv7h4da
-% Encoding created by otftotfm on Sat Nov 7 12:05:09 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:05 2020
% Command line follows encoding
/AutoEnc_mu6kznnzps66qklk67wmv7h4da [
%00
diff --git a/fonts/baskervaldx/enc/zbv_mvsyl4.enc b/fonts/baskervaldx/enc/zbv_mvsyl4.enc
new file mode 100644
index 0000000000..06e726ae92
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_mvsyl4.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_mys6kl.enc b/fonts/baskervaldx/enc/zbv_mys6kl.enc
index 2e8039f487..69170fce30 100644
--- a/fonts/baskervaldx/enc/zbv_mys6kl.enc
+++ b/fonts/baskervaldx/enc/zbv_mys6kl.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_mys6klhd76vnvtmeil6vkj424e
-% Encoding created by otftotfm on Sat Nov 7 12:04:50 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:46 2020
% Command line follows encoding
/AutoEnc_mys6klhd76vnvtmeil6vkj424e [
%00
diff --git a/fonts/baskervaldx/enc/zbv_nt5h45.enc b/fonts/baskervaldx/enc/zbv_nt5h45.enc
index 69f74191c8..890a6d52d7 100644
--- a/fonts/baskervaldx/enc/zbv_nt5h45.enc
+++ b/fonts/baskervaldx/enc/zbv_nt5h45.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_nt5h45y27oslrvknavjpqhhksf
-% Encoding created by otftotfm on Sat Nov 7 12:05:07 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:09 2020
% Command line follows encoding
/AutoEnc_nt5h45y27oslrvknavjpqhhksf [
%00
diff --git a/fonts/baskervaldx/enc/zbv_nwv7yn.enc b/fonts/baskervaldx/enc/zbv_nwv7yn.enc
index 33fb2a2668..3f56f26ba7 100644
--- a/fonts/baskervaldx/enc/zbv_nwv7yn.enc
+++ b/fonts/baskervaldx/enc/zbv_nwv7yn.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_nwv7yngw254iit73oyg3eru5va
-% Encoding created by otftotfm on Sat Nov 7 12:04:48 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:44 2020
% Command line follows encoding
/AutoEnc_nwv7yngw254iit73oyg3eru5va [
%00
diff --git a/fonts/baskervaldx/enc/zbv_ofzzxu.enc b/fonts/baskervaldx/enc/zbv_ofzzxu.enc
index 4915bcf01a..8cde9a3d14 100644
--- a/fonts/baskervaldx/enc/zbv_ofzzxu.enc
+++ b/fonts/baskervaldx/enc/zbv_ofzzxu.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ofzzxugvjt4iveoitsf54pjbya
-% Encoding created by otftotfm on Sat Nov 7 12:05:07 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:08 2020
% Command line follows encoding
/AutoEnc_ofzzxugvjt4iveoitsf54pjbya [
%00
diff --git a/fonts/baskervaldx/enc/zbv_pqcihf.enc b/fonts/baskervaldx/enc/zbv_pqcihf.enc
index 637c0c9a7c..dd54004355 100644
--- a/fonts/baskervaldx/enc/zbv_pqcihf.enc
+++ b/fonts/baskervaldx/enc/zbv_pqcihf.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_pqcihfd54ntbmr34t6v44kzvth
-% Encoding created by otftotfm on Sat Nov 7 12:04:43 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:43 2020
% Command line follows encoding
/AutoEnc_pqcihfd54ntbmr34t6v44kzvth [
%00
diff --git a/fonts/baskervaldx/enc/zbv_puztjr.enc b/fonts/baskervaldx/enc/zbv_puztjr.enc
index fe89ebe8a5..685bfce717 100644
--- a/fonts/baskervaldx/enc/zbv_puztjr.enc
+++ b/fonts/baskervaldx/enc/zbv_puztjr.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_puztjr6hxbzqpwlgnhv3rvj63g
-% Encoding created by otftotfm on Sat Nov 7 12:05:13 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:12 2020
% Command line follows encoding
/AutoEnc_puztjr6hxbzqpwlgnhv3rvj63g [
%00
diff --git a/fonts/baskervaldx/enc/zbv_riybhr.enc b/fonts/baskervaldx/enc/zbv_riybhr.enc
new file mode 100644
index 0000000000..fba88cfe96
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_riybhr.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_rosua2.enc b/fonts/baskervaldx/enc/zbv_rosua2.enc
index faa2f3d44f..f436838e97 100644
--- a/fonts/baskervaldx/enc/zbv_rosua2.enc
+++ b/fonts/baskervaldx/enc/zbv_rosua2.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_rosua27w2vgdmvie6r6idz6fef
-% Encoding created by otftotfm on Sat Nov 7 12:04:53 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:47 2020
% Command line follows encoding
/AutoEnc_rosua27w2vgdmvie6r6idz6fef [
%00
diff --git a/fonts/baskervaldx/enc/zbv_scthrl.enc b/fonts/baskervaldx/enc/zbv_scthrl.enc
index 35cc3f1784..a89ae5fa7a 100644
--- a/fonts/baskervaldx/enc/zbv_scthrl.enc
+++ b/fonts/baskervaldx/enc/zbv_scthrl.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_scthrlgrf46g4ru7ugsqmu4eqe
-% Encoding created by otftotfm on Sat Nov 7 12:04:44 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:44 2020
% Command line follows encoding
/AutoEnc_scthrlgrf46g4ru7ugsqmu4eqe [
%00
diff --git a/fonts/baskervaldx/enc/zbv_sv3nex.enc b/fonts/baskervaldx/enc/zbv_sv3nex.enc
index c15b13a3a7..194af66428 100644
--- a/fonts/baskervaldx/enc/zbv_sv3nex.enc
+++ b/fonts/baskervaldx/enc/zbv_sv3nex.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_sv3nexcib6b6wigtpzf5xaedoa
-% Encoding created by otftotfm on Sat Nov 7 12:04:49 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:45 2020
% Command line follows encoding
/AutoEnc_sv3nexcib6b6wigtpzf5xaedoa [
%00
diff --git a/fonts/baskervaldx/enc/zbv_teykvl.enc b/fonts/baskervaldx/enc/zbv_teykvl.enc
index 3363a4f326..7c471c5c55 100644
--- a/fonts/baskervaldx/enc/zbv_teykvl.enc
+++ b/fonts/baskervaldx/enc/zbv_teykvl.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_teykvlyihbqgynxcl6fj4fqxwg
-% Encoding created by otftotfm on Sat Nov 7 12:05:06 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:08 2020
% Command line follows encoding
/AutoEnc_teykvlyihbqgynxcl6fj4fqxwg [
%00
diff --git a/fonts/baskervaldx/enc/zbv_tfcpq3.enc b/fonts/baskervaldx/enc/zbv_tfcpq3.enc
index efa04c00fc..46818e8bcf 100644
--- a/fonts/baskervaldx/enc/zbv_tfcpq3.enc
+++ b/fonts/baskervaldx/enc/zbv_tfcpq3.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_tfcpq3saobldyjjcnflq6e7ebb
-% Encoding created by otftotfm on Sat Nov 7 12:04:50 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:46 2020
% Command line follows encoding
/AutoEnc_tfcpq3saobldyjjcnflq6e7ebb [
%00
diff --git a/fonts/baskervaldx/enc/zbv_tnmdy3.enc b/fonts/baskervaldx/enc/zbv_tnmdy3.enc
index b7fda5b64a..0bac172e01 100644
--- a/fonts/baskervaldx/enc/zbv_tnmdy3.enc
+++ b/fonts/baskervaldx/enc/zbv_tnmdy3.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_tnmdy3nn4cay2wi3zjvuptcvud
-% Encoding created by otftotfm on Sat Nov 7 12:05:11 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:09 2020
% Command line follows encoding
/AutoEnc_tnmdy3nn4cay2wi3zjvuptcvud [
%00
diff --git a/fonts/baskervaldx/enc/zbv_tv7w6k.enc b/fonts/baskervaldx/enc/zbv_tv7w6k.enc
index 3c7305c8cf..782af3a70b 100644
--- a/fonts/baskervaldx/enc/zbv_tv7w6k.enc
+++ b/fonts/baskervaldx/enc/zbv_tv7w6k.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_tv7w6kbvjbicouxtdr5lk2ityg
-% Encoding created by otftotfm on Sat Nov 7 12:05:11 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:10 2020
% Command line follows encoding
/AutoEnc_tv7w6kbvjbicouxtdr5lk2ityg [
%00
diff --git a/fonts/baskervaldx/enc/zbv_uguye6.enc b/fonts/baskervaldx/enc/zbv_uguye6.enc
index dede213583..92df90af11 100644
--- a/fonts/baskervaldx/enc/zbv_uguye6.enc
+++ b/fonts/baskervaldx/enc/zbv_uguye6.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_uguye6ff5lwmzzjfq5jmztufde
-% Encoding created by otftotfm on Sat Nov 7 12:04:49 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:46 2020
% Command line follows encoding
/AutoEnc_uguye6ff5lwmzzjfq5jmztufde [
%00
diff --git a/fonts/baskervaldx/enc/zbv_untte3.enc b/fonts/baskervaldx/enc/zbv_untte3.enc
new file mode 100644
index 0000000000..8194d18a8e
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_untte3.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_upot5e.enc b/fonts/baskervaldx/enc/zbv_upot5e.enc
index 31ff74cff9..6d8626681a 100644
--- a/fonts/baskervaldx/enc/zbv_upot5e.enc
+++ b/fonts/baskervaldx/enc/zbv_upot5e.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_upot5er32yh7aqefwsrm3dhb3c
-% Encoding created by otftotfm on Sat Nov 7 12:04:56 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:53 2020
% Command line follows encoding
/AutoEnc_upot5er32yh7aqefwsrm3dhb3c [
%00
diff --git a/fonts/baskervaldx/enc/zbv_uy4eps.enc b/fonts/baskervaldx/enc/zbv_uy4eps.enc
index fe0ddfad77..4f44cac3e3 100644
--- a/fonts/baskervaldx/enc/zbv_uy4eps.enc
+++ b/fonts/baskervaldx/enc/zbv_uy4eps.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_uy4epss7oqjsigv7zvwm76cnpg
-% Encoding created by otftotfm on Sat Nov 7 12:05:11 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:07 2020
% Command line follows encoding
/AutoEnc_uy4epss7oqjsigv7zvwm76cnpg [
%00
diff --git a/fonts/baskervaldx/enc/zbv_v577lu.enc b/fonts/baskervaldx/enc/zbv_v577lu.enc
index edcb5fa282..490ba1ee74 100644
--- a/fonts/baskervaldx/enc/zbv_v577lu.enc
+++ b/fonts/baskervaldx/enc/zbv_v577lu.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_v577lubdhwnj456zi2kdiffvvh
-% Encoding created by otftotfm on Sat Nov 7 12:05:09 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:05 2020
% Command line follows encoding
/AutoEnc_v577lubdhwnj456zi2kdiffvvh [
%00
diff --git a/fonts/baskervaldx/enc/zbv_wg6wcc.enc b/fonts/baskervaldx/enc/zbv_wg6wcc.enc
index 7eb82bbe99..f94daa54a1 100644
--- a/fonts/baskervaldx/enc/zbv_wg6wcc.enc
+++ b/fonts/baskervaldx/enc/zbv_wg6wcc.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_wg6wcchsl6sooj7cwnaxear35d
-% Encoding created by otftotfm on Sat Nov 7 12:04:51 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:51 2020
% Command line follows encoding
/AutoEnc_wg6wcchsl6sooj7cwnaxear35d [
%00
diff --git a/fonts/baskervaldx/enc/zbv_wvrs5w.enc b/fonts/baskervaldx/enc/zbv_wvrs5w.enc
new file mode 100644
index 0000000000..e519c4fe3c
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_wvrs5w.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_xbckbj.enc b/fonts/baskervaldx/enc/zbv_xbckbj.enc
new file mode 100644
index 0000000000..d20a0b0dce
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_xbckbj.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_xebzk2.enc b/fonts/baskervaldx/enc/zbv_xebzk2.enc
index 6f902f73b0..bca5ac45bd 100644
--- a/fonts/baskervaldx/enc/zbv_xebzk2.enc
+++ b/fonts/baskervaldx/enc/zbv_xebzk2.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_xebzk252otkn3sjoycu4f7ijfb
-% Encoding created by otftotfm on Sat Nov 7 12:04:45 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:39 2020
% Command line follows encoding
/AutoEnc_xebzk252otkn3sjoycu4f7ijfb [
%00
diff --git a/fonts/baskervaldx/enc/zbv_xjuza2.enc b/fonts/baskervaldx/enc/zbv_xjuza2.enc
new file mode 100644
index 0000000000..46794caeb4
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_xjuza2.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_xotpaa.enc b/fonts/baskervaldx/enc/zbv_xotpaa.enc
index bb651caaed..68a5ac6cf1 100644
--- a/fonts/baskervaldx/enc/zbv_xotpaa.enc
+++ b/fonts/baskervaldx/enc/zbv_xotpaa.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_xotpaaq2oytwtzwo7nwcak6phc
-% Encoding created by otftotfm on Sat Nov 7 12:04:54 2020
+% Encoding created by otftotfm on Fri Dec 4 20:53:49 2020
% Command line follows encoding
/AutoEnc_xotpaaq2oytwtzwo7nwcak6phc [
%00
diff --git a/fonts/baskervaldx/enc/zbv_y62qbt.enc b/fonts/baskervaldx/enc/zbv_y62qbt.enc
index 1fbd0a06c7..21c27013ba 100644
--- a/fonts/baskervaldx/enc/zbv_y62qbt.enc
+++ b/fonts/baskervaldx/enc/zbv_y62qbt.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_y62qbtjammfityzwww4y2njpih
-% Encoding created by otftotfm on Sat Nov 7 12:05:10 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:06 2020
% Command line follows encoding
/AutoEnc_y62qbtjammfityzwww4y2njpih [
%00
diff --git a/fonts/baskervaldx/enc/zbv_y77okd.enc b/fonts/baskervaldx/enc/zbv_y77okd.enc
index ea018c98e7..df0d2e1c87 100644
--- a/fonts/baskervaldx/enc/zbv_y77okd.enc
+++ b/fonts/baskervaldx/enc/zbv_y77okd.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_y77okdkhzdothzhvxf5bykfayh
-% Encoding created by otftotfm on Sat Nov 7 12:05:12 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:11 2020
% Command line follows encoding
/AutoEnc_y77okdkhzdothzhvxf5bykfayh [
%00
diff --git a/fonts/baskervaldx/enc/zbv_yk4dqp.enc b/fonts/baskervaldx/enc/zbv_yk4dqp.enc
index ee71634809..7cf0ea84f6 100644
--- a/fonts/baskervaldx/enc/zbv_yk4dqp.enc
+++ b/fonts/baskervaldx/enc/zbv_yk4dqp.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_yk4dqp2hppqmbt7cudzwz4r6ob
-% Encoding created by otftotfm on Sat Nov 7 12:05:08 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:04 2020
% Command line follows encoding
/AutoEnc_yk4dqp2hppqmbt7cudzwz4r6ob [
%00
diff --git a/fonts/baskervaldx/enc/zbv_ymibyh.enc b/fonts/baskervaldx/enc/zbv_ymibyh.enc
new file mode 100644
index 0000000000..24aa6cb816
--- /dev/null
+++ b/fonts/baskervaldx/enc/zbv_ymibyh.enc
@@ -0,0 +1,66 @@
+% 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/fonts/baskervaldx/enc/zbv_zag37q.enc b/fonts/baskervaldx/enc/zbv_zag37q.enc
index 9bf01b83e2..902907267c 100644
--- a/fonts/baskervaldx/enc/zbv_zag37q.enc
+++ b/fonts/baskervaldx/enc/zbv_zag37q.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_zag37qd5knyi2zt2smz2ojhokd
-% Encoding created by otftotfm on Sat Nov 7 12:05:07 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:08 2020
% Command line follows encoding
/AutoEnc_zag37qd5knyi2zt2smz2ojhokd [
%00
diff --git a/fonts/baskervaldx/enc/zbv_zb3hlf.enc b/fonts/baskervaldx/enc/zbv_zb3hlf.enc
index 535922c3ea..571104b984 100644
--- a/fonts/baskervaldx/enc/zbv_zb3hlf.enc
+++ b/fonts/baskervaldx/enc/zbv_zb3hlf.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_zb3hlfm4fx343rwbb5prg57h3h
-% Encoding created by otftotfm on Sat Nov 7 12:05:12 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:10 2020
% Command line follows encoding
/AutoEnc_zb3hlfm4fx343rwbb5prg57h3h [
%00
diff --git a/fonts/baskervaldx/enc/zbv_zey2cz.enc b/fonts/baskervaldx/enc/zbv_zey2cz.enc
index 405c0c7911..f02a425473 100644
--- a/fonts/baskervaldx/enc/zbv_zey2cz.enc
+++ b/fonts/baskervaldx/enc/zbv_zey2cz.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_zey2czbewat4o7ikrhejlrmfjb
-% Encoding created by otftotfm on Sat Nov 7 12:05:06 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:07 2020
% Command line follows encoding
/AutoEnc_zey2czbewat4o7ikrhejlrmfjb [
%00
diff --git a/fonts/baskervaldx/enc/zbv_zkqdv4.enc b/fonts/baskervaldx/enc/zbv_zkqdv4.enc
index 0570fc0fd7..6014176378 100644
--- a/fonts/baskervaldx/enc/zbv_zkqdv4.enc
+++ b/fonts/baskervaldx/enc/zbv_zkqdv4.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_zkqdv4mxi2aqf7jza4fycpy2dh
-% Encoding created by otftotfm on Sat Nov 7 12:05:12 2020
+% Encoding created by otftotfm on Fri Dec 4 20:54:11 2020
% Command line follows encoding
/AutoEnc_zkqdv4mxi2aqf7jza4fycpy2dh [
%00
diff --git a/fonts/baskervaldx/map/Baskervaldx.map b/fonts/baskervaldx/map/Baskervaldx.map
index 2258d8fdd2..038f9c54ec 100644
--- a/fonts/baskervaldx/map/Baskervaldx.map
+++ b/fonts/baskervaldx/map/Baskervaldx.map
@@ -1,12 +1,5 @@
% Automatically maintained by otftotfm or other programs. Do not edit.
-Baskervaldx-Bol-osf-ot1 Baskervaldx-Bol "AutoEnc_6xreh4pnrjysuqn5f53dm4wo3g ReEncodeFont" <[zbv_6xreh4.enc <Baskervaldx-Bol.pfb
-Baskervaldx-Bol-osf-ly1--base Baskervaldx-Bol "AutoEnc_pqcihfd54ntbmr34t6v44kzvth ReEncodeFont" <[zbv_pqcihf.enc <Baskervaldx-Bol.pfb
-Baskervaldx-Bol-osf-t1--base Baskervaldx-Bol "AutoEnc_c3asvtrmceaurcmitku3ovyigd ReEncodeFont" <[zbv_c3asvt.enc <Baskervaldx-Bol.pfb
-Baskervaldx-Bol-osf-sc-ot1--base Baskervaldx-Bol "AutoEnc_dw7i6yqyoyj4nzcygmonfyng2g ReEncodeFont" <[zbv_dw7i6y.enc <Baskervaldx-Bol.pfb
-Baskervaldx-Bol-osf-sc-ly1--base Baskervaldx-Bol "AutoEnc_ak7beglb5xupddvuzzmqvyvlub ReEncodeFont" <[zbv_ak7beg.enc <Baskervaldx-Bol.pfb
-Baskervaldx-Bol-osf-sc-t1--base Baskervaldx-Bol "AutoEnc_scthrlgrf46g4ru7ugsqmu4eqe ReEncodeFont" <[zbv_scthrl.enc <Baskervaldx-Bol.pfb
-Baskervaldx-Bol-osf-ts1--base Baskervaldx-Bol "AutoEnc_2kku7kcm5wly7dybkda76rsdpf ReEncodeFont" <[zbv_2kku7k.enc <Baskervaldx-Bol.pfb
Baskervaldx-Bol-lf-ot1 Baskervaldx-Bol "AutoEnc_xebzk252otkn3sjoycu4f7ijfb ReEncodeFont" <[zbv_xebzk2.enc <Baskervaldx-Bol.pfb
Baskervaldx-Bol-lf-ly1--base Baskervaldx-Bol "AutoEnc_ax7osueln5h74x4wjzienucs4c ReEncodeFont" <[zbv_ax7osu.enc <Baskervaldx-Bol.pfb
Baskervaldx-Bol-lf-t1--base Baskervaldx-Bol "AutoEnc_2445clcjz4phmdtjcoc2a4h5rd ReEncodeFont" <[zbv_2445cl.enc <Baskervaldx-Bol.pfb
@@ -21,6 +14,13 @@ Baskervaldx-Bol-tlf-sc-ot1--base Baskervaldx-Bol "AutoEnc_kq7kv3jrblhc66hwjivsgc
Baskervaldx-Bol-tlf-sc-ly1--base Baskervaldx-Bol "AutoEnc_edkp5znu7fq4fhbngk4zsedhsb ReEncodeFont" <[zbv_edkp5z.enc <Baskervaldx-Bol.pfb
Baskervaldx-Bol-tlf-sc-t1--base Baskervaldx-Bol "AutoEnc_7d54kyoaxvmol2t35c7iq3y6xe ReEncodeFont" <[zbv_7d54ky.enc <Baskervaldx-Bol.pfb
Baskervaldx-Bol-tlf-ts1--base Baskervaldx-Bol "AutoEnc_2kku7kcm5wly7dybkda76rsdpf ReEncodeFont" <[zbv_2kku7k.enc <Baskervaldx-Bol.pfb
+Baskervaldx-Bol-osf-ot1 Baskervaldx-Bol "AutoEnc_6xreh4pnrjysuqn5f53dm4wo3g ReEncodeFont" <[zbv_6xreh4.enc <Baskervaldx-Bol.pfb
+Baskervaldx-Bol-osf-ly1--base Baskervaldx-Bol "AutoEnc_pqcihfd54ntbmr34t6v44kzvth ReEncodeFont" <[zbv_pqcihf.enc <Baskervaldx-Bol.pfb
+Baskervaldx-Bol-osf-t1--base Baskervaldx-Bol "AutoEnc_c3asvtrmceaurcmitku3ovyigd ReEncodeFont" <[zbv_c3asvt.enc <Baskervaldx-Bol.pfb
+Baskervaldx-Bol-osf-sc-ot1--base Baskervaldx-Bol "AutoEnc_dw7i6yqyoyj4nzcygmonfyng2g ReEncodeFont" <[zbv_dw7i6y.enc <Baskervaldx-Bol.pfb
+Baskervaldx-Bol-osf-sc-ly1--base Baskervaldx-Bol "AutoEnc_ak7beglb5xupddvuzzmqvyvlub ReEncodeFont" <[zbv_ak7beg.enc <Baskervaldx-Bol.pfb
+Baskervaldx-Bol-osf-sc-t1--base Baskervaldx-Bol "AutoEnc_scthrlgrf46g4ru7ugsqmu4eqe ReEncodeFont" <[zbv_scthrl.enc <Baskervaldx-Bol.pfb
+Baskervaldx-Bol-osf-ts1--base Baskervaldx-Bol "AutoEnc_2kku7kcm5wly7dybkda76rsdpf ReEncodeFont" <[zbv_2kku7k.enc <Baskervaldx-Bol.pfb
Baskervaldx-Bol-sup-ot1 Baskervaldx-Bol "AutoEnc_nwv7yngw254iit73oyg3eru5va ReEncodeFont" <[zbv_nwv7yn.enc <Baskervaldx-Bol.pfb
Baskervaldx-Bol-sup-ly1--base Baskervaldx-Bol "AutoEnc_5p6atnwvj2mdytoxgijggxmjwg ReEncodeFont" <[zbv_5p6atn.enc <Baskervaldx-Bol.pfb
Baskervaldx-Bol-sup-t1--base Baskervaldx-Bol "AutoEnc_sv3nexcib6b6wigtpzf5xaedoa ReEncodeFont" <[zbv_sv3nex.enc <Baskervaldx-Bol.pfb
@@ -31,13 +31,6 @@ Baskervaldx-Bol-tosf-sc-ot1--base Baskervaldx-Bol "AutoEnc_mys6klhd76vnvtmeil6vk
Baskervaldx-Bol-tosf-sc-ly1--base Baskervaldx-Bol "AutoEnc_ezfzzx4ozwtgay3k3tu37bfaga ReEncodeFont" <[zbv_ezfzzx.enc <Baskervaldx-Bol.pfb
Baskervaldx-Bol-tosf-sc-t1--base Baskervaldx-Bol "AutoEnc_tfcpq3saobldyjjcnflq6e7ebb ReEncodeFont" <[zbv_tfcpq3.enc <Baskervaldx-Bol.pfb
Baskervaldx-Bol-tosf-ts1--base Baskervaldx-Bol "AutoEnc_2kku7kcm5wly7dybkda76rsdpf ReEncodeFont" <[zbv_2kku7k.enc <Baskervaldx-Bol.pfb
-Baskervaldx-BolIta-osf-ot1 Baskervaldx-BolIta "AutoEnc_6dnovg3dvjob6kjhfwfmlskxzb ReEncodeFont" <[zbv_6dnovg.enc <Baskervaldx-BolIta.pfb
-Baskervaldx-BolIta-osf-ly1--base Baskervaldx-BolIta "AutoEnc_cl2iyt4q4gotnepwo7qht5pffe ReEncodeFont" <[zbv_cl2iyt.enc <Baskervaldx-BolIta.pfb
-Baskervaldx-BolIta-osf-t1--base Baskervaldx-BolIta "AutoEnc_wg6wcchsl6sooj7cwnaxear35d ReEncodeFont" <[zbv_wg6wcc.enc <Baskervaldx-BolIta.pfb
-Baskervaldx-BolIta-osf-sc-ot1--base Baskervaldx-BolIta "AutoEnc_dw7i6yqyoyj4nzcygmonfyng2g ReEncodeFont" <[zbv_dw7i6y.enc <Baskervaldx-BolIta.pfb
-Baskervaldx-BolIta-osf-sc-ly1--base Baskervaldx-BolIta "AutoEnc_ak7beglb5xupddvuzzmqvyvlub ReEncodeFont" <[zbv_ak7beg.enc <Baskervaldx-BolIta.pfb
-Baskervaldx-BolIta-osf-sc-t1--base Baskervaldx-BolIta "AutoEnc_scthrlgrf46g4ru7ugsqmu4eqe ReEncodeFont" <[zbv_scthrl.enc <Baskervaldx-BolIta.pfb
-Baskervaldx-BolIta-osf-ts1--base Baskervaldx-BolIta "AutoEnc_2kku7kcm5wly7dybkda76rsdpf ReEncodeFont" <[zbv_2kku7k.enc <Baskervaldx-BolIta.pfb
Baskervaldx-BolIta-lf-ot1 Baskervaldx-BolIta "AutoEnc_556rtaluhcrdhujrkozipjsytd ReEncodeFont" <[zbv_556rta.enc <Baskervaldx-BolIta.pfb
Baskervaldx-BolIta-lf-ly1--base Baskervaldx-BolIta "AutoEnc_rosua27w2vgdmvie6r6idz6fef ReEncodeFont" <[zbv_rosua2.enc <Baskervaldx-BolIta.pfb
Baskervaldx-BolIta-lf-t1--base Baskervaldx-BolIta "AutoEnc_6lr3v3cnyme2fq6ng3y3ro37ra ReEncodeFont" <[zbv_6lr3v3.enc <Baskervaldx-BolIta.pfb
@@ -52,6 +45,13 @@ Baskervaldx-BolIta-tlf-sc-ot1--base Baskervaldx-BolIta "AutoEnc_kq7kv3jrblhc66hw
Baskervaldx-BolIta-tlf-sc-ly1--base Baskervaldx-BolIta "AutoEnc_edkp5znu7fq4fhbngk4zsedhsb ReEncodeFont" <[zbv_edkp5z.enc <Baskervaldx-BolIta.pfb
Baskervaldx-BolIta-tlf-sc-t1--base Baskervaldx-BolIta "AutoEnc_7d54kyoaxvmol2t35c7iq3y6xe ReEncodeFont" <[zbv_7d54ky.enc <Baskervaldx-BolIta.pfb
Baskervaldx-BolIta-tlf-ts1--base Baskervaldx-BolIta "AutoEnc_2kku7kcm5wly7dybkda76rsdpf ReEncodeFont" <[zbv_2kku7k.enc <Baskervaldx-BolIta.pfb
+Baskervaldx-BolIta-osf-ot1 Baskervaldx-BolIta "AutoEnc_6dnovg3dvjob6kjhfwfmlskxzb ReEncodeFont" <[zbv_6dnovg.enc <Baskervaldx-BolIta.pfb
+Baskervaldx-BolIta-osf-ly1--base Baskervaldx-BolIta "AutoEnc_cl2iyt4q4gotnepwo7qht5pffe ReEncodeFont" <[zbv_cl2iyt.enc <Baskervaldx-BolIta.pfb
+Baskervaldx-BolIta-osf-t1--base Baskervaldx-BolIta "AutoEnc_wg6wcchsl6sooj7cwnaxear35d ReEncodeFont" <[zbv_wg6wcc.enc <Baskervaldx-BolIta.pfb
+Baskervaldx-BolIta-osf-sc-ot1--base Baskervaldx-BolIta "AutoEnc_dw7i6yqyoyj4nzcygmonfyng2g ReEncodeFont" <[zbv_dw7i6y.enc <Baskervaldx-BolIta.pfb
+Baskervaldx-BolIta-osf-sc-ly1--base Baskervaldx-BolIta "AutoEnc_ak7beglb5xupddvuzzmqvyvlub ReEncodeFont" <[zbv_ak7beg.enc <Baskervaldx-BolIta.pfb
+Baskervaldx-BolIta-osf-sc-t1--base Baskervaldx-BolIta "AutoEnc_scthrlgrf46g4ru7ugsqmu4eqe ReEncodeFont" <[zbv_scthrl.enc <Baskervaldx-BolIta.pfb
+Baskervaldx-BolIta-osf-ts1--base Baskervaldx-BolIta "AutoEnc_2kku7kcm5wly7dybkda76rsdpf ReEncodeFont" <[zbv_2kku7k.enc <Baskervaldx-BolIta.pfb
Baskervaldx-BolIta-sup-ot1 Baskervaldx-BolIta "AutoEnc_nwv7yngw254iit73oyg3eru5va ReEncodeFont" <[zbv_nwv7yn.enc <Baskervaldx-BolIta.pfb
Baskervaldx-BolIta-sup-ly1--base Baskervaldx-BolIta "AutoEnc_5p6atnwvj2mdytoxgijggxmjwg ReEncodeFont" <[zbv_5p6atn.enc <Baskervaldx-BolIta.pfb
Baskervaldx-BolIta-sup-t1--base Baskervaldx-BolIta "AutoEnc_sv3nexcib6b6wigtpzf5xaedoa ReEncodeFont" <[zbv_sv3nex.enc <Baskervaldx-BolIta.pfb
@@ -62,13 +62,6 @@ Baskervaldx-BolIta-tosf-sc-ot1--base Baskervaldx-BolIta "AutoEnc_mys6klhd76vnvtm
Baskervaldx-BolIta-tosf-sc-ly1--base Baskervaldx-BolIta "AutoEnc_ezfzzx4ozwtgay3k3tu37bfaga ReEncodeFont" <[zbv_ezfzzx.enc <Baskervaldx-BolIta.pfb
Baskervaldx-BolIta-tosf-sc-t1--base Baskervaldx-BolIta "AutoEnc_tfcpq3saobldyjjcnflq6e7ebb ReEncodeFont" <[zbv_tfcpq3.enc <Baskervaldx-BolIta.pfb
Baskervaldx-BolIta-tosf-ts1--base Baskervaldx-BolIta "AutoEnc_2kku7kcm5wly7dybkda76rsdpf ReEncodeFont" <[zbv_2kku7k.enc <Baskervaldx-BolIta.pfb
-Baskervaldx-Ita-osf-ot1 Baskervaldx-Ita "AutoEnc_6dnovg3dvjob6kjhfwfmlskxzb ReEncodeFont" <[zbv_6dnovg.enc <Baskervaldx-Ita.pfb
-Baskervaldx-Ita-osf-ly1--base Baskervaldx-Ita "AutoEnc_cl2iyt4q4gotnepwo7qht5pffe ReEncodeFont" <[zbv_cl2iyt.enc <Baskervaldx-Ita.pfb
-Baskervaldx-Ita-osf-t1--base Baskervaldx-Ita "AutoEnc_wg6wcchsl6sooj7cwnaxear35d ReEncodeFont" <[zbv_wg6wcc.enc <Baskervaldx-Ita.pfb
-Baskervaldx-Ita-osf-sc-ot1--base Baskervaldx-Ita "AutoEnc_dw7i6yqyoyj4nzcygmonfyng2g ReEncodeFont" <[zbv_dw7i6y.enc <Baskervaldx-Ita.pfb
-Baskervaldx-Ita-osf-sc-ly1--base Baskervaldx-Ita "AutoEnc_ak7beglb5xupddvuzzmqvyvlub ReEncodeFont" <[zbv_ak7beg.enc <Baskervaldx-Ita.pfb
-Baskervaldx-Ita-osf-sc-t1--base Baskervaldx-Ita "AutoEnc_scthrlgrf46g4ru7ugsqmu4eqe ReEncodeFont" <[zbv_scthrl.enc <Baskervaldx-Ita.pfb
-Baskervaldx-Ita-osf-ts1--base Baskervaldx-Ita "AutoEnc_2kku7kcm5wly7dybkda76rsdpf ReEncodeFont" <[zbv_2kku7k.enc <Baskervaldx-Ita.pfb
Baskervaldx-Ita-lf-ot1 Baskervaldx-Ita "AutoEnc_556rtaluhcrdhujrkozipjsytd ReEncodeFont" <[zbv_556rta.enc <Baskervaldx-Ita.pfb
Baskervaldx-Ita-lf-ly1--base Baskervaldx-Ita "AutoEnc_rosua27w2vgdmvie6r6idz6fef ReEncodeFont" <[zbv_rosua2.enc <Baskervaldx-Ita.pfb
Baskervaldx-Ita-lf-t1--base Baskervaldx-Ita "AutoEnc_6lr3v3cnyme2fq6ng3y3ro37ra ReEncodeFont" <[zbv_6lr3v3.enc <Baskervaldx-Ita.pfb
@@ -83,6 +76,13 @@ Baskervaldx-Ita-tlf-sc-ot1--base Baskervaldx-Ita "AutoEnc_kq7kv3jrblhc66hwjivsgc
Baskervaldx-Ita-tlf-sc-ly1--base Baskervaldx-Ita "AutoEnc_edkp5znu7fq4fhbngk4zsedhsb ReEncodeFont" <[zbv_edkp5z.enc <Baskervaldx-Ita.pfb
Baskervaldx-Ita-tlf-sc-t1--base Baskervaldx-Ita "AutoEnc_7d54kyoaxvmol2t35c7iq3y6xe ReEncodeFont" <[zbv_7d54ky.enc <Baskervaldx-Ita.pfb
Baskervaldx-Ita-tlf-ts1--base Baskervaldx-Ita "AutoEnc_2kku7kcm5wly7dybkda76rsdpf ReEncodeFont" <[zbv_2kku7k.enc <Baskervaldx-Ita.pfb
+Baskervaldx-Ita-osf-ot1 Baskervaldx-Ita "AutoEnc_6dnovg3dvjob6kjhfwfmlskxzb ReEncodeFont" <[zbv_6dnovg.enc <Baskervaldx-Ita.pfb
+Baskervaldx-Ita-osf-ly1--base Baskervaldx-Ita "AutoEnc_cl2iyt4q4gotnepwo7qht5pffe ReEncodeFont" <[zbv_cl2iyt.enc <Baskervaldx-Ita.pfb
+Baskervaldx-Ita-osf-t1--base Baskervaldx-Ita "AutoEnc_wg6wcchsl6sooj7cwnaxear35d ReEncodeFont" <[zbv_wg6wcc.enc <Baskervaldx-Ita.pfb
+Baskervaldx-Ita-osf-sc-ot1--base Baskervaldx-Ita "AutoEnc_dw7i6yqyoyj4nzcygmonfyng2g ReEncodeFont" <[zbv_dw7i6y.enc <Baskervaldx-Ita.pfb
+Baskervaldx-Ita-osf-sc-ly1--base Baskervaldx-Ita "AutoEnc_ak7beglb5xupddvuzzmqvyvlub ReEncodeFont" <[zbv_ak7beg.enc <Baskervaldx-Ita.pfb
+Baskervaldx-Ita-osf-sc-t1--base Baskervaldx-Ita "AutoEnc_scthrlgrf46g4ru7ugsqmu4eqe ReEncodeFont" <[zbv_scthrl.enc <Baskervaldx-Ita.pfb
+Baskervaldx-Ita-osf-ts1--base Baskervaldx-Ita "AutoEnc_2kku7kcm5wly7dybkda76rsdpf ReEncodeFont" <[zbv_2kku7k.enc <Baskervaldx-Ita.pfb
Baskervaldx-Ita-sup-ot1 Baskervaldx-Ita "AutoEnc_nwv7yngw254iit73oyg3eru5va ReEncodeFont" <[zbv_nwv7yn.enc <Baskervaldx-Ita.pfb
Baskervaldx-Ita-sup-ly1--base Baskervaldx-Ita "AutoEnc_5p6atnwvj2mdytoxgijggxmjwg ReEncodeFont" <[zbv_5p6atn.enc <Baskervaldx-Ita.pfb
Baskervaldx-Ita-sup-t1--base Baskervaldx-Ita "AutoEnc_sv3nexcib6b6wigtpzf5xaedoa ReEncodeFont" <[zbv_sv3nex.enc <Baskervaldx-Ita.pfb
@@ -93,13 +93,6 @@ Baskervaldx-Ita-tosf-sc-ot1--base Baskervaldx-Ita "AutoEnc_mys6klhd76vnvtmeil6vk
Baskervaldx-Ita-tosf-sc-ly1--base Baskervaldx-Ita "AutoEnc_ezfzzx4ozwtgay3k3tu37bfaga ReEncodeFont" <[zbv_ezfzzx.enc <Baskervaldx-Ita.pfb
Baskervaldx-Ita-tosf-sc-t1--base Baskervaldx-Ita "AutoEnc_tfcpq3saobldyjjcnflq6e7ebb ReEncodeFont" <[zbv_tfcpq3.enc <Baskervaldx-Ita.pfb
Baskervaldx-Ita-tosf-ts1--base Baskervaldx-Ita "AutoEnc_2kku7kcm5wly7dybkda76rsdpf ReEncodeFont" <[zbv_2kku7k.enc <Baskervaldx-Ita.pfb
-Baskervaldx-Reg-osf-ot1 Baskervaldx-Reg "AutoEnc_zey2czbewat4o7ikrhejlrmfjb ReEncodeFont" <[zbv_zey2cz.enc <Baskervaldx-Reg.pfb
-Baskervaldx-Reg-osf-ly1--base Baskervaldx-Reg "AutoEnc_dbb2hdz4mxoqmb2atvvicvsmlc ReEncodeFont" <[zbv_dbb2hd.enc <Baskervaldx-Reg.pfb
-Baskervaldx-Reg-osf-t1--base Baskervaldx-Reg "AutoEnc_teykvlyihbqgynxcl6fj4fqxwg ReEncodeFont" <[zbv_teykvl.enc <Baskervaldx-Reg.pfb
-Baskervaldx-Reg-osf-sc-ot1--base Baskervaldx-Reg "AutoEnc_zag37qd5knyi2zt2smz2ojhokd ReEncodeFont" <[zbv_zag37q.enc <Baskervaldx-Reg.pfb
-Baskervaldx-Reg-osf-sc-ly1--base Baskervaldx-Reg "AutoEnc_ofzzxugvjt4iveoitsf54pjbya ReEncodeFont" <[zbv_ofzzxu.enc <Baskervaldx-Reg.pfb
-Baskervaldx-Reg-osf-sc-t1--base Baskervaldx-Reg "AutoEnc_nt5h45y27oslrvknavjpqhhksf ReEncodeFont" <[zbv_nt5h45.enc <Baskervaldx-Reg.pfb
-Baskervaldx-Reg-osf-ts1--base Baskervaldx-Reg "AutoEnc_2xv27pysyywohrijxesrvjqzpf ReEncodeFont" <[zbv_2xv27p.enc <Baskervaldx-Reg.pfb
Baskervaldx-Reg-lf-ot1 Baskervaldx-Reg "AutoEnc_auq4k5bmamac2evbci4vhavgoa ReEncodeFont" <[zbv_auq4k5.enc <Baskervaldx-Reg.pfb
Baskervaldx-Reg-lf-ly1--base Baskervaldx-Reg "AutoEnc_yk4dqp2hppqmbt7cudzwz4r6ob ReEncodeFont" <[zbv_yk4dqp.enc <Baskervaldx-Reg.pfb
Baskervaldx-Reg-lf-t1--base Baskervaldx-Reg "AutoEnc_feassyeh55xyfqcdeyj6hguvxe ReEncodeFont" <[zbv_feassy.enc <Baskervaldx-Reg.pfb
@@ -114,6 +107,13 @@ Baskervaldx-Reg-tlf-sc-ot1--base Baskervaldx-Reg "AutoEnc_y62qbtjammfityzwww4y2n
Baskervaldx-Reg-tlf-sc-ly1--base Baskervaldx-Reg "AutoEnc_ax2yo2md7mqvdlsmzz5ptqbusa ReEncodeFont" <[zbv_ax2yo2.enc <Baskervaldx-Reg.pfb
Baskervaldx-Reg-tlf-sc-t1--base Baskervaldx-Reg "AutoEnc_uy4epss7oqjsigv7zvwm76cnpg ReEncodeFont" <[zbv_uy4eps.enc <Baskervaldx-Reg.pfb
Baskervaldx-Reg-tlf-ts1--base Baskervaldx-Reg "AutoEnc_2xv27pysyywohrijxesrvjqzpf ReEncodeFont" <[zbv_2xv27p.enc <Baskervaldx-Reg.pfb
+Baskervaldx-Reg-osf-ot1 Baskervaldx-Reg "AutoEnc_zey2czbewat4o7ikrhejlrmfjb ReEncodeFont" <[zbv_zey2cz.enc <Baskervaldx-Reg.pfb
+Baskervaldx-Reg-osf-ly1--base Baskervaldx-Reg "AutoEnc_dbb2hdz4mxoqmb2atvvicvsmlc ReEncodeFont" <[zbv_dbb2hd.enc <Baskervaldx-Reg.pfb
+Baskervaldx-Reg-osf-t1--base Baskervaldx-Reg "AutoEnc_teykvlyihbqgynxcl6fj4fqxwg ReEncodeFont" <[zbv_teykvl.enc <Baskervaldx-Reg.pfb
+Baskervaldx-Reg-osf-sc-ot1--base Baskervaldx-Reg "AutoEnc_zag37qd5knyi2zt2smz2ojhokd ReEncodeFont" <[zbv_zag37q.enc <Baskervaldx-Reg.pfb
+Baskervaldx-Reg-osf-sc-ly1--base Baskervaldx-Reg "AutoEnc_ofzzxugvjt4iveoitsf54pjbya ReEncodeFont" <[zbv_ofzzxu.enc <Baskervaldx-Reg.pfb
+Baskervaldx-Reg-osf-sc-t1--base Baskervaldx-Reg "AutoEnc_nt5h45y27oslrvknavjpqhhksf ReEncodeFont" <[zbv_nt5h45.enc <Baskervaldx-Reg.pfb
+Baskervaldx-Reg-osf-ts1--base Baskervaldx-Reg "AutoEnc_2xv27pysyywohrijxesrvjqzpf ReEncodeFont" <[zbv_2xv27p.enc <Baskervaldx-Reg.pfb
Baskervaldx-Reg-sup-ot1 Baskervaldx-Reg "AutoEnc_tnmdy3nn4cay2wi3zjvuptcvud ReEncodeFont" <[zbv_tnmdy3.enc <Baskervaldx-Reg.pfb
Baskervaldx-Reg-sup-ly1--base Baskervaldx-Reg "AutoEnc_itooofapbjcbqioljlelckteib ReEncodeFont" <[zbv_itooof.enc <Baskervaldx-Reg.pfb
Baskervaldx-Reg-sup-t1--base Baskervaldx-Reg "AutoEnc_tv7w6kbvjbicouxtdr5lk2ityg ReEncodeFont" <[zbv_tv7w6k.enc <Baskervaldx-Reg.pfb
@@ -128,3 +128,36 @@ Baskervaldx-Bol-osf Baskervaldx-Bol " bvtabOsFEncoding ReEncodeFont " <[bvtabosf
Baskervaldx-osf Baskervaldx-Reg " bvtabOsFEncoding ReEncodeFont " <[bvtabosf.enc <Baskervaldx-Reg.pfb
Baskervaldx-BolIta-alph Baskervaldx-BolIta " bvalphEncoding ReEncodeFont " <[bvalph.enc <Baskervaldx-BolIta.pfb
Baskervaldx-Ita-alph Baskervaldx-Ita " bvalphEncoding ReEncodeFont " <[bvalph.enc <Baskervaldx-Ita.pfb
+% swash additions
+Baskervaldx-Bol-tlf-swash-ly1--base Baskervaldx-Bol "AutoEnc_ilkd46aigfzqhg3le4fcpfocqf ReEncodeFont" <[zbv_ilkd46.enc <Baskervaldx-Bol.pfb
+Baskervaldx-Bol-tlf-swash-t1--base Baskervaldx-Bol "AutoEnc_xbckbjmhsegmdrx6d7z3s2yexb ReEncodeFont" <[zbv_xbckbj.enc <Baskervaldx-Bol.pfb
+Baskervaldx-Bol-lf-swash-ly1--base Baskervaldx-Bol "AutoEnc_coqtyhutav3shublov3v7mj7lc ReEncodeFont" <[zbv_coqtyh.enc <Baskervaldx-Bol.pfb
+Baskervaldx-Bol-lf-swash-t1--base Baskervaldx-Bol "AutoEnc_jwmruw33a36orlze755tmbq3la ReEncodeFont" <[zbv_jwmruw.enc <Baskervaldx-Bol.pfb
+Baskervaldx-Bol-tosf-swash-ly1--base Baskervaldx-Bol "AutoEnc_wvrs5wkuggjzpkf2dkyingyljd ReEncodeFont" <[zbv_wvrs5w.enc <Baskervaldx-Bol.pfb
+Baskervaldx-Bol-tosf-swash-t1--base Baskervaldx-Bol "AutoEnc_ymibyhu5nhixfb4akzp6gaoe4f ReEncodeFont" <[zbv_ymibyh.enc <Baskervaldx-Bol.pfb
+Baskervaldx-Bol-osf-swash-ly1--base Baskervaldx-Bol "AutoEnc_7nnme4u5np63ko4nj4ngyw5k3f ReEncodeFont" <[zbv_7nnme4.enc <Baskervaldx-Bol.pfb
+Baskervaldx-Bol-osf-swash-t1--base Baskervaldx-Bol "AutoEnc_5zt4mlas6lf56cvtjcmhj2g36e ReEncodeFont" <[zbv_5zt4ml.enc <Baskervaldx-Bol.pfb
+Baskervaldx-BolIta-tlf-swash-ly1--base Baskervaldx-BolIta "AutoEnc_riybhrcgg6wqki2tenmyifz32a ReEncodeFont" <[zbv_riybhr.enc <Baskervaldx-BolIta.pfb
+Baskervaldx-BolIta-tlf-swash-t1--base Baskervaldx-BolIta "AutoEnc_awcfcxpoch2u5qntbnuuo646wc ReEncodeFont" <[zbv_awcfcx.enc <Baskervaldx-BolIta.pfb
+Baskervaldx-BolIta-lf-swash-ly1--base Baskervaldx-BolIta "AutoEnc_gjwmpgwr4l3wuzivfotxvjpitc ReEncodeFont" <[zbv_gjwmpg.enc <Baskervaldx-BolIta.pfb
+Baskervaldx-BolIta-lf-swash-t1--base Baskervaldx-BolIta "AutoEnc_6rdtjuwbf2t5gb6swrvdwpvl7e ReEncodeFont" <[zbv_6rdtju.enc <Baskervaldx-BolIta.pfb
+Baskervaldx-BolIta-tosf-swash-ly1--base Baskervaldx-BolIta "AutoEnc_4f5bev732umzmvxphjwohmqhof ReEncodeFont" <[zbv_4f5bev.enc <Baskervaldx-BolIta.pfb
+Baskervaldx-BolIta-tosf-swash-t1--base Baskervaldx-BolIta "AutoEnc_k3ascwzjjkfh6otcjzhd5s3gbd ReEncodeFont" <[zbv_k3ascw.enc <Baskervaldx-BolIta.pfb
+Baskervaldx-BolIta-osf-swash-ly1--base Baskervaldx-BolIta "AutoEnc_2n2qkajweopftoho3pgz2hqvee ReEncodeFont" <[zbv_2n2qka.enc <Baskervaldx-BolIta.pfb
+Baskervaldx-BolIta-osf-swash-t1--base Baskervaldx-BolIta "AutoEnc_lewyuf3qsaln6hawzmxijsooma ReEncodeFont" <[zbv_lewyuf.enc <Baskervaldx-BolIta.pfb
+Baskervaldx-Ita-tlf-swash-ly1--base Baskervaldx-Ita "AutoEnc_riybhrcgg6wqki2tenmyifz32a ReEncodeFont" <[zbv_riybhr.enc <Baskervaldx-Ita.pfb
+Baskervaldx-Ita-tlf-swash-t1--base Baskervaldx-Ita "AutoEnc_awcfcxpoch2u5qntbnuuo646wc ReEncodeFont" <[zbv_awcfcx.enc <Baskervaldx-Ita.pfb
+Baskervaldx-Ita-lf-swash-ly1--base Baskervaldx-Ita "AutoEnc_gjwmpgwr4l3wuzivfotxvjpitc ReEncodeFont" <[zbv_gjwmpg.enc <Baskervaldx-Ita.pfb
+Baskervaldx-Ita-lf-swash-t1--base Baskervaldx-Ita "AutoEnc_6rdtjuwbf2t5gb6swrvdwpvl7e ReEncodeFont" <[zbv_6rdtju.enc <Baskervaldx-Ita.pfb
+Baskervaldx-Ita-tosf-swash-ly1--base Baskervaldx-Ita "AutoEnc_4f5bev732umzmvxphjwohmqhof ReEncodeFont" <[zbv_4f5bev.enc <Baskervaldx-Ita.pfb
+Baskervaldx-Ita-tosf-swash-t1--base Baskervaldx-Ita "AutoEnc_k3ascwzjjkfh6otcjzhd5s3gbd ReEncodeFont" <[zbv_k3ascw.enc <Baskervaldx-Ita.pfb
+Baskervaldx-Ita-osf-swash-ly1--base Baskervaldx-Ita "AutoEnc_2n2qkajweopftoho3pgz2hqvee ReEncodeFont" <[zbv_2n2qka.enc <Baskervaldx-Ita.pfb
+Baskervaldx-Ita-osf-swash-t1--base Baskervaldx-Ita "AutoEnc_lewyuf3qsaln6hawzmxijsooma ReEncodeFont" <[zbv_lewyuf.enc <Baskervaldx-Ita.pfb
+Baskervaldx-Reg-tlf-swash-ly1--base Baskervaldx-Reg "AutoEnc_untte3zw5lnazywvzsipsratgd ReEncodeFont" <[zbv_untte3.enc <Baskervaldx-Reg.pfb
+Baskervaldx-Reg-tlf-swash-t1--base Baskervaldx-Reg "AutoEnc_ck4t6hhrgdojv6n4fek5gsl7rc ReEncodeFont" <[zbv_ck4t6h.enc <Baskervaldx-Reg.pfb
+Baskervaldx-Reg-lf-swash-ly1--base Baskervaldx-Reg "AutoEnc_ik76ei3opythdxyr5g7iixmu7b ReEncodeFont" <[zbv_ik76ei.enc <Baskervaldx-Reg.pfb
+Baskervaldx-Reg-lf-swash-t1--base Baskervaldx-Reg "AutoEnc_k6hbclrljuzqnly4lfzqassguh ReEncodeFont" <[zbv_k6hbcl.enc <Baskervaldx-Reg.pfb
+Baskervaldx-Reg-tosf-swash-ly1--base Baskervaldx-Reg "AutoEnc_h4nqsnqdpq6lzmvngmod3mx4ac ReEncodeFont" <[zbv_h4nqsn.enc <Baskervaldx-Reg.pfb
+Baskervaldx-Reg-tosf-swash-t1--base Baskervaldx-Reg "AutoEnc_mvsyl476dsmy3guqxezsy7vxed ReEncodeFont" <[zbv_mvsyl4.enc <Baskervaldx-Reg.pfb
+Baskervaldx-Reg-osf-swash-ly1--base Baskervaldx-Reg "AutoEnc_xjuza2tiuy4c22hy2gw7xgrueh ReEncodeFont" <[zbv_xjuza2.enc <Baskervaldx-Reg.pfb
+Baskervaldx-Reg-osf-swash-t1--base Baskervaldx-Reg "AutoEnc_gar3zbd2qzw6w3t4yxsu246aof ReEncodeFont" <[zbv_gar3zb.enc <Baskervaldx-Reg.pfb'''
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Bol-lf-swash-ly1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Bol-lf-swash-ly1--base.tfm
new file mode 100644
index 0000000000..83f0beaf2a
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Bol-lf-swash-ly1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Bol-lf-swash-ly1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Bol-lf-swash-ly1.tfm
new file mode 100644
index 0000000000..3d2638d3cb
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Bol-lf-swash-ly1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Bol-lf-swash-t1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Bol-lf-swash-t1--base.tfm
new file mode 100644
index 0000000000..eb172430a4
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Bol-lf-swash-t1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Bol-lf-swash-t1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Bol-lf-swash-t1.tfm
new file mode 100644
index 0000000000..2143f2986d
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Bol-lf-swash-t1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Bol-osf-swash-ly1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Bol-osf-swash-ly1--base.tfm
new file mode 100644
index 0000000000..475fa7bebf
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Bol-osf-swash-ly1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Bol-osf-swash-ly1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Bol-osf-swash-ly1.tfm
new file mode 100644
index 0000000000..a44192c7fd
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Bol-osf-swash-ly1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Bol-osf-swash-t1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Bol-osf-swash-t1--base.tfm
new file mode 100644
index 0000000000..d6bddd3fff
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Bol-osf-swash-t1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Bol-osf-swash-t1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Bol-osf-swash-t1.tfm
new file mode 100644
index 0000000000..55778985d3
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Bol-osf-swash-t1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Bol-tlf-swash-ly1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Bol-tlf-swash-ly1--base.tfm
new file mode 100644
index 0000000000..554f2eb62a
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Bol-tlf-swash-ly1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Bol-tlf-swash-ly1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Bol-tlf-swash-ly1.tfm
new file mode 100644
index 0000000000..61f39b0f60
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Bol-tlf-swash-ly1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Bol-tlf-swash-t1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Bol-tlf-swash-t1--base.tfm
new file mode 100644
index 0000000000..d5be167d5e
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Bol-tlf-swash-t1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Bol-tlf-swash-t1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Bol-tlf-swash-t1.tfm
new file mode 100644
index 0000000000..a8755354c2
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Bol-tlf-swash-t1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Bol-tosf-swash-ly1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Bol-tosf-swash-ly1--base.tfm
new file mode 100644
index 0000000000..37a92d6bde
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Bol-tosf-swash-ly1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Bol-tosf-swash-ly1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Bol-tosf-swash-ly1.tfm
new file mode 100644
index 0000000000..b28602bccf
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Bol-tosf-swash-ly1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Bol-tosf-swash-t1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Bol-tosf-swash-t1--base.tfm
new file mode 100644
index 0000000000..ab5ba700d1
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Bol-tosf-swash-t1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Bol-tosf-swash-t1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Bol-tosf-swash-t1.tfm
new file mode 100644
index 0000000000..9649644593
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Bol-tosf-swash-t1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-BolIta-lf-swash-ly1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-lf-swash-ly1--base.tfm
new file mode 100644
index 0000000000..c607da7101
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-lf-swash-ly1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-BolIta-lf-swash-ly1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-lf-swash-ly1.tfm
new file mode 100644
index 0000000000..c9ec4b7e73
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-lf-swash-ly1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-BolIta-lf-swash-t1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-lf-swash-t1--base.tfm
new file mode 100644
index 0000000000..d0e964d177
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-lf-swash-t1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-BolIta-lf-swash-t1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-lf-swash-t1.tfm
new file mode 100644
index 0000000000..fc9a7403da
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-lf-swash-t1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-BolIta-osf-swash-ly1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-osf-swash-ly1--base.tfm
new file mode 100644
index 0000000000..fa5653a0d1
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-osf-swash-ly1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-BolIta-osf-swash-ly1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-osf-swash-ly1.tfm
new file mode 100644
index 0000000000..29d8dc71f3
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-osf-swash-ly1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-BolIta-osf-swash-t1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-osf-swash-t1--base.tfm
new file mode 100644
index 0000000000..e30f0e89ae
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-osf-swash-t1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-BolIta-osf-swash-t1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-osf-swash-t1.tfm
new file mode 100644
index 0000000000..bca34c5b0c
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-osf-swash-t1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tlf-swash-ly1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tlf-swash-ly1--base.tfm
new file mode 100644
index 0000000000..be4c936cd5
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tlf-swash-ly1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tlf-swash-ly1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tlf-swash-ly1.tfm
new file mode 100644
index 0000000000..2a36ff0df4
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tlf-swash-ly1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tlf-swash-t1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tlf-swash-t1--base.tfm
new file mode 100644
index 0000000000..eb30b35cf9
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tlf-swash-t1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tlf-swash-t1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tlf-swash-t1.tfm
new file mode 100644
index 0000000000..ddda2e5901
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tlf-swash-t1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tosf-swash-ly1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tosf-swash-ly1--base.tfm
new file mode 100644
index 0000000000..10d0a7be84
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tosf-swash-ly1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tosf-swash-ly1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tosf-swash-ly1.tfm
new file mode 100644
index 0000000000..ccf36bd55b
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tosf-swash-ly1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tosf-swash-t1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tosf-swash-t1--base.tfm
new file mode 100644
index 0000000000..3ac05ef7a4
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tosf-swash-t1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tosf-swash-t1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tosf-swash-t1.tfm
new file mode 100644
index 0000000000..59b4298ff7
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-BolIta-tosf-swash-t1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Ita-lf-swash-ly1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Ita-lf-swash-ly1--base.tfm
new file mode 100644
index 0000000000..004c5f7311
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Ita-lf-swash-ly1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Ita-lf-swash-ly1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Ita-lf-swash-ly1.tfm
new file mode 100644
index 0000000000..f64b3931dc
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Ita-lf-swash-ly1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Ita-lf-swash-t1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Ita-lf-swash-t1--base.tfm
new file mode 100644
index 0000000000..c84a81e97c
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Ita-lf-swash-t1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Ita-lf-swash-t1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Ita-lf-swash-t1.tfm
new file mode 100644
index 0000000000..e3dc04e808
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Ita-lf-swash-t1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Ita-osf-swash-ly1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Ita-osf-swash-ly1--base.tfm
new file mode 100644
index 0000000000..c75e955638
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Ita-osf-swash-ly1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Ita-osf-swash-ly1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Ita-osf-swash-ly1.tfm
new file mode 100644
index 0000000000..7b6f3a8777
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Ita-osf-swash-ly1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Ita-osf-swash-t1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Ita-osf-swash-t1--base.tfm
new file mode 100644
index 0000000000..bf4780942b
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Ita-osf-swash-t1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Ita-osf-swash-t1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Ita-osf-swash-t1.tfm
new file mode 100644
index 0000000000..b7380e5e25
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Ita-osf-swash-t1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Ita-tlf-swash-ly1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Ita-tlf-swash-ly1--base.tfm
new file mode 100644
index 0000000000..1c0394298e
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Ita-tlf-swash-ly1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Ita-tlf-swash-ly1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Ita-tlf-swash-ly1.tfm
new file mode 100644
index 0000000000..bc3b5e808e
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Ita-tlf-swash-ly1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Ita-tlf-swash-t1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Ita-tlf-swash-t1--base.tfm
new file mode 100644
index 0000000000..db74bcd432
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Ita-tlf-swash-t1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Ita-tlf-swash-t1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Ita-tlf-swash-t1.tfm
new file mode 100644
index 0000000000..bcfc34a3ba
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Ita-tlf-swash-t1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Ita-tosf-swash-ly1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Ita-tosf-swash-ly1--base.tfm
new file mode 100644
index 0000000000..5542e7e684
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Ita-tosf-swash-ly1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Ita-tosf-swash-ly1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Ita-tosf-swash-ly1.tfm
new file mode 100644
index 0000000000..288d12ff53
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Ita-tosf-swash-ly1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Ita-tosf-swash-t1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Ita-tosf-swash-t1--base.tfm
new file mode 100644
index 0000000000..0e68ac50e8
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Ita-tosf-swash-t1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Ita-tosf-swash-t1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Ita-tosf-swash-t1.tfm
new file mode 100644
index 0000000000..5c94c5a5a9
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Ita-tosf-swash-t1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Reg-lf-swash-ly1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Reg-lf-swash-ly1--base.tfm
new file mode 100644
index 0000000000..34ee3eee7a
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Reg-lf-swash-ly1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Reg-lf-swash-ly1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Reg-lf-swash-ly1.tfm
new file mode 100644
index 0000000000..692647a69a
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Reg-lf-swash-ly1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Reg-lf-swash-t1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Reg-lf-swash-t1--base.tfm
new file mode 100644
index 0000000000..0393cff5d3
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Reg-lf-swash-t1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Reg-lf-swash-t1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Reg-lf-swash-t1.tfm
new file mode 100644
index 0000000000..b11976da73
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Reg-lf-swash-t1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Reg-osf-swash-ly1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Reg-osf-swash-ly1--base.tfm
new file mode 100644
index 0000000000..6d97ecafee
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Reg-osf-swash-ly1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Reg-osf-swash-ly1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Reg-osf-swash-ly1.tfm
new file mode 100644
index 0000000000..f862704940
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Reg-osf-swash-ly1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Reg-osf-swash-t1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Reg-osf-swash-t1--base.tfm
new file mode 100644
index 0000000000..7a8d08e5aa
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Reg-osf-swash-t1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Reg-osf-swash-t1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Reg-osf-swash-t1.tfm
new file mode 100644
index 0000000000..25c2f72f0f
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Reg-osf-swash-t1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Reg-tlf-swash-ly1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Reg-tlf-swash-ly1--base.tfm
new file mode 100644
index 0000000000..0de5bdeca7
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Reg-tlf-swash-ly1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Reg-tlf-swash-ly1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Reg-tlf-swash-ly1.tfm
new file mode 100644
index 0000000000..d33c41d158
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Reg-tlf-swash-ly1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Reg-tlf-swash-t1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Reg-tlf-swash-t1--base.tfm
new file mode 100644
index 0000000000..a9cee56934
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Reg-tlf-swash-t1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Reg-tlf-swash-t1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Reg-tlf-swash-t1.tfm
new file mode 100644
index 0000000000..2d66ad0f8e
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Reg-tlf-swash-t1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Reg-tosf-swash-ly1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Reg-tosf-swash-ly1--base.tfm
new file mode 100644
index 0000000000..fb3b6e50c3
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Reg-tosf-swash-ly1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Reg-tosf-swash-ly1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Reg-tosf-swash-ly1.tfm
new file mode 100644
index 0000000000..b259030d64
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Reg-tosf-swash-ly1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Reg-tosf-swash-t1--base.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Reg-tosf-swash-t1--base.tfm
new file mode 100644
index 0000000000..1bd7f3c7c8
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Reg-tosf-swash-t1--base.tfm
Binary files differ
diff --git a/fonts/baskervaldx/tfm/Baskervaldx-Reg-tosf-swash-t1.tfm b/fonts/baskervaldx/tfm/Baskervaldx-Reg-tosf-swash-t1.tfm
new file mode 100644
index 0000000000..ffd3f1a417
--- /dev/null
+++ b/fonts/baskervaldx/tfm/Baskervaldx-Reg-tosf-swash-t1.tfm
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Bol-lf-swash-ly1.vf b/fonts/baskervaldx/vf/Baskervaldx-Bol-lf-swash-ly1.vf
new file mode 100644
index 0000000000..8715d8bd3b
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Bol-lf-swash-ly1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Bol-lf-swash-t1.vf b/fonts/baskervaldx/vf/Baskervaldx-Bol-lf-swash-t1.vf
new file mode 100644
index 0000000000..d0c06c7d9c
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Bol-lf-swash-t1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Bol-osf-swash-ly1.vf b/fonts/baskervaldx/vf/Baskervaldx-Bol-osf-swash-ly1.vf
new file mode 100644
index 0000000000..4cf9955b03
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Bol-osf-swash-ly1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Bol-osf-swash-t1.vf b/fonts/baskervaldx/vf/Baskervaldx-Bol-osf-swash-t1.vf
new file mode 100644
index 0000000000..6ac712aaee
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Bol-osf-swash-t1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Bol-tlf-swash-ly1.vf b/fonts/baskervaldx/vf/Baskervaldx-Bol-tlf-swash-ly1.vf
new file mode 100644
index 0000000000..e43cf52597
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Bol-tlf-swash-ly1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Bol-tlf-swash-t1.vf b/fonts/baskervaldx/vf/Baskervaldx-Bol-tlf-swash-t1.vf
new file mode 100644
index 0000000000..5e7721e61e
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Bol-tlf-swash-t1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Bol-tosf-swash-ly1.vf b/fonts/baskervaldx/vf/Baskervaldx-Bol-tosf-swash-ly1.vf
new file mode 100644
index 0000000000..2ba6597f75
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Bol-tosf-swash-ly1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Bol-tosf-swash-t1.vf b/fonts/baskervaldx/vf/Baskervaldx-Bol-tosf-swash-t1.vf
new file mode 100644
index 0000000000..c25852ba46
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Bol-tosf-swash-t1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-BolIta-lf-swash-ly1.vf b/fonts/baskervaldx/vf/Baskervaldx-BolIta-lf-swash-ly1.vf
new file mode 100644
index 0000000000..812d2dbcde
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-BolIta-lf-swash-ly1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-BolIta-lf-swash-t1.vf b/fonts/baskervaldx/vf/Baskervaldx-BolIta-lf-swash-t1.vf
new file mode 100644
index 0000000000..fd6783930b
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-BolIta-lf-swash-t1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-BolIta-osf-swash-ly1.vf b/fonts/baskervaldx/vf/Baskervaldx-BolIta-osf-swash-ly1.vf
new file mode 100644
index 0000000000..dd0b637ead
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-BolIta-osf-swash-ly1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-BolIta-osf-swash-t1.vf b/fonts/baskervaldx/vf/Baskervaldx-BolIta-osf-swash-t1.vf
new file mode 100644
index 0000000000..4c73f3c064
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-BolIta-osf-swash-t1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-BolIta-tlf-swash-ly1.vf b/fonts/baskervaldx/vf/Baskervaldx-BolIta-tlf-swash-ly1.vf
new file mode 100644
index 0000000000..bf50418140
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-BolIta-tlf-swash-ly1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-BolIta-tlf-swash-t1.vf b/fonts/baskervaldx/vf/Baskervaldx-BolIta-tlf-swash-t1.vf
new file mode 100644
index 0000000000..826736fe78
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-BolIta-tlf-swash-t1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-BolIta-tosf-swash-ly1.vf b/fonts/baskervaldx/vf/Baskervaldx-BolIta-tosf-swash-ly1.vf
new file mode 100644
index 0000000000..7856d63659
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-BolIta-tosf-swash-ly1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-BolIta-tosf-swash-t1.vf b/fonts/baskervaldx/vf/Baskervaldx-BolIta-tosf-swash-t1.vf
new file mode 100644
index 0000000000..3c89e7fb71
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-BolIta-tosf-swash-t1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Ita-lf-swash-ly1.vf b/fonts/baskervaldx/vf/Baskervaldx-Ita-lf-swash-ly1.vf
new file mode 100644
index 0000000000..112020fd30
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Ita-lf-swash-ly1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Ita-lf-swash-t1.vf b/fonts/baskervaldx/vf/Baskervaldx-Ita-lf-swash-t1.vf
new file mode 100644
index 0000000000..3c3274cd70
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Ita-lf-swash-t1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Ita-osf-swash-ly1.vf b/fonts/baskervaldx/vf/Baskervaldx-Ita-osf-swash-ly1.vf
new file mode 100644
index 0000000000..8787e87418
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Ita-osf-swash-ly1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Ita-osf-swash-t1.vf b/fonts/baskervaldx/vf/Baskervaldx-Ita-osf-swash-t1.vf
new file mode 100644
index 0000000000..286b4ccbfb
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Ita-osf-swash-t1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Ita-tlf-swash-ly1.vf b/fonts/baskervaldx/vf/Baskervaldx-Ita-tlf-swash-ly1.vf
new file mode 100644
index 0000000000..9a474cdc5d
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Ita-tlf-swash-ly1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Ita-tlf-swash-t1.vf b/fonts/baskervaldx/vf/Baskervaldx-Ita-tlf-swash-t1.vf
new file mode 100644
index 0000000000..d946aac9d9
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Ita-tlf-swash-t1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Ita-tosf-swash-ly1.vf b/fonts/baskervaldx/vf/Baskervaldx-Ita-tosf-swash-ly1.vf
new file mode 100644
index 0000000000..2b76c2c440
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Ita-tosf-swash-ly1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Ita-tosf-swash-t1.vf b/fonts/baskervaldx/vf/Baskervaldx-Ita-tosf-swash-t1.vf
new file mode 100644
index 0000000000..0bb36760a0
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Ita-tosf-swash-t1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Reg-lf-swash-ly1.vf b/fonts/baskervaldx/vf/Baskervaldx-Reg-lf-swash-ly1.vf
new file mode 100644
index 0000000000..19ace927ca
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Reg-lf-swash-ly1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Reg-lf-swash-t1.vf b/fonts/baskervaldx/vf/Baskervaldx-Reg-lf-swash-t1.vf
new file mode 100644
index 0000000000..7349f4da04
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Reg-lf-swash-t1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Reg-osf-swash-ly1.vf b/fonts/baskervaldx/vf/Baskervaldx-Reg-osf-swash-ly1.vf
new file mode 100644
index 0000000000..97027ff3d4
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Reg-osf-swash-ly1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Reg-osf-swash-t1.vf b/fonts/baskervaldx/vf/Baskervaldx-Reg-osf-swash-t1.vf
new file mode 100644
index 0000000000..9084837d11
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Reg-osf-swash-t1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Reg-tlf-swash-ly1.vf b/fonts/baskervaldx/vf/Baskervaldx-Reg-tlf-swash-ly1.vf
new file mode 100644
index 0000000000..8c31a82802
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Reg-tlf-swash-ly1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Reg-tlf-swash-t1.vf b/fonts/baskervaldx/vf/Baskervaldx-Reg-tlf-swash-t1.vf
new file mode 100644
index 0000000000..77925039d6
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Reg-tlf-swash-t1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Reg-tosf-swash-ly1.vf b/fonts/baskervaldx/vf/Baskervaldx-Reg-tosf-swash-ly1.vf
new file mode 100644
index 0000000000..96974b690a
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Reg-tosf-swash-ly1.vf
Binary files differ
diff --git a/fonts/baskervaldx/vf/Baskervaldx-Reg-tosf-swash-t1.vf b/fonts/baskervaldx/vf/Baskervaldx-Reg-tosf-swash-t1.vf
new file mode 100644
index 0000000000..5e94e37592
--- /dev/null
+++ b/fonts/baskervaldx/vf/Baskervaldx-Reg-tosf-swash-t1.vf
Binary files differ
diff --git a/fonts/utilities/cjk-gs-integrate/ChangeLog b/fonts/utilities/cjk-gs-integrate/ChangeLog
index c09836b091..bac77bb47b 100644
--- a/fonts/utilities/cjk-gs-integrate/ChangeLog
+++ b/fonts/utilities/cjk-gs-integrate/ChangeLog
@@ -1,10 +1,126 @@
+2020-12-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * Release 20201206.0 (HEAD -> master) [0652eb8]
+
+2020-12-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * README (tag: 20201206.0, origin/master, origin/HEAD) [6ad1f11]
+
+2020-12-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * clean [6495a34]
+
+2020-11-28 Masamichi Hosoda <trueroad@users.noreply.github.com>
+
+ * Merge pull request #45 from trueroad/add-win32-symlink [f5269d3]
+
+2020-11-21 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Update README.md [13a4810]
+
+2020-11-21 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Add author [4fa99d7]
+
+2020-11-21 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Add compare files on Windows [42493f7]
+
+2020-11-21 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Remove `--hardlink` option [79c537a]
+
+2020-11-21 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Remove `--winbatch` option [cbe0bac]
+
+2020-11-21 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Use Windows symbolic link, hard link, copy by Win32 API [a2926da]
+
+2020-11-16 Hironobu Yamashita <aminophen@users.noreply.github.com>
+
+ * Merge pull request #43 from trueroad/remove-cp932-dependency [15856ab]
+
+2020-11-16 Hironobu Yamashita <aminophen@users.noreply.github.com>
+
+ * Merge pull request #44 from junkurihara/master [535653d]
+
+2020-11-16 Jun Kurihara <kurihara@ieee.org>
+
+ * Support macOS 11.0 Big Sur [caa0466]
+
+2020-03-23 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Add support for environments without Encode::Locale [7f0ebd9]
+
+2020-03-23 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Limit warning suppression range [09b2b51]
+
+2020-03-22 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Delete win32 encoding comment [576256d]
+
+2020-03-22 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Add output files encoding settings [b1baa54]
+
+2020-03-22 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Add backquote execution encoding settings [3903bdf]
+
+2020-03-22 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Add kpsewhich output encoding settings [e0eb8a0]
+
+2020-03-22 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Add filename encoding settings [eb67742]
+
+2020-03-22 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Add finding font absolute path encoding settings [63176b7]
+
+2020-03-22 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Add dumping database encoding settings [af2062d]
+
+2020-03-22 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Add reading database encoding settings [af69825]
+
+2020-03-21 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Add support for non-CP932 Windows [e13f078]
+
+2020-03-21 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Add `@ARGV` and `$0` encoding settings [0b44e94]
+
+2020-03-20 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Add standard input/output encoding settings [e738a74]
+
+2020-03-20 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Replace `$^W = 1` with `use warnings` [14fa341]
+
+2020-03-20 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Move `use` functions inside `if` block to out of the block [aae7d7f]
+
+2020-03-08 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * trailing CR in kpsewhich result [b18313b]
+
2020-03-07 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
- * Release 20200307.0 (HEAD -> master) [57531f5]
+ * Release 20200307.0 (tag: 20200307.0) [57531f5]
2020-03-07 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
- * cjk-gs-integrate-macos.pl: support Catalina (at least nothing is wrong) (origin/master, origin/HEAD) [d43852e]
+ * cjk-gs-integrate-macos.pl: support Catalina (at least nothing is wrong) [d43852e]
2020-03-07 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
diff --git a/fonts/utilities/cjk-gs-integrate/README.md b/fonts/utilities/cjk-gs-integrate/README.md
index a3081b78fd..6aed094819 100644
--- a/fonts/utilities/cjk-gs-integrate/README.md
+++ b/fonts/utilities/cjk-gs-integrate/README.md
@@ -54,15 +54,6 @@ Usage
-h, --help this help
`````
-#### Windows only options ####
-
-`````
- --hardlink create hardlinks instead of symlinks
- --winbatch [FILE] prepare a batch file for link generation, instead of
- generating links right away
- the batch file name defaults to makefontlinks.bat
-`````
-
#### Command like options ####
`````
@@ -216,8 +207,9 @@ Authors, Contributors, and Copyright
------------------------------------
The script and its documentation was written by Norbert Preining, based
-on research and work by Yusuke Kuroki, Yusuke Terada, Bruno Voisin,
-Hironobu Yamashita, Munehiro Yamamoto and the TeX Q&A wiki page.
+on research and work by Masamichi Hosoda, Yusuke Kuroki, Yusuke Terada,
+Bruno Voisin, Hironobu Yamashita, Munehiro Yamamoto and the TeX Q&A wiki
+page.
Maintained by Japanese TeX Development Community. For development, see
https://github.com/texjporg/cjk-gs-support
diff --git a/fonts/utilities/cjk-gs-integrate/cjk-gs-integrate.pl b/fonts/utilities/cjk-gs-integrate/cjk-gs-integrate.pl
index 270600e38f..68ea6e6198 100755
--- a/fonts/utilities/cjk-gs-integrate/cjk-gs-integrate.pl
+++ b/fonts/utilities/cjk-gs-integrate/cjk-gs-integrate.pl
@@ -6,6 +6,7 @@
# Copyright 2016-2020 by Japanese TeX Development Community
#
# This work is based on research and work by (in alphabetical order)
+# Masamichi Hosoda
# Yusuke Kuroki
# Yusuke Terada
# Bruno Voisin
@@ -31,30 +32,37 @@
#
# Note that symlink names should be consistent with ptex-fontmaps!
-$^W = 1;
use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
use File::Basename;
use File::Path qw(make_path);
use Cwd 'abs_path';
use strict;
+use warnings;
+use utf8;
+use feature 'state';
+use Encode;
+use Encode::Alias;
-(my $prg = basename($0)) =~ s/\.pl$//;
-my $version = '20200307.0';
+my $debug_msg_before_init;
+init_encode_locale ();
+
+binmode (STDIN, ':encoding(console_in)');
+binmode (STDOUT, ':encoding(console_out)');
+binmode (STDERR, ':encoding(console_out)');
+
+@ARGV = map{ decode('locale', $_) }@ARGV;
+
+(my $prg = basename(decode('locale', $0))) =~ s/\.pl$//;
+my $version = '20201206.0';
if (win32()) {
- # conversion between internal (utf-8) and console (cp932):
- # multibyte characters should be encoded in cp932 at least during
- # * kpathsea file search
- # * abs_path existence test
- # * input/output on console
- # * batch file output
- # routines. make sure all of these should be restricted to win32 mode!
- # TODO: what to do with $opt_fontdef, @opt_aliases and $opt_filelist,
- # with regard to encodings?
- use utf8;
- use Encode;
# some perl functions (symlink, -l test) does not work
print_warning("Sorry, we have only partial support for Windows!\n");
+
+ require Win32::API;
+ Win32::API->import ();
+ require File::Compare;
+ File::Compare->import ();
}
# The followings are installed by ptex-fontmaps (texjporg):
@@ -272,10 +280,6 @@ my $akotfps_pathpart = "dvips/ps2otfps";
my $akotfps_datafilename = "psnames-for-otf";
my $akotfps_datacontent = '';
-# if windows, we might create batch file for links
-my $winbatch = "makefontlinks.bat";
-my $winbatch_content = '';
-
# dump output for data file (for easy editing for users)
my $dump_datafile = "$prg-data.dat";
@@ -335,6 +339,10 @@ if (! GetOptions(
die "Try \"$0 --help\" for more information.\n";
}
+if ($debug_msg_before_init) {
+ print_debug ($debug_msg_before_init);
+}
+
sub win32 { return ($^O=~/^MSWin(32|64)$/i); }
sub macosx { return ($^O=~/^darwin$/i); }
my $nul = (win32() ? 'nul' : '/dev/null') ;
@@ -356,12 +364,15 @@ if (system("kpsewhich --version >$nul 2>&1 <$nul" ) != 0) {
if ($opt_debug >= 2) {
require Data::Dumper;
+ no warnings qw(once);
$Data::Dumper::Indent = 1;
}
my $zrlistttc = kpse_miscfont("zrlistttc.lua");
my $zrlistttc_available;
-chomp(my $zrlistttc_help = `texlua $zrlistttc 2>$nul`);
+my $cmdl = "texlua $zrlistttc 2>$nul";
+$cmdl = encode('locale', $cmdl);
+chomp(my $zrlistttc_help = `$cmdl`);
if ($?) {
if ($opt_strictpsname) {
print_error("The script 'zrlistttc.lua' not found, cannot proceed!\n");
@@ -385,7 +396,7 @@ if (macosx()) {
$macos_ver_major =~ s/^(\d+)\.(\d+).*/$1/;
my $macos_ver_minor = $macos_ver;
$macos_ver_minor =~ s/^(\d+)\.(\d+).*/$2/;
- if ($macos_ver_major==10 && $macos_ver_minor>=8) {
+ if ($macos_ver_major>=11 || ($macos_ver_major==10 && $macos_ver_minor>=8)) {
if (!$opt_cleanup && !$opt_fontdef && !@opt_fontdef_add) { # if built-in only
print_warning("Our built-in database does not support recent\n");
print_warning("versions of Mac OS (10.8 Mountain Lion or later)!\n");
@@ -402,7 +413,11 @@ if (defined($opt_texmflink)) {
if ($opt_texmflink eq '') {
# option was passed but didn't receive a value
# -> use TEXMFLOCAL
- chomp($foo = `kpsewhich -var-value=TEXMFLOCAL`);
+ $foo = `kpsewhich -var-value=TEXMFLOCAL`;
+ # We assume that the output of kpsewhich is
+ # the same as perl's locale (or active code page).
+ decode('locale', $foo);
+ chomp($foo);
} else {
# option was passed with an argument
# -> use it
@@ -417,7 +432,11 @@ if (defined($opt_akotfps)) {
if (defined($opt_texmflink)) {
$foo = $opt_texmflink;
} else {
- chomp($foo = `kpsewhich -var-value=TEXMFLOCAL`);
+ $foo = `kpsewhich -var-value=TEXMFLOCAL`;
+ # We assume that the output of kpsewhich is
+ # the same as perl's locale (or active code page).
+ decode('locale', $foo);
+ chomp($foo);
}
} else {
$foo = $opt_akotfps;
@@ -426,26 +445,10 @@ if (defined($opt_akotfps)) {
}
if (defined($opt_winbatch)) {
- if ($opt_winbatch ne '') {
- $winbatch = $opt_winbatch;
- }
- if (win32()) {
- $opt_winbatch = 1;
- unlink $winbatch if (-f $winbatch);
- } else {
- print_warning("ignoring --winbatch option due to non-Windows\n");
- $opt_winbatch = 0;
- }
-} else {
- $opt_winbatch = 0;
+ print_warning("ignoring --winbatch option due to being obsolete\n");
}
if ($opt_hardlink) {
- if (win32()) {
- $opt_hardlink = 1;
- } else {
- print_warning("ignoring --hardlink option due to non-Windows\n");
- $opt_hardlink = 0;
- }
+ print_warning("ignoring --hardlink option due to being obsolete\n");
}
if (defined($opt_dump_data)) {
@@ -453,7 +456,8 @@ if (defined($opt_dump_data)) {
$dump_datafile = $opt_dump_data;
}
$opt_dump_data = 1;
- unlink $dump_datafile if (-f $dump_datafile);
+ unlink encode('locale_fs', $dump_datafile)
+ if (-f encode('locale_fs', $dump_datafile));
} else {
$opt_dump_data = 0;
}
@@ -497,7 +501,7 @@ sub main {
if ($opt_dump_data) {
# with --dump-data, dump only effective database and exit
dump_font_database();
- if (-f $dump_datafile) {
+ if (-f encode('locale_fs', $dump_datafile)) {
print_info("*** Data dumped to $dump_datafile ***\n");
exit(0);
} else {
@@ -549,8 +553,8 @@ sub main {
$opt_output = $gsres;
}
}
- if (! -d $opt_output) {
- $dry_run || mkdir($opt_output) ||
+ if (! -d encode('locale_fs', $opt_output)) {
+ $dry_run || mkdir(encode('locale_fs', $opt_output)) ||
die("Cannot create directory $opt_output: $!");
}
if ($opt_cleanup) {
@@ -570,7 +574,6 @@ sub main {
print_info(($opt_remove ? "removing" : "generating") . " links, snippets and cidfmap.local for non-CID fonts ...\n");
do_nonotf_fonts();
}
- write_winbatch() if $opt_winbatch;
}
print_info(($opt_remove ? "removing" : "generating") . " snippets and cidfmap.aliases for font aliases ...\n");
do_aliases();
@@ -581,15 +584,6 @@ sub main {
system("mktexlsr");
}
print_info("finished\n");
- if ($opt_winbatch) {
- if (-f $winbatch) {
- print_info("*** Batch file $winbatch created ***\n");
- print_info("*** to complete, run it as administrator privilege.***\n");
- } else {
- print_error("Failed to create $winbatch!\n");
- exit(1);
- }
- }
}
sub do_all_fonts {
@@ -613,7 +607,8 @@ sub do_all_fonts {
# due to previous bugs
for my $class (%encode_list) {
for my $enc (@{$encode_list{$class}}) {
- unlink "$fontdest/$k-$enc" if (-f "$fontdest/$k-$enc");
+ unlink encode('locale_fs', "$fontdest/$k-$enc")
+ if (-f encode('locale_fs', "$fontdest/$k-$enc"));
}
}
#
@@ -646,8 +641,8 @@ sub do_all_fonts {
}
update_master_cidfmap('cidfmap.local');
# we are in cleanup mode, also remove cidfmap.local itself
- if (-f "$opt_output/$cidfmap_local_pathpart") {
- unlink "$opt_output/$cidfmap_local_pathpart";
+ if (-f encode('locale_fs', "$opt_output/$cidfmap_local_pathpart")) {
+ unlink encode('locale_fs', "$opt_output/$cidfmap_local_pathpart");
}
}
@@ -699,11 +694,13 @@ sub do_nonotf_fonts {
}
return if $dry_run;
if ($outp) {
- if (! -d "$opt_output/Init") {
- mkdir("$opt_output/Init") ||
+ if (! -d encode('locale_fs', "$opt_output/Init")) {
+ mkdir(encode('locale_fs', "$opt_output/Init")) ||
die("Cannot create directory $opt_output/Init: $!");
}
- open(FOO, ">$opt_output/$cidfmap_local_pathpart") ||
+ # It seems that tlgs can handle UTF-8 TTF filename in cidfmap.local.
+ open(FOO, ">:encoding(UTF-8)",
+ encode('locale_fs', "$opt_output/$cidfmap_local_pathpart")) ||
die("Cannot open $opt_output/$cidfmap_local_pathpart: $!");
print FOO $outp;
close(FOO);
@@ -775,8 +772,10 @@ sub do_aliases {
}
# special case for native CID fonts in ancient days
# if not readable, add aliases for substitution
- push @jal, "/HeiseiMin-W3 /Ryumin-Light ;" if (! -r "$ciddest/HeiseiMin-W3");
- push @jal, "/HeiseiKakuGo-W5 /GothicBBB-Medium ;" if (! -r "$ciddest/HeiseiKakuGo-W5");
+ push @jal, "/HeiseiMin-W3 /Ryumin-Light ;"
+ if (! -r encode('locale_fs', "$ciddest/HeiseiMin-W3"));
+ push @jal, "/HeiseiKakuGo-W5 /GothicBBB-Medium ;"
+ if (! -r encode('locale_fs', "$ciddest/HeiseiKakuGo-W5"));
#
$outp .= "\n% Japanese fonts\n" . join("\n", @jal) . "\n" if @jal;
$outp .= "\n% Korean fonts\n" . join("\n", @kal) . "\n" if @kal;
@@ -786,19 +785,21 @@ sub do_aliases {
#
return if $dry_run;
if ($outp && !$opt_remove) {
- if (! -d "$opt_output/Init") {
- mkdir("$opt_output/Init") ||
+ if (! -d encode('locale_fs', "$opt_output/Init")) {
+ mkdir(encode('locale_fs', "$opt_output/Init")) ||
die("Cannot create directory $opt_output/Init: $!");
}
- open(FOO, ">$opt_output/$cidfmap_aliases_pathpart") ||
+ open(FOO, ">:encoding(UTF-8)",
+ encode('locale_fs', "$opt_output/$cidfmap_aliases_pathpart")) ||
die("Cannot open $opt_output/$cidfmap_aliases_pathpart: $!");
print FOO $outp;
close(FOO);
}
update_master_cidfmap('cidfmap.aliases');
# if we are in cleanup mode, also remove cidfmap.aliases itself
- if (-f "$opt_output/$cidfmap_aliases_pathpart") {
- unlink "$opt_output/$cidfmap_aliases_pathpart" if $opt_cleanup;
+ if (-f encode('locale_fs', "$opt_output/$cidfmap_aliases_pathpart")) {
+ unlink encode('locale_fs', "$opt_output/$cidfmap_aliases_pathpart")
+ if $opt_cleanup;
}
}
@@ -815,11 +816,13 @@ sub do_cmaps {
# by others or distributed by gs itself
for my $class (%encode_list) {
for my $enc (@{$encode_list{$class}}) {
- if (-l "$cmapdest/$enc") {
- my $linkt = readlink("$cmapdest/$enc");
+ if (-l encode('locale_fs', "$cmapdest/$enc")) {
+ my $linkt = decode('locale_fs',
+ readlink(encode('locale_fs',
+ "$cmapdest/$enc")));
if ($linkt) {
if ($linkt eq search_cmap($enc)) {
- unlink("$cmapdest/$enc");
+ unlink(encode('locale_fs', "$cmapdest/$enc"));
}
}
}
@@ -828,7 +831,7 @@ sub do_cmaps {
return;
}
# add mode
- if (! -d "$cmapdest") {
+ if (! -d encode('locale_fs', "$cmapdest")) {
print_debug("Creating directory $cmapdest ...\n");
make_dir("$cmapdest", "cannot create CMap directory");
}
@@ -838,7 +841,7 @@ sub do_cmaps {
next if (!$fontdb{$1}{'available'});
}
for my $enc (@{$encode_list{$class}}) {
- if (! -f "$cmapdest/$enc") {
+ if (! -f encode('locale_fs', "$cmapdest/$enc")) {
print_debug("CMap $enc is not found in gs resource directory\n");
my $dest = search_cmap($enc);
if ($dest) {
@@ -858,7 +861,14 @@ sub search_cmap {
my ($cmap) = @_;
# search CMap with kpsewhich and cache
if (! exists $cmap_cache{$cmap}) {
- chomp($cmap_cache{$cmap} = `kpsewhich -format=cmap $cmap`);
+ my $cmdl = "kpsewhich -format=cmap $cmap";
+ $cmdl = encode('locale', $cmdl);
+ $cmap_cache{$cmap} = `$cmdl`;
+ # We assume that the output of kpsewhich is
+ # the same as perl's locale (or active code page).
+ $cmap_cache{$cmap} = decode('locale', $cmap_cache{$cmap});
+ chomp($cmap_cache{$cmap});
+ $cmap_cache{$cmap} =~ s/[\r\n]+\z//; # perl's chomp() on git-bash cannot strip CR of CRLF ??
}
return $cmap_cache{$cmap};
}
@@ -876,8 +886,8 @@ sub update_master_cidfmap {
my $cidfmap_master = "$opt_output/$cidfmap_pathpart";
print_info(sprintf("%s $add %s cidfmap file ...\n",
($opt_remove ? "removing" : "adding"), ($opt_remove ? "from" : "to")));
- if (-r $cidfmap_master) {
- open(FOO, "<", $cidfmap_master) ||
+ if (-r encode('locale_fs', $cidfmap_master)) {
+ open(FOO, "<:encoding(UTF-8)", encode('locale_fs', $cidfmap_master)) ||
die("Cannot open $cidfmap_master for reading: $!");
my $found = 0;
my $found_tl = 0;
@@ -916,7 +926,7 @@ sub update_master_cidfmap {
if ($opt_remove) {
if ($found || $found_tl) {
return if $dry_run;
- open(FOO, ">", $cidfmap_master) ||
+ open(FOO, ">:encoding(UTF-8)", encode('locale_fs', $cidfmap_master)) ||
die("Cannot clean up $cidfmap_master: $!");
print FOO $newmaster;
close FOO;
@@ -926,7 +936,7 @@ sub update_master_cidfmap {
print_info("$add already loaded in $cidfmap_master, no changes\n");
} else {
return if $dry_run;
- open(FOO, ">", $cidfmap_master) ||
+ open(FOO, ">:encoding(UTF-8)", encode('locale_fs', $cidfmap_master)) ||
die("Cannot open $cidfmap_master for appending: $!");
print FOO $newmaster;
print FOO "($add) .runlibfile\n";
@@ -936,7 +946,7 @@ sub update_master_cidfmap {
} else {
return if $dry_run;
return if $opt_remove;
- open(FOO, ">", $cidfmap_master) ||
+ open(FOO, ">:encoding(UTF-8)", encode('locale_fs', $cidfmap_master)) ||
die("Cannot open $cidfmap_master for writing: $!");
print FOO "($add) .runlibfile\n";
close(FOO);
@@ -987,10 +997,11 @@ sub generate_font_snippet {
}
for my $enc (@{$encode_list{$c}}) {
if ($opt_remove) {
- unlink "$fd/$n-$enc" if (-f "$fd/$n-$enc");
+ unlink encode('locale_fs', "$fd/$n-$enc")
+ if (-f encode('locale_fs', "$fd/$n-$enc"));
next;
}
- open(FOO, ">$fd/$n-$enc") ||
+ open(FOO, ">:encoding(UTF-8)", encode('locale_fs', "$fd/$n-$enc")) ||
die("cannot open $fd/$n-$enc for writing: $!");
print FOO "%!PS-Adobe-3.0 Resource-Font
%%DocumentNeededResources: $enc (CMap)
@@ -1053,16 +1064,16 @@ sub link_font {
}
my $target = "$cd/$n";
my $do_unlink = 0;
- if (-l $target) {
+ if (-l encode('locale_fs', $target)) {
if ($opt_cleanup) {
$do_unlink = 1;
} else {
- my $linkt = readlink($target);
+ my $linkt = decode('locale_fs', readlink(encode('locale_fs', $target)));
if ($linkt) {
if ($linkt eq $f) {
# case 1: exists, link, targets agree
$do_unlink = 1;
- } elsif (-r $linkt) {
+ } elsif (-r encode('locale_fs', $linkt)) {
# case 3: exists, link, targets different
if ($opt_force) {
print_info("Removing link $target due to --force!\n");
@@ -1081,12 +1092,24 @@ sub link_font {
exit(1);
}
}
- } elsif (-r $target) {
+ } elsif (-r encode('locale_fs', $target)) {
# case 4: exists, but not link (NTFS hardlink on win32 falls into this)
- if (-s $target) {
+ if (-s encode('locale_fs', $target)) {
if ($opt_force) {
print_info("Removing $target due to --force!\n");
$do_unlink = 1;
+ } elsif (win32()) {
+ my $result = compare (encode ('locale_fs', $f),
+ encode ('locale_fs', $target));
+ if ($result == -1) {
+ print_error("file compare failed: ${f}, ${target}\n");
+ exit(1);
+ } elsif ($result) {
+ print_error("$target already existing and different content, exiting!\n");
+ exit(1);
+ }
+ print_debug("$target already existing but same content, skipping!\n");
+ return;
} else {
print_error("$target already existing, exiting!\n");
exit(1);
@@ -1107,107 +1130,175 @@ sub link_font {
sub make_dir {
my ($d, $w) = @_;
- if (-r $d) {
- if (! -d $d) {
+ if (-r encode('locale_fs', $d)) {
+ if (! -d encode('locale_fs', $d)) {
print_error("$d is not a directory, $w\n");
exit(1);
}
} else {
- $dry_run || make_path($d);
+ $dry_run || make_path(encode('locale', $d));
}
}
-# perl symlink function does not work on windows, so leave it to
-# cmd.exe mklink function (or write to batch file).
-# if target already exists, do not try to override it. otherwise
-# "mklink error: Cannot create a file when that file already exists"
-# is thrown many times
+# perl symlink function does not work on windows, so we use Win32 API.
sub maybe_symlink {
my ($realname, $targetname) = @_;
if (win32()) {
- # hardlink vs. symlink -- HY 2017/04/26
- # * readablitiy: hardlink is easier, but it seems that current gs can read
- # symlink properly, so it doesn't matter
- # * permission: hardlink creation does not require administrator privilege,
- # but is likely to fail for c:/windows/fonts/* system files
- # due to "Access denied"
- # symlink creation requires administrator privilege, but
- # it can link to all files in c:/windows/fonts/
- # * versatility: symlink can point to a file on a different/remote volume
- # for these reasons, we try to create symlink by default.
- # if --hardlink option is given, we create hardlink instead.
- # also, if --winbatch option is given, we prepare batch file for link generation,
- # instead of creating links right away.
- $realname =~ s!/!\\!g;
- $targetname =~ s!/!\\!g;
- if ($opt_winbatch) {
- # re-encoding of $winbatch_content is done by write_winbatch()
- $winbatch_content .= "if not exist \"$targetname\" mklink ";
- $winbatch_content .= "/h " if $opt_hardlink;
- $winbatch_content .= "\"$targetname\" \"$realname\"\n";
- } else {
- # should be encoded in cp932 for win32 console
- $realname = encode_utftocp($realname);
- $targetname = encode_utftocp($targetname);
- my $cmdl = "cmd.exe /c if not exist \"$targetname\" mklink ";
- $cmdl .= "/h " if $opt_hardlink;
- $cmdl .= "\"$targetname\" \"$realname\"";
- my @ret = `$cmdl`;
- # sometimes hard link creation may fail due to "Access denied"
- # (especially when $realname is located in c:/windows/fonts).
- # TODO: what should we do to ensure resources, which might be
- # different from $realname? -- HY (2017/03/21)
- # -- one possibility:
- # if (@ret) {
- # @ret ="done";
- # } else {
- # print_info("Hard link creation for $realname failed. I will copy this file instead.\n");
- # $cmdl = "cmd.exe /c if not exist \"$targetname\" copy \"$realname\" \"$targetname\"";
- # @ret = `$cmdl`;
- # }
- # -- however, both tlgs (TeX Live) and standalone gswin32/64 (built
- # by Akira Kakuto) can search in c:/windows/fonts by default.
- # Thus, copying such files is waste of memory
+ # Try symbolic link, hard link, copy by Win32 API
+
+ # On Windows, the creation of a symbolic link requires a privilege.
+ # Therefore, if the creation of the symbolic link fails,
+ # create a hard link.
+ # However, the creation of the hard link requires the write permission
+ # to the original existing file.
+ # Thus, if the hard link also fails, copy the file.
+
+ if (win32_symlink ($realname, $targetname)) {
+ print_debug ("Symbolic link succeeded: ${targetname}\n");
+ return 1;
+ }
+
+ if (win32_hardlink ($realname, $targetname)) {
+ print_debug ("Hard link succeeded: ${targetname}\n");
+ return 1;
+ }
+
+ if (win32_copy ($realname, $targetname)) {
+ print_debug ("Copy succeeded: ${targetname}\n");
+ return 1;
}
+
+ print_warning ("Link/copy failed: ${targetname}\n");
} else {
symlink ($realname, $targetname);
}
}
-# unlink function actually works also on windows, however,
-# leave it to batch file for consistency. otherwise
-# option $opt_force may not work as expected
sub maybe_unlink {
my ($targetname) = @_;
- if (win32()) {
- $targetname =~ s!/!\\!g;
- if ($opt_winbatch) {
- # re-encoding of $winbatch_content is done by write_winbatch()
- $winbatch_content .= "if exist \"$targetname\" del \"$targetname\"\n";
- } else {
- # should be encoded in cp932 for win32 console
- $targetname = encode_utftocp($targetname);
- my $cmdl = "cmd.exe /c if exist \"$targetname\" del \"$targetname\"";
- my @ret = `$cmdl`;
+ unlink (encode('locale_fs', $targetname));
+}
+
+# For Windows: Create symbolic link
+sub win32_symlink {
+ my ($existingfilename, $newfilename) = @_;
+
+ # We use CreateSymbolicLinkW API directly for creating symbolic link
+ # because perl's symlink function may not work in Windows.
+ state $createsymboliclinkw = load_createsymboliclinkw ();
+
+ $existingfilename =~ s|/|\\|g;
+ $newfilename =~ s|/|\\|g;
+
+ my $r = $createsymboliclinkw->Call (
+ encode ('UTF-16LE', $newfilename),
+ encode ('UTF-16LE', $existingfilename),
+ 0
+ );
+ if (ord($r) != 0) {
+ return 1;
}
- } else {
- unlink ($targetname);
- }
+ my $msg = decode ('locale',
+ Win32::FormatMessage (Win32::GetLastError ()));
+ $msg =~ s/[\r\n]+\z//;
+ print_debug ("CreateSymbolicLinkW failed: ${msg}\n");
+
+ return 0;
}
-# write batch file (windows only)
-sub write_winbatch {
- return if $dry_run;
- open(FOO, ">$winbatch") ||
- die("cannot open $winbatch for writing: $!");
- # $winbatch_content may contain multibyte characters, and they
- # should be encoded in cp932 in batch file
- $winbatch_content = encode_utftocp($winbatch_content);
- print FOO "\@echo off\n",
- "$winbatch_content",
- "\@echo symlink ", ($opt_remove ? "removed\n" : "generated\n"),
- "\@pause 1\n";
- close(FOO);
+# For Windows: Create hard link
+sub win32_hardlink {
+ my ($existingfilename, $newfilename) = @_;
+
+ # We use CreateHardLinkW API directly for creating hard link
+ # because -W API is not affected by the perl's active code page.
+ state $createhardlinkw = load_createhardlinkw ();
+
+ $existingfilename =~ s|/|\\|g;
+ $newfilename =~ s|/|\\|g;
+
+ my $r = $createhardlinkw->Call (
+ encode ('UTF-16LE', $newfilename),
+ encode ('UTF-16LE', $existingfilename),
+ 0
+ );
+ if ($r) {
+ return 1;
+ }
+ my $msg = decode ('locale',
+ Win32::FormatMessage (Win32::GetLastError ()));
+ $msg =~ s/[\r\n]+\z//;
+ print_debug ("CreateHardLinkW failed: ${msg}\n");
+
+ return 0;
+}
+
+# For Windows: Copy file
+sub win32_copy {
+ my ($existingfilename, $newfilename) = @_;
+
+ # We use CopyFileW API directly for copying file
+ # because -W API is not affected by the perl's active code page.
+ state $copyfilew = load_copyfilew ();
+
+ $existingfilename =~ s|/|\\|g;
+ $newfilename =~ s|/|\\|g;
+
+ my $r = $copyfilew->Call (
+ encode ('UTF-16LE', $existingfilename),
+ encode ('UTF-16LE', $newfilename),
+ 1
+ );
+ if ($r) {
+ return 1;
+ }
+ my $msg = decode ('locale',
+ Win32::FormatMessage (Win32::GetLastError ()));
+ $msg =~ s/[\r\n]+\z//;
+ print_debug ("CopyFileW failed: ${msg}\n");
+
+ return 0;
+}
+
+# For Windows: Load CreateSymbolicLinkW API
+sub load_createsymboliclinkw {
+ my $createsymboliclinkw = Win32::API::More->new (
+ 'kernel32.dll',
+ 'BOOLEAN CreateSymbolicLinkW(
+ LPCWSTR lpSymlinkFileName,
+ LPCWSTR lpTargetFileName,
+ DWORD dwFlags
+ )'
+ ) or die ('Failed: Win32::API::More->new CreateSymbolicLinkW');
+
+ return $createsymboliclinkw;
+}
+# For Windows: Load CreateHardLinkW API
+sub load_createhardlinkw {
+ my $createhardlinkw = Win32::API::More->new (
+ 'kernel32.dll',
+ 'BOOL CreateHardLinkW(
+ LPCWSTR lpFileName,
+ LPCWSTR lpExistingFileName,
+ UINT_PTR lpSecurityAttributes
+ )'
+ ) or die ('Failed: Win32::API::More->new CreateHardLinkW');
+
+ return $createhardlinkw;
+}
+
+# For Windows: Load CopyFileW API
+sub load_copyfilew {
+ my $copyfilew = Win32::API::More->new (
+ 'kernel32.dll',
+ 'BOOL CopyFileW(
+ LPCWSTR lpExistingFileName,
+ LPCWSTR lpNewFileName,
+ BOOL bFailIfExists
+ )'
+ ) or die ('Failed: Win32::API::More->new CopyFileW');
+
+ return $copyfilew;
}
# write to psnames-for-otfps
@@ -1215,7 +1306,9 @@ sub write_akotfps_datafile {
return if $dry_run;
make_dir("$opt_akotfps/$akotfps_pathpart",
"cannot create $akotfps_datafilename in it!");
- open(FOO, ">$opt_akotfps/$akotfps_pathpart/$akotfps_datafilename") ||
+ open(FOO, ">:encoding(UTF-8)",
+ encode('locale_fs',
+ "$opt_akotfps/$akotfps_pathpart/$akotfps_datafilename")) ||
die("cannot open $opt_akotfps/$akotfps_pathpart/$akotfps_datafilename for writing: $!");
print FOO "% psnames-for-otf
%
@@ -1240,10 +1333,6 @@ sub info_found_fonts {
print "Type: $fontdb{$k}{'type'}\n";
print "Class: $fontdb{$k}{'class'}\n";
my $fn = $fontdb{$k}{'target'};
- # cp932 for win32 console
- if (win32()) {
- $fn = encode_utftocp($fn);
- }
if ($fontdb{$k}{'type'} eq 'TTC' || $fontdb{$k}{'type'} eq 'OTC') {
$fn .= "($fontdb{$k}{'subfont'})";
}
@@ -1285,10 +1374,6 @@ sub info_list_aliases {
for my $p (@ks) {
my $t = $aliases{$al}{$p};
my $fn = ($opt_listallaliases ? "-" : $fontdb{$t}{'target'} );
- # cp932 for win32 console
- if (win32()) {
- $fn = encode_utftocp($fn);
- }
# should always be the same ;-)
$cl = $fontdb{$t}{'class'};
if (!$opt_listallaliases && ($fontdb{$t}{'type'} eq 'TTC' || $fontdb{$t}{'type'} eq 'OTC')) {
@@ -1345,7 +1430,8 @@ sub make_all_available {
sub check_for_files {
my @foundfiles;
if ($opt_filelist) {
- open(FOO, "<", $opt_filelist) || die("Cannot open $opt_filelist: $!");
+ open(FOO, "<", encode('locale_fs', $opt_filelist)) ||
+ die("Cannot open $opt_filelist: $!");
@foundfiles = <FOO>;
close(FOO) || warn "Cannot close $opt_filelist: $!";
} else {
@@ -1371,13 +1457,15 @@ sub check_for_files {
for my $d (qw!/Library/Fonts /System/Library/Fonts
/System/Library/Assets /System/Library/AssetsV2
/Network/Library/Fonts /usr/share/fonts!) {
- push @extradirs, "$d//" if (-d $d); # recursive search
+ push @extradirs, "$d//"
+ if (-d encode('locale_fs', $d)); # recursive search
}
# the path contains white space, so hack required
for my $d (qw!/Library/Application__Support/Apple/Fonts!) {
my $sd = $d;
$sd =~ s/__/ /;
- push @extradirs, "$sd//" if (-d "$sd"); # recursive search
+ push @extradirs, "$sd//"
+ if (-d encode('locale_fs', "$sd")); # recursive search
}
# office for mac 2016
for my $d (qw!/Applications/Microsoft__Word.app
@@ -1385,11 +1473,14 @@ sub check_for_files {
/Applications/Microsoft__PowerPoint.app!) {
my $sd = $d;
$sd =~ s/__/ /;
- push @extradirs, "$sd/Contents/Resources/Fonts/" if (-d "$sd/Contents/Resources/Fonts");
- push @extradirs, "$sd/Contents/Resources/DFonts/" if (-d "$sd/Contents/Resources/DFonts");
+ push @extradirs, "$sd/Contents/Resources/Fonts/"
+ if (-d encode('locale_fs', "$sd/Contents/Resources/Fonts"));
+ push @extradirs, "$sd/Contents/Resources/DFonts/"
+ if (-d encode('locale_fs', "$sd/Contents/Resources/DFonts"));
}
my $home = $ENV{'HOME'};
- push @extradirs, "$home/Library/Fonts//" if (-d "$home/Library/Fonts");
+ push @extradirs, "$home/Library/Fonts//"
+ if (-d encode('locale_fs', "$home/Library/Fonts"));
}
#
if (@extradirs) {
@@ -1426,23 +1517,20 @@ sub check_for_files {
$cmdl .= " \"$f\" ";
}
# shoot up kpsewhich
- # this call (derived from the database) contains multibyte characters,
- # and they should be encoded in cp932 for win32 console
- if (win32()) {
- $cmdl = encode_utftocp($cmdl);
- }
print_ddebug("checking for $cmdl\n");
+ $cmdl = encode('locale', $cmdl);
@foundfiles = `$cmdl`;
+ # We assume that the output of kpsewhich is
+ # the same as perl's locale (or active code page).
+ @foundfiles = map { decode('locale', $_) } @foundfiles;
}
- # at this point, on windows, @foundfiles is encoded in cp932
- # which is suitable for the next few lines
chomp(@foundfiles);
print_ddebug("Found files @foundfiles\n");
# map basenames to filenames
my %bntofn;
for my $f (@foundfiles) {
$f =~ s/[\r\n]+\z//; # perl's chomp() on git-bash cannot strip CR of CRLF ??
- my $realf = abs_path($f);
+ my $realf = decode('locale_fs', abs_path(encode('locale_fs', $f)));
if (!$realf) {
print_warning("dead link or strange file found: $f - ignored!\n");
next;
@@ -1458,11 +1546,6 @@ sub check_for_files {
$temp_realfdir =~ s!^(.*)/(.*)$!$1!;
next if ($temp_realfdir =~ $otf_pathpart || $temp_realfdir =~ $ttf_pathpart);
}
- # decode now on windows! (cp932 -> internal utf-8)
- if (win32()) {
- $f = encode_cptoutf($f);
- $realf = encode_cptoutf($realf);
- }
my $bn = basename($f);
# kpsewhich -all might return multiple files with the same basename;
# collect all of them
@@ -1511,7 +1594,9 @@ sub check_for_files {
print_debug("We need to test whether\n");
print_debug(" $b:$index\n");
print_debug("is the correct one ($k). Invoking zrlistttc ...\n");
- chomp($actualpsname = `texlua $zrlistttc -i $index "$b"`);
+ my $cmdl = "texlua $zrlistttc -i $index \"$b\"";
+ $cmdl = encode('locale', $cmdl);
+ chomp($actualpsname = `$cmdl`);
if ($?) {
# something is wrong with the font file, or zrlistttc does not support it;
# still there is a chance that Ghostscript supports, so don't discard it
@@ -1521,6 +1606,9 @@ sub check_for_files {
$bname = $b;
last;
}
+ # We assume that the output of texlua is
+ # the same as perl's locale (or active code page).
+ $actualpsname = decode('locale', $actualpsname);
$actualpsname =~ s/[\r\n]+\z//; # perl's chomp() on git-bash cannot strip CR of CRLF ??
if ($actualpsname ne $k) {
print_debug("... PSName returned by zrlistttc ($actualpsname) is\n");
@@ -1688,7 +1776,7 @@ sub read_font_database {
# use "foo" as a substitute; otherwise, use built-in database
if ($opt_fontdef) {
my $foo = kpse_miscfont($opt_fontdef);
- open(FDB, "<$foo") ||
+ open(FDB, "<:encoding(UTF-8)", encode('locale_fs', $foo)) ||
die("Cannot find $opt_fontdef: $!");
@dbl = <FDB>;
close(FDB);
@@ -1702,7 +1790,7 @@ sub read_font_database {
# overwrite existing one (that is, the addition wins)
for (@opt_fontdef_add) {
my $foo = kpse_miscfont($_);
- open(FDB, "<$foo") ||
+ open(FDB, "<:encoding(UTF-8)", encode('locale_fs', $foo)) ||
die("Cannot find $_: $!");
@dbl = <FDB>;
close(FDB);
@@ -1773,7 +1861,7 @@ sub read_each_font_database {
next if (!$opt_cleanup);
my @dbl;
my $foo = kpse_miscfont($1);
- if (!open(FDB, "<$foo")) {
+ if (!open(FDB, "<:encoding(UTF-8)", encode('locale_fs', $foo))) {
print_warning("Cannot find $1, skipping!\n");
next;
}
@@ -1786,7 +1874,7 @@ sub read_each_font_database {
if ($l =~ m/^INCLUDE\s*(.*)$/) {
my @dbl;
my $foo = kpse_miscfont($1);
- if (!open(FDB, "<$foo")) {
+ if (!open(FDB, "<:encoding(UTF-8)", encode('locale_fs', $foo))) {
print_warning("Cannot find $1, skipping!\n");
next;
}
@@ -1807,12 +1895,7 @@ sub read_each_font_database {
if ($l =~ m/^OTFname(\((\d+)\))?:\s*(.*)$/) {
my $fn = $3;
$fontfiles{$fn}{'priority'} = ($2 ? $2 : 10);
- # cp932 for win32 console
- my $encoded_fn;
- if (win32()) {
- $encoded_fn = encode_utftocp($fn);
- }
- print_dddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n");
+ print_dddebug("filename: ${fn}\n");
print_dddebug("type: otf\n");
$fontfiles{$fn}{'type'} = 'OTF';
next;
@@ -1820,12 +1903,7 @@ sub read_each_font_database {
if ($l =~ m/^OTCname(\((\d+)\))?:\s*(.*)$/) {
my $fn = $3;
$fontfiles{$fn}{'priority'} = ($2 ? $2 : 10);
- # cp932 for win32 console
- my $encoded_fn;
- if (win32()) {
- $encoded_fn = encode_utftocp($fn);
- }
- print_dddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n");
+ print_dddebug("filename: ${fn}\n");
print_dddebug("type: otc\n");
$fontfiles{$fn}{'type'} = 'OTC';
next;
@@ -1833,12 +1911,7 @@ sub read_each_font_database {
if ($l =~ m/^TTFname(\((\d+)\))?:\s*(.*)$/) {
my $fn = $3;
$fontfiles{$fn}{'priority'} = ($2 ? $2 : 10);
- # cp932 for win32 console
- my $encoded_fn;
- if (win32()) {
- $encoded_fn = encode_utftocp($fn);
- }
- print_dddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n");
+ print_dddebug("filename: ${fn}\n");
print_dddebug("type: ttf\n");
$fontfiles{$fn}{'type'} = 'TTF';
next;
@@ -1846,12 +1919,7 @@ sub read_each_font_database {
if ($l =~ m/^TTCname(\((\d+)\))?:\s*(.*)$/) {
my $fn = $3;
$fontfiles{$fn}{'priority'} = ($2 ? $2 : 10);
- # cp932 for win32 console
- my $encoded_fn;
- if (win32()) {
- $encoded_fn = encode_utftocp($fn);
- }
- print_dddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n");
+ print_dddebug("filename: ${fn}\n");
print_dddebug("type: ttc\n");
$fontfiles{$fn}{'type'} = 'TTC';
next;
@@ -1860,12 +1928,7 @@ sub read_each_font_database {
if ($l =~ m/^Filename(\((\d+)\))?:\s*(.*)$/) {
my $fn = $3;
$fontfiles{$fn}{'priority'} = ($2 ? $2 : 10);
- # cp932 for win32 console
- my $encoded_fn;
- if (win32()) {
- $encoded_fn = encode_utftocp($fn);
- }
- print_dddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n");
+ print_dddebug("filename: ${fn}\n");
if ($fn =~ m/\.otf$/i) {
print_dddebug("type: otf\n");
$fontfiles{$fn}{'type'} = 'OTF';
@@ -1888,12 +1951,7 @@ sub read_each_font_database {
if ($l =~ m/^RMVname(\((\d+)\))?:\s*(.*)$/) {
my $fn = $3;
$fontfiles{$fn}{'priority'} = ($2 ? $2 : 10);
- # cp932 for win32 console
- my $encoded_fn;
- if (win32()) {
- $encoded_fn = encode_utftocp($fn);
- }
- print_dddebug("filename: ", ($encoded_fn ? "$encoded_fn" : "$fn"), "\n");
+ print_dddebug("filename: ${fn}\n");
print_dddebug("type: remove\n");
$fontfiles{$fn}{'type'} = 'RMV';
next;
@@ -1906,7 +1964,7 @@ sub read_each_font_database {
}
sub dump_font_database {
- open(FOO, ">$dump_datafile") ||
+ open(FOO, ">:encoding(UTF-8)", encode('locale_fs', $dump_datafile)) ||
die("cannot open $dump_datafile for writing: $!");
for my $k (sort keys %fontdb) {
print FOO "Name: $fontdb{$k}{'origname'}\n";
@@ -1937,15 +1995,19 @@ sub find_gs_resource {
my $foundres = '';
if (win32()) {
# determine tlgs or native gs
- chomp(my $foo = `kpsewhich -var-value=SELFAUTOPARENT`);
- if ( -d "$foo/tlpkg/tlgs" ) {
+ my $foo = `kpsewhich -var-value=SELFAUTOPARENT`;
+ # We assume that the output of kpsewhich is
+ # the same as perl's locale (or active code page).
+ decode('locale', $foo);
+ chomp($foo);
+ if ( -d encode('locale_fs', "$foo/tlpkg/tlgs") ) {
# should be texlive with tlgs
print_debug("Assuming tlgs win32 ...\n");
$foundres = "$foo/tlpkg/tlgs/Resource";
# for TL2016, tlgs binary has built-in Resource,
# so we cannot set up CJK fonts correctly.
# the following test forces to exit in such case
- if ( ! -d $foundres ) {
+ if ( ! -d encode('locale_fs', $foundres) ) {
print_error("No Resource directory available for tlgs,\n");
print_error("we cannot support such gs, sorry.\n");
$foundres = '';
@@ -1957,18 +2019,20 @@ sub find_gs_resource {
} else {
# we assume gswin32c is in the path
# TODO: what should we do for gswin64c?
- chomp($foundres = `where gswin32c 2>$nul`); # assume 'where' is available
+ $foundres = `where gswin32c 2>$nul`; # assume 'where' is available
if ($?) {
print_error("Cannot run where gswin32c ...\n");
} else {
+ # We assume that the output of 'where' is
+ # the same as perl's locale (or active code page).
+ chomp($foundres = decode('locale', $foundres));
# trial 1: assume the relative path
# when C:\path\to\bin\gswin32c.exe is found, then there should be
# C:\path\to\Resource (note that 'where' returns backslash-ed path)
print_debug("Finding gs resource by assuming relative path ...\n");
- $foundres = encode_cptoutf($foundres); # 99.99% unnecessary
$foundres =~ s!\\!/!g;
$foundres =~ s!/bin/gswin32c\.exe$!/Resource!;
- if ( ! -d $foundres ) {
+ if ( ! -d encode('locale_fs', $foundres) ) {
$foundres = '';
}
if (!$foundres) {
@@ -1983,7 +2047,7 @@ sub find_gs_resource {
# trial 2: assume the fixed path, c:/gs/gs$gsver/Resource
print_debug("Finding gs resource by assuming fixed path ...\n");
$foundres = "c:/gs/gs$gsver/Resource";
- if ( ! -d $foundres ) {
+ if ( ! -d encode('locale_fs', $foundres) ) {
$foundres = '';
}
if (!$foundres) {
@@ -2002,9 +2066,13 @@ sub find_gs_resource {
# when /path/to/bin/gs is found, then there should be
# /path/to/share/ghostscript/$(gs --version)/Resource
print_debug("Finding gs resource by assuming relative path ...\n");
- chomp($foundres = `which gs`);
+ $foundres = `which gs`;
+ # We assume that the output of 'which' is
+ # the same as perl's locale (or active code page).
+ $foundres = decode('locale', $foundres);
+ chomp($foundres);
$foundres =~ s!/bin/gs$!/share/ghostscript/$gsver/Resource!;
- if ( ! -d $foundres ) {
+ if ( ! -d encode('locale_fs', $foundres) ) {
$foundres = '';
}
if (!$foundres) {
@@ -2012,10 +2080,14 @@ sub find_gs_resource {
}
}
if (!$foundres) {
- chomp(my @ret = `gs --help 2>$nul`);
+ my @ret = `gs --help 2>$nul`;
if ($?) {
print_error("Cannot run gs --help ...\n");
} else {
+ # We assume that the output of gs is
+ # the same as perl's locale (or active code page).
+ @ret = map { decode('locale', $_) } @ret;
+ chomp(@ret);
# trial 2: parse gs help message
print_debug("Finding gs resource by parsing help message ...\n");
$foundres = '';
@@ -2042,25 +2114,38 @@ sub kpse_miscfont {
my ($file) = @_;
my $foo = '';
# first, prioritize GitHub repository diretory structure
- $foo = "database/$file" if (-f "database/$file");
+ $foo = "database/$file" if (-f encode('locale_fs', "database/$file"));
if ($foo eq "") {
- chomp($foo = `kpsewhich -format=miscfont $file`);
+ my $cmdl = "kpsewhich -format=miscfont $file";
+ $cmdl = encode('locale', $cmdl);
+ $foo = `$cmdl`;
+ # We assume that the output of kpsewhich is
+ # the same as perl's locale (or active code page).
+ $foo = decode('locale', $foo);
+ chomp($foo);
}
return $foo;
}
-sub encode_utftocp {
- my ($foo) = @_;
- $foo = Encode::decode('utf-8', $foo);
- $foo = Encode::encode('cp932', $foo);
- return $foo;
-}
+sub init_encode_locale {
+ eval {
+ require Encode::Locale;
+ Encode::Locale->import();
-sub encode_cptoutf {
- my ($foo) = @_;
- $foo = Encode::decode('cp932', $foo);
- $foo = Encode::encode('utf-8', $foo);
- return $foo;
+ $debug_msg_before_init .= "Encode::Locale is loaded.\n";
+ };
+ if ($@) {
+ if (win32) {
+ die ("For Windows, Encode::Locale is required.\n");
+ }
+
+ $debug_msg_before_init .=
+ "Encode::Locale is not found. Assuming all encodings are UTF-8.\n";
+ Encode::Alias::define_alias('locale' => 'UTF-8');
+ Encode::Alias::define_alias('locale_fs' => 'UTF-8');
+ Encode::Alias::define_alias('console_in' => 'UTF-8');
+ Encode::Alias::define_alias('console_out' => 'UTF-8');
+ }
}
sub version {
@@ -2107,13 +2192,6 @@ sub Usage {
-h, --help this help
";
- my $winonlyoptions = "
---hardlink create hardlinks instead of symlinks
---winbatch [FILE] prepare a batch file for link generation, instead of
- generating links right away
- the batch file name defaults to $winbatch
-";
-
my $commandoptions = "
--dump-data [FILE] dump the set of font definitions which is currently
effective, where FILE (the dump output) defaults to
@@ -2269,8 +2347,9 @@ requirements of `LL` and `RR` must be fulfilled:
my $authors = "
The script and its documentation was written by Norbert Preining, based
-on research and work by Yusuke Kuroki, Yusuke Terada, Bruno Voisin,
-Hironobu Yamashita, Munehiro Yamamoto and the TeX Q&A wiki page.
+on research and work by Masamichi Hosoda, Yusuke Kuroki, Yusuke Terada,
+Bruno Voisin, Hironobu Yamashita, Munehiro Yamamoto and the TeX Q&A wiki
+page.
Maintained by Japanese TeX Development Community. For development, see
https://github.com/texjporg/cjk-gs-support
@@ -2286,8 +2365,6 @@ The contained font data is not copyrightable.
print "\n$shortdesc\nUsage\n-----\n\n`````\n$usage\n`````\n\n";
print "#### Options ####\n\n`````";
print_for_out($options, " ");
- print "`````\n\n#### Windows only options ####\n\n`````";
- print_for_out($winonlyoptions, " ");
print "`````\n\n#### Command like options ####\n\n`````";
print_for_out($commandoptions, " ");
print "`````\n\nOperation\n---------\n$operation\n";
@@ -2303,10 +2380,6 @@ The contained font data is not copyrightable.
print "\nUsage: $usage\n\n$headline\n$shortdesc";
print "\nOptions:\n";
print_for_out($options, " ");
- if (win32()) {
- print "\nWindows only options:\n";
- print_for_out($winonlyoptions, " ");
- }
print "\nCommand like options:\n";
print_for_out($commandoptions, " ");
print "\nOperation:\n";