summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/fonts/enc
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-06-07 20:38:02 +0000
committerKarl Berry <karl@freefriends.org>2020-06-07 20:38:02 +0000
commit4429ead320ce6d8f38632b2255fc52a0fa086165 (patch)
tree32c6f1d21451c755e4bfdaa49cd8b0cc3fa40044 /Master/texmf-dist/fonts/enc
parent0c7c5013ed0bbc12b2bcbd255cf4989ebc855d69 (diff)
baskervillef (7jun20)
git-svn-id: svn://tug.org/texlive/trunk@55467 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/fonts/enc')
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_23ismr.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_mevjdz.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_2hmbf5.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7yyqda.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_2j2bbt.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_o6dtj2.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_2vxxim.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_jesydd.enc)15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_336dgv.enc63
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_3a6nlu.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zptsj3.enc)22
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_3kjwvw.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_sb5wfb.enc)15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_4hfcgk.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_hljrbf.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_4scfns.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_523v7l.enc9
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_532cq4.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wdfmp4.enc)15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_5cwn7d.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bue3wb.enc)15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_5k66dt.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cyyuxb.enc)15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_5oqvu4.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_77ryg7.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_6emqgt.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_6vkpq5.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_i5fury.enc)15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_734fzj.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_73mseb.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zn4iv3.enc)36
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7cypa5.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7qcgfh.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wcz3px.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_a3asoq.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_adnnkl.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_a73a6q.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_p3pzma.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_aqsbza.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_iqxfxn.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_arki3d.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_sqc4ly.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_art6xf.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_b5bk2y.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_z5rfyo.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bnjopg.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_o2tifi.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bnmcfu.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cjo72v.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_t5goht.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ck2hfy.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_hkkd2g.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_csuamn.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cvjygd.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_e3xw3x.enc8
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_e5ewsu.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_6mhi2z.enc)15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_etzx2k.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vaofbk.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_fcs4fj.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_invrxa.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_gliky3.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_gmq6ah.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_fj77ru.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_hwnpjr.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_oyegn6.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_hykkzd.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_i3q27v.enc)15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ihgygy.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_m3z5kj.enc)15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_iy3fha.enc8
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_jayro7.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_jjbdnj.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bvbtx2.enc)15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kodzea.enc8
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_koujiy.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kua26b.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_lfhy4n.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_s6fzkp.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_lfjjhs.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_lh5uiy.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ljx3jq.enc)12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_lkeymy.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_igqvi4.enc)22
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_m7qm6t.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kb3ura.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_mby7uf.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_b5lrlg.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_n43ddx.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_n4mxmz.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_nvjtae.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ogu2yp.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_eurn55.enc)17
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_owjda7.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_oxcsv2.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_pxbj3a.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ahcsm7.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_q37ime.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qiwnw4.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qleltn.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qvggep.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_66iezk.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rqjco3.enc63
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rtk6yp.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vunabj.enc)36
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_skajg2.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rqwz3b.enc)21
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_srcuqk.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_tjuaha.enc)13
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_t3ys54.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_xlbenp.enc)15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_t7zhq6.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_th2k46.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kuzvvg.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_to6jjw.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_pqfamk.enc)22
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_twn2qn.enc8
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_typa7y.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cgvvj5.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ueebfa.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_e6c7a3.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uf5aa7.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_taxp3x.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uf7ozb.enc8
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ugitcp.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qycpdj.enc)15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uqoays.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_tqvuvp.enc)36
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uutbpy.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_pjh6nq.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ve4agh.enc8
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vydigt.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_dzrx7a.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_w4i4io.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_evqzha.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_w54rd4.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wbekxi.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vezlo5.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wn2rfu.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_lwrbox.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wxljbs.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wybx5h.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_iy3qnl.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wyngyv.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_a6zfty.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_x7qzb2.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_mebvzg.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_xpcegd.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_xucdkt.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_xt7x67.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_y3x75k.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qptswd.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_y7xbvf.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kqfmr4.enc)15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ymdv6d.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_3oppw2.enc)38
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zfeutd.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zkzy6d.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_u24co6.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zpc5ms.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_owa6ha.enc)15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zvejcx.enc (renamed from Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kragcu.enc)16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zygn7r.enc8
100 files changed, 1239 insertions, 1655 deletions
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_mevjdz.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_23ismr.enc
index 223498d3ceb..e69517d06a9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_mevjdz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_23ismr.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_mevjdzxzq7ibpwpyrman7dmv7e
-% Encoding created by otftotfm on Mon May 13 16:20:34 2019
+%%AutoEnc_23ismrt5ut7k2qu4gp5mawnotb
+% Encoding created by otftotfm on Sat Jun 6 15:03:49 2020
% Command line follows encoding
-/AutoEnc_mevjdzxzq7ibpwpyrman7dmv7e [
+/AutoEnc_23ismrt5ut7k2qu4gp5mawnotb [
%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_b /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
+ /f_f /dotlessi /dotlessj /f_i /f_l /f_f_i /f_f_l /f_b
%20
- /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=onum --feature=tnum --xheight=x
-% BaskervilleF-Bold.otf BaskervilleF-Bold-tosf-t1'
+% --feature=liga --feature=onum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-tosf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7yyqda.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_2hmbf5.enc
index 099c30d03dc..1b1d7ed282e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7yyqda.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_2hmbf5.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_7yyqdamovylpz5uhos6radoqrg
-% Encoding created by otftotfm on Mon May 13 16:20:23 2019
+%%AutoEnc_2hmbf52awaz62oepcbasrezrse
+% Encoding created by otftotfm on Sat Jun 6 15:03:47 2020
% Command line follows encoding
-/AutoEnc_7yyqdamovylpz5uhos6radoqrg [
+/AutoEnc_2hmbf52awaz62oepcbasrezrse [
%00
- /f_j /Euro /f_f_j /f_f /fraction /dotaccent /hungarumlaut /ogonek
- /f_i /f_l /.notdef /f_f_i /f_f_l /f_b /f_h /f_k
+ /f_j /Euro /f_f_j /f_b /fraction /dotaccent /hungarumlaut /ogonek
+ /f_h /f_k /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
%10
/dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=pnum --xheight=x
-% BaskervilleF-Bold.otf BaskervilleF-Bold-osf-ly1'
+% --feature=liga --feature=onum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_o6dtj2.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_2j2bbt.enc
index 1296a4dde48..504ea44fd9d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_o6dtj2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_2j2bbt.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_o6dtj2jjvwwx6ixzfmw776qwyg
-% Encoding created by otftotfm on Mon May 13 16:21:06 2019
+%%AutoEnc_2j2bbttqmh55zqlev2fas2i6kg
+% Encoding created by otftotfm on Sat Jun 6 15:04:12 2020
% Command line follows encoding
-/AutoEnc_o6dtj2jjvwwx6ixzfmw776qwyg [
+/AutoEnc_2j2bbttqmh55zqlev2fas2i6kg [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -29,8 +29,8 @@
/p /q /r /s /t /u /v /w
/x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
%80
- /f_f /f_i /f_l /f_f_i /f_f_l /f_b /f_h /f_j
- /f_k /f_t /Lslash /f_f_b /f_f_h /f_f_j /f_f_k /f_f_t
+ /f_b /f_h /f_j /f_k /f_t /f_f_b /f_f_h /f_f_j
+ /f_f_k /f_f_t /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
%90
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
-% --feature=pnum --xheight=x BaskervilleF-Regular.otf
-% BaskervilleF-Regular-osf-ot1'
+% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --xheight=x
+% BaskervilleF-Regular.otf BaskervilleF-Regular-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_jesydd.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_2vxxim.enc
index 17a8a4f5f5c..6a79ce60926 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_jesydd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_2vxxim.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_jesyddeopwplmbhgcnh53zehoh
-% Encoding created by otftotfm on Mon May 13 16:20:56 2019
+%%AutoEnc_2vxxim2pvwvef2oga4jlj7rjpc
+% Encoding created by otftotfm on Sat Jun 6 15:04:08 2020
% Command line follows encoding
-/AutoEnc_jesyddeopwplmbhgcnh53zehoh [
+/AutoEnc_2vxxim2pvwvef2oga4jlj7rjpc [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,16 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
-% --feature=pnum --feature=smcp --unicoding=germandbls =: SSsmall
-% --xheight=x BaskervilleF-Italic.otf BaskervilleF-Italic-lf-sc-ot1'
+% --feature=pnum --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Italic.otf
+% BaskervilleF-Italic-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_336dgv.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_336dgv.enc
new file mode 100644
index 00000000000..ccb7b155acc
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_336dgv.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_336dgvmpptrykcg7bvvcb4flaf
+% Encoding created by otftotfm on Sat Jun 6 15:04:17 2020
+% Command line follows encoding
+/AutoEnc_336dgvmpptrykcg7bvvcb4flaf [
+%00
+ /f_j /Euro /f_f_j /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.denominator /one.denominator /two.denominator /three.denominator /four.denominator /five.denominator /six.denominator /seven.denominator
+ /eight.denominator /nine.denominator /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 /mu /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/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dnom --ligkern=*
+% {KL} * --xheight=x BaskervilleF-Regular.otf BaskervilleF-Regular-dnom-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zptsj3.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_3a6nlu.enc
index 555ad98a497..bbfeb297cac 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zptsj3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_3a6nlu.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_zptsj3nysminvrm6ulkhvvgfed
-% Encoding created by otftotfm on Mon May 13 16:20:35 2019
+%%AutoEnc_3a6nlu3s44gi5ubqt3zqgkxqgg
+% Encoding created by otftotfm on Sat Jun 6 15:04:13 2020
% Command line follows encoding
-/AutoEnc_zptsj3nysminvrm6ulkhvvgfed [
+/AutoEnc_3a6nlu3s44gi5ubqt3zqgkxqgg [
%00
- /f_j /Euro /f_f_j /f_f /fraction /dotaccent /hungarumlaut /ogonek
- /f_i /f_l /.notdef /f_f_i /f_f_l /s_t /c_t /s_p
+ /f_j /Euro /f_f_j /f_b /fraction /dotaccent /hungarumlaut /ogonek
+ /f_h /f_k /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
%10
/dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -38,7 +38,7 @@
/uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
- /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /degree /plusminus /two.superior /three.superior /acute /mu /pilcrow /periodcentered
/cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
%C0
/Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.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 --xheight=x
-% BaskervilleF-Bold.otf BaskervilleF-Bold-tosf-swash-ly1'
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --xheight=x BaskervilleF-Regular.otf
+% BaskervilleF-Regular-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_sb5wfb.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_3kjwvw.enc
index 23ba6350e9d..cabe7e56c12 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_sb5wfb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_3kjwvw.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_sb5wfbbvm462vkzyvrp6ntcjle
-% Encoding created by otftotfm on Mon May 13 16:21:03 2019
+%%AutoEnc_3kjwvwsjk5n7foo5f2lw2vlvqg
+% Encoding created by otftotfm on Sat Jun 6 15:04:06 2020
% Command line follows encoding
-/AutoEnc_sb5wfbbvm462vkzyvrp6ntcjle [
+/AutoEnc_3kjwvwsjk5n7foo5f2lw2vlvqg [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,16 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
-% --feature=smcp --feature=tnum --unicoding=germandbls =: SSsmall
-% --xheight=x BaskervilleF-Italic.otf BaskervilleF-Italic-tosf-sc-ot1'
+% --feature=smcp --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Italic.otf
+% BaskervilleF-Italic-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_hljrbf.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_4hfcgk.enc
index acd072c6184..88740b5402e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_hljrbf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_4hfcgk.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_hljrbfhlo6hyztze2vh3fqwqfh
-% Encoding created by otftotfm on Mon May 13 16:20:48 2019
+%%AutoEnc_4hfcgkb7dubu3qxabsxfue2ale
+% Encoding created by otftotfm on Sat Jun 6 15:03:57 2020
% Command line follows encoding
-/AutoEnc_hljrbfhlo6hyztze2vh3fqwqfh [
+/AutoEnc_4hfcgkb7dubu3qxabsxfue2ale [
%00
/f_j /Euro /f_f_j /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
%10
/i.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-BoldItalic.otf
-% BaskervilleF-BoldItalic-tosf-sc-ly1'
+% --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-BoldItalic.otf BaskervilleF-BoldItalic-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_4scfns.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_4scfns.enc
deleted file mode 100644
index 68d10cc7dcf..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_4scfns.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_4scfns77dpbr7kkwz7hdotk4fa
-% Encoding created by otftotfm on Mon May 13 16:20:32 2019
-% Command line follows encoding
-/AutoEnc_4scfns77dpbr7kkwz7hdotk4fa [
-%00
- /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
-%80
- /f_f /f_i /f_l /f_f_i /f_f_l /s_t /c_t /s_p
- /f_b /f_h /Lslash /f_j /f_k /f_t /f_f_b /f_f_h
-%90
- /f_f_j /f_f_k /f_f_t /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf/fonts/tfm/public/baskervillef
-% --vf-directory=texmf/fonts/vf/public/baskervillef
-% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
-% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
-% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
-% --feature=lnum --feature=tnum --include-alternates=*.swash --feature=aalt
-% --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-tlf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_523v7l.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_523v7l.enc
index 1ef572d6a12..7b71be46d60 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_523v7l.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_523v7l.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_523v7lmng3zdb7htryfzdvqzue
-% Encoding created by otftotfm on Mon May 13 16:20:39 2019
+% Encoding created by otftotfm on Sat Jun 6 15:04:02 2020
% Command line follows encoding
/AutoEnc_523v7lmng3zdb7htryfzdvqzue [
%00
@@ -57,9 +57,8 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=sups --ligkern=* {KL} * --xheight=x
-% BaskervilleF-BoldItalic.otf BaskervilleF-BoldItalic-sup-ly1'
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sups --ligkern=*
+% {KL} * --xheight=x BaskervilleF-BoldItalic.otf
+% BaskervilleF-BoldItalic-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wdfmp4.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_532cq4.enc
index a56190a1adb..2557b7498a4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wdfmp4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_532cq4.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_wdfmp4e627hrja5en3phtoqk7c
-% Encoding created by otftotfm on Mon May 13 16:20:31 2019
+%%AutoEnc_532cq4fsujzcskvbkha5zbyich
+% Encoding created by otftotfm on Sat Jun 6 15:03:53 2020
% Command line follows encoding
-/AutoEnc_wdfmp4e627hrja5en3phtoqk7c [
+/AutoEnc_532cq4fsujzcskvbkha5zbyich [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,16 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
-% --feature=smcp --feature=tnum --unicoding=germandbls =: SSsmall
-% --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-tlf-sc-ot1'
+% --feature=smcp --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Bold.otf
+% BaskervilleF-Bold-tlf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bue3wb.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_5cwn7d.enc
index 92e66c2331d..907aaa1bdb8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bue3wb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_5cwn7d.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_bue3wbqwuoxddrkq6ofdw57xqh
-% Encoding created by otftotfm on Mon May 13 16:20:34 2019
+%%AutoEnc_5cwn7ddriybkm7oojhhn5fdfbh
+% Encoding created by otftotfm on Sat Jun 6 15:03:50 2020
% Command line follows encoding
-/AutoEnc_bue3wbqwuoxddrkq6ofdw57xqh [
+/AutoEnc_5cwn7ddriybkm7oojhhn5fdfbh [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,16 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
-% --feature=smcp --feature=tnum --unicoding=germandbls =: SSsmall
-% --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-tosf-sc-ot1'
+% --feature=smcp --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Bold.otf
+% BaskervilleF-Bold-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cyyuxb.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_5k66dt.enc
index a530cdeb7c4..3cf7c972857 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cyyuxb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_5k66dt.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_cyyuxbr3oi4ntyx22ahg5ocqlh
-% Encoding created by otftotfm on Mon May 13 16:21:07 2019
+%%AutoEnc_5k66dtpa2wlzz5a5ayufiaeqbg
+% Encoding created by otftotfm on Sat Jun 6 15:04:13 2020
% Command line follows encoding
-/AutoEnc_cyyuxbr3oi4ntyx22ahg5ocqlh [
+/AutoEnc_5k66dtpa2wlzz5a5ayufiaeqbg [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,16 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
-% --feature=pnum --feature=smcp --unicoding=germandbls =: SSsmall
-% --xheight=x BaskervilleF-Regular.otf BaskervilleF-Regular-osf-sc-ot1'
+% --feature=pnum --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Regular.otf
+% BaskervilleF-Regular-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_77ryg7.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_5oqvu4.enc
index 6d828e087f8..5cbd5d77c33 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_77ryg7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_5oqvu4.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_77ryg7mqc7pynqg7ysvksewl6e
-% Encoding created by otftotfm on Mon May 13 16:20:45 2019
+%%AutoEnc_5oqvu4poovblzfsgo6hhcnka5c
+% Encoding created by otftotfm on Sat Jun 6 15:04:01 2020
% Command line follows encoding
-/AutoEnc_77ryg7mqc7pynqg7ysvksewl6e [
+/AutoEnc_5oqvu4poovblzfsgo6hhcnka5c [
%00
/f_j /Euro /f_f_j /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
%10
/i.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-BoldItalic.otf
-% BaskervilleF-BoldItalic-tlf-sc-ly1'
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-BoldItalic.otf BaskervilleF-BoldItalic-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_6emqgt.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_6emqgt.enc
deleted file mode 100644
index 46f0eb39ca1..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_6emqgt.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_6emqgtldgs63dclc4b2mh6dble
-% Encoding created by otftotfm on Mon May 13 16:20:29 2019
-% Command line follows encoding
-/AutoEnc_6emqgtldgs63dclc4b2mh6dble [
-%00
- /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
- /eight.prop /nine.prop /colon /semicolon /exclamdown /equal /questiondown /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
-%80
- /f_f /f_i /f_l /f_f_i /f_f_l /s_t /c_t /s_p
- /f_b /f_h /Lslash /f_j /f_k /f_t /f_f_b /f_f_h
-%90
- /f_f_j /f_f_k /f_f_t /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf/fonts/tfm/public/baskervillef
-% --vf-directory=texmf/fonts/vf/public/baskervillef
-% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
-% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
-% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
-% --feature=lnum --feature=pnum --include-alternates=*.swash --feature=aalt
-% --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-lf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_i5fury.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_6vkpq5.enc
index 180b4dca3e4..bde0ff7125c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_i5fury.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_6vkpq5.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_i5furymh2fy3jed24jjmzm3rza
-% Encoding created by otftotfm on Mon May 13 16:20:28 2019
+%%AutoEnc_6vkpq5dn535vjoyv6skfqvevjh
+% Encoding created by otftotfm on Sat Jun 6 15:03:52 2020
% Command line follows encoding
-/AutoEnc_i5furymh2fy3jed24jjmzm3rza [
+/AutoEnc_6vkpq5dn535vjoyv6skfqvevjh [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,16 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
-% --feature=pnum --feature=smcp --unicoding=germandbls =: SSsmall
-% --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-lf-sc-ot1'
+% --feature=pnum --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Bold.otf
+% BaskervilleF-Bold-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_734fzj.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_734fzj.enc
new file mode 100644
index 00000000000..a4cf51e11ce
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_734fzj.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_734fzjr5qhmmrchta77wie5iff
+% Encoding created by otftotfm on Sat Jun 6 15:04:12 2020
+% Command line follows encoding
+/AutoEnc_734fzjr5qhmmrchta77wie5iff [
+%00
+ /f_j /Euro.sc /f_f_j /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
+%10
+ /i.sc /j.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle.sc /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /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 /mu /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 /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-Regular.otf BaskervilleF-Regular-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zn4iv3.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_73mseb.enc
index 9504a419bcc..9c5b3590915 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zn4iv3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_73mseb.enc
@@ -1,21 +1,21 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_zn4iv3vxx7bxwlr4gda4qejvzb
-% Encoding created by otftotfm on Mon May 13 16:20:39 2019
+%%AutoEnc_73msebfc4dlyn4qrgghatey54f
+% Encoding created by otftotfm on Sat Jun 6 15:03:56 2020
% Command line follows encoding
-/AutoEnc_zn4iv3vxx7bxwlr4gda4qejvzb [
+/AutoEnc_73msebfc4dlyn4qrgghatey54f [
%00
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
+ /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap
+ /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /exclam /asterisk
%10
/question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
/arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
%20
- /uni2423 /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
+ /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
/.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
%30
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /.notdef /.notdef /uni3008 /minus /uni3009 /.notdef
%40
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /uni2127 /.notdef /bigcircle
@@ -23,22 +23,22 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /arrowup /arrowdown
%60
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /grave /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%70
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /.notdef
%80
- /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
- /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef
+ /breve /caron /hungarumlaut /.notdef /dagger /daggerdbl /.notdef /perthousand
+ /bullet /.notdef /dollar /cent /florin /.notdef /.notdef /.notdef
%90
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
/.notdef /.notdef /.notdef /.notdef /.notdef /estimated /.notdef /servicemark
%A0
/.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
- /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
+ /dieresis /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /macron
%B0
- /degree /plusminus /two.superior /three.superior /.notdef /mu /paragraph /periodcentered
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
/.notdef /one.superior /ordmasculine /.notdef /onequarter /onehalf /threequarters /Euro
%C0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,16 +51,14 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
- /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ts1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --xheight=x
-% BaskervilleF-BoldItalic.otf BaskervilleF-BoldItalic-osf-ts1'
+% --feature=pnum --xheight=x BaskervilleF-BoldItalic.otf
+% BaskervilleF-BoldItalic-osf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7cypa5.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7cypa5.enc
new file mode 100644
index 00000000000..8c8d27fdb3e
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7cypa5.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_7cypa5qexo5urekf544rizc5ne
+% Encoding created by otftotfm on Sat Jun 6 15:04:14 2020
+% Command line follows encoding
+/AutoEnc_7cypa5qexo5urekf544rizc5ne [
+%00
+ /f_j /Euro.sc /f_f_j /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
+%10
+ /i.sc /j.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle.sc /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /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 /mu /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 /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-Regular.otf BaskervilleF-Regular-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wcz3px.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7qcgfh.enc
index 183425b9217..04251154560 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wcz3px.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_7qcgfh.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_wcz3pxxtqo3kclymsd7i33gi4e
-% Encoding created by otftotfm on Mon May 13 16:20:28 2019
+%%AutoEnc_7qcgfhkh7as3fgtdruwlzrclcb
+% Encoding created by otftotfm on Sat Jun 6 15:03:51 2020
% Command line follows encoding
-/AutoEnc_wcz3pxxtqo3kclymsd7i33gi4e [
+/AutoEnc_7qcgfhkh7as3fgtdruwlzrclcb [
%00
/f_j /Euro.sc /f_f_j /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
%10
/i.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Bold.otf
-% BaskervilleF-Bold-lf-sc-ly1'
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_adnnkl.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_a3asoq.enc
index c0f253ac8bd..b45b421e06b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_adnnkl.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_a3asoq.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_adnnklkbmjnoyqcc2c2fhckdpe
-% Encoding created by otftotfm on Mon May 13 16:20:25 2019
+%%AutoEnc_a3asoquo6o274tyzw7737zmuie
+% Encoding created by otftotfm on Sat Jun 6 15:03:48 2020
% Command line follows encoding
-/AutoEnc_adnnklkbmjnoyqcc2c2fhckdpe [
+/AutoEnc_a3asoquo6o274tyzw7737zmuie [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -11,7 +11,7 @@
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
/.notdef /i.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
%20
- /uni2423 /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
/parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
%30
/zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Bold.otf
-% BaskervilleF-Bold-osf-sc-t1'
+% --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_p3pzma.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_a73a6q.enc
index 8f3ed7d418f..94e90428e3a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_p3pzma.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_a73a6q.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_p3pzma6dagbbplwqpdli44ab5f
-% Encoding created by otftotfm on Mon May 13 16:21:10 2019
+%%AutoEnc_a73a6qm625fiizxfyxl2dex6if
+% Encoding created by otftotfm on Sat Jun 6 15:04:15 2020
% Command line follows encoding
-/AutoEnc_p3pzma6dagbbplwqpdli44ab5f [
+/AutoEnc_a73a6qm625fiizxfyxl2dex6if [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -29,8 +29,8 @@
/p /q /r /s /t /u /v /w
/x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
%80
- /f_f /f_i /f_l /f_f_i /f_f_l /f_b /f_h /f_j
- /f_k /f_t /Lslash /f_f_b /f_f_h /f_f_j /f_f_k /f_f_t
+ /f_b /f_h /f_j /f_k /f_t /f_f_b /f_f_h /f_f_j
+ /f_f_k /f_f_t /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
%90
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
-% --feature=pnum --xheight=x BaskervilleF-Regular.otf
-% BaskervilleF-Regular-lf-ot1'
+% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --xheight=x
+% BaskervilleF-Regular.otf BaskervilleF-Regular-lf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_iqxfxn.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_aqsbza.enc
index af10be834c6..9acbf8be857 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_iqxfxn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_aqsbza.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_iqxfxnow4s5x7xlhfqab2pm56c
-% Encoding created by otftotfm on Mon May 13 16:21:00 2019
+%%AutoEnc_aqsbzauwg4lbhrpmp7temf5sdg
+% Encoding created by otftotfm on Sat Jun 6 15:04:10 2020
% Command line follows encoding
-/AutoEnc_iqxfxnow4s5x7xlhfqab2pm56c [
+/AutoEnc_aqsbzauwg4lbhrpmp7temf5sdg [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -11,7 +11,7 @@
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
/.notdef /i.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
%20
- /uni2423 /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
/parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
%30
/zero /one /two /three /four /five /six /seven
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Italic.otf
-% BaskervilleF-Italic-tlf-sc-t1'
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-Italic.otf BaskervilleF-Italic-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_sqc4ly.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_arki3d.enc
index fa3a013b80d..a24c27d082a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_sqc4ly.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_arki3d.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_sqc4lyqzray3rglf3tpbjh3wva
-% Encoding created by otftotfm on Mon May 13 16:20:33 2019
+%%AutoEnc_arki3djnadbr3g7yeys4wth54g
+% Encoding created by otftotfm on Sat Jun 6 15:03:49 2020
% Command line follows encoding
-/AutoEnc_sqc4lyqzray3rglf3tpbjh3wva [
+/AutoEnc_arki3djnadbr3g7yeys4wth54g [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -29,8 +29,8 @@
/p /q /r /s /t /u /v /w
/x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
%80
- /f_f /f_i /f_l /f_f_i /f_f_l /f_b /f_h /f_j
- /f_k /f_t /Lslash /f_f_b /f_f_h /f_f_j /f_f_k /f_f_t
+ /f_b /f_h /f_j /f_k /f_t /f_f_b /f_f_h /f_f_j
+ /f_f_k /f_f_t /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
%90
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
-% --feature=tnum --xheight=x BaskervilleF-Bold.otf
-% BaskervilleF-Bold-tosf-ot1'
+% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_art6xf.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_art6xf.enc
new file mode 100644
index 00000000000..2705d775154
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_art6xf.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_art6xfgqpoq2f5ldkxnj6fcahh
+% Encoding created by otftotfm on Sat Jun 6 15:03:58 2020
+% Command line follows encoding
+/AutoEnc_art6xfgqpoq2f5ldkxnj6fcahh [
+%00
+ /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap
+ /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /exclam /asterisk
+%10
+ /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
+ /arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
+%20
+ /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
+ /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /.notdef /.notdef /uni3008 /minus /uni3009 /.notdef
+%40
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /uni2127 /.notdef /bigcircle
+%50
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /arrowup /arrowdown
+%60
+ /grave /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%70
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /.notdef
+%80
+ /breve /caron /hungarumlaut /.notdef /dagger /daggerdbl /.notdef /perthousand
+ /bullet /.notdef /dollar /cent /florin /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
+ /.notdef /.notdef /.notdef /.notdef /.notdef /estimated /.notdef /servicemark
+%A0
+ /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /.notdef /one.superior /ordmasculine /.notdef /onequarter /onehalf /threequarters /Euro
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ts1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
+% --feature=tnum --xheight=x BaskervilleF-BoldItalic.otf
+% BaskervilleF-BoldItalic-tosf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_z5rfyo.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_b5bk2y.enc
index 584d8a9df32..93d16de7fbf 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_z5rfyo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_b5bk2y.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_z5rfyoko23ucgmicrtqhzppn5e
-% Encoding created by otftotfm on Mon May 13 16:21:00 2019
+%%AutoEnc_b5bk2ycwanxqmjkkgc3oqnh66c
+% Encoding created by otftotfm on Sat Jun 6 15:04:10 2020
% Command line follows encoding
-/AutoEnc_z5rfyoko23ucgmicrtqhzppn5e [
+/AutoEnc_b5bk2ycwanxqmjkkgc3oqnh66c [
%00
/f_j /Euro.sc /f_f_j /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
%10
/i.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Italic.otf
-% BaskervilleF-Italic-tlf-sc-ly1'
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-Italic.otf BaskervilleF-Italic-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_o2tifi.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bnjopg.enc
index 3a98440c36e..0bc709a8137 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_o2tifi.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bnjopg.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_o2tifi3pcffxu5beq4vsvxesog
-% Encoding created by otftotfm on Mon May 13 16:20:30 2019
+%%AutoEnc_bnjopg4zdwrfhff7l4hr26ccdh
+% Encoding created by otftotfm on Sat Jun 6 15:03:52 2020
% Command line follows encoding
-/AutoEnc_o2tifi3pcffxu5beq4vsvxesog [
+/AutoEnc_bnjopg4zdwrfhff7l4hr26ccdh [
%00
- /f_j /Euro /f_f_j /f_f /fraction /dotaccent /hungarumlaut /ogonek
- /f_i /f_l /.notdef /f_f_i /f_f_l /f_b /f_h /f_k
+ /f_j /Euro /f_f_j /f_b /fraction /dotaccent /hungarumlaut /ogonek
+ /f_h /f_k /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
%10
/dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=tnum --xheight=x
-% BaskervilleF-Bold.otf BaskervilleF-Bold-tlf-ly1'
+% --feature=liga --feature=lnum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bnmcfu.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bnmcfu.enc
deleted file mode 100644
index 7d2815cf7e8..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bnmcfu.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_bnmcfuwyvhp3uko3nbqixmrskf
-% Encoding created by otftotfm on Mon May 13 16:20:46 2019
-% Command line follows encoding
-/AutoEnc_bnmcfuwyvhp3uko3nbqixmrskf [
-%00
- /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
-%80
- /f_f /f_i /f_l /f_f_i /f_f_l /f_b /f_h /f_k
- /f_j /f_t /Lslash /f_f_b /f_f_h /f_f_k /f_f_j /f_f_t
-%90
- /s_t /c_t /s_p /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf/fonts/tfm/public/baskervillef
-% --vf-directory=texmf/fonts/vf/public/baskervillef
-% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
-% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
-% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
-% --feature=lnum --feature=tnum --include-alternates=*.swash --feature=aalt
-% --xheight=x BaskervilleF-BoldItalic.otf
-% BaskervilleF-BoldItalic-tlf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_t5goht.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cjo72v.enc
index bfc068d9780..03bd813ca57 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_t5goht.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cjo72v.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_t5gohtlsl6wtwfqh7urxxfqemg
-% Encoding created by otftotfm on Mon May 13 16:20:27 2019
+%%AutoEnc_cjo72vshlrnsdh5gfke2ze5ajb
+% Encoding created by otftotfm on Sat Jun 6 15:03:50 2020
% Command line follows encoding
-/AutoEnc_t5gohtlsl6wtwfqh7urxxfqemg [
+/AutoEnc_cjo72vshlrnsdh5gfke2ze5ajb [
%00
- /f_j /Euro /f_f_j /f_f /fraction /dotaccent /hungarumlaut /ogonek
- /f_i /f_l /.notdef /f_f_i /f_f_l /f_b /f_h /f_k
+ /f_j /Euro /f_f_j /f_b /fraction /dotaccent /hungarumlaut /ogonek
+ /f_h /f_k /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
%10
/dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=pnum --xheight=x
-% BaskervilleF-Bold.otf BaskervilleF-Bold-lf-ly1'
+% --feature=liga --feature=lnum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_hkkd2g.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ck2hfy.enc
index 3a41faf67b3..e8db6f16f26 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_hkkd2g.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ck2hfy.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_hkkd2giv2lvysxwurkldmjdxah
-% Encoding created by otftotfm on Mon May 13 16:21:13 2019
+%%AutoEnc_ck2hfythk3ozpwdxdn5s7rhhtg
+% Encoding created by otftotfm on Sat Jun 6 15:04:18 2020
% Command line follows encoding
-/AutoEnc_hkkd2giv2lvysxwurkldmjdxah [
+/AutoEnc_ck2hfythk3ozpwdxdn5s7rhhtg [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -29,8 +29,8 @@
/p /q /r /s /t /u /v /w
/x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
%80
- /f_f /f_i /f_l /f_f_i /f_f_l /f_b /f_h /f_j
- /f_k /f_t /Lslash /f_f_b /f_f_h /f_f_j /f_f_k /f_f_t
+ /f_b /f_h /f_j /f_k /f_t /f_f_b /f_f_h /f_f_j
+ /f_f_k /f_f_t /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
%90
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
-% --feature=tnum --xheight=x BaskervilleF-Regular.otf
-% BaskervilleF-Regular-tlf-ot1'
+% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --xheight=x
+% BaskervilleF-Regular.otf BaskervilleF-Regular-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_csuamn.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_csuamn.enc
deleted file mode 100644
index 29094217d73..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_csuamn.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_csuamnl65ka6goafvolq7dtbkh
-% Encoding created by otftotfm on Mon May 13 16:21:08 2019
-% Command line follows encoding
-/AutoEnc_csuamnl65ka6goafvolq7dtbkh [
-%00
- /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
- /eight.oldstyle /nine.oldstyle /colon /semicolon /exclamdown /equal /questiondown /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
-%80
- /f_f /f_i /f_l /f_f_i /f_f_l /f_b /f_h /f_j
- /f_k /f_t /Lslash /f_f_b /f_f_h /f_f_j /f_f_k /f_f_t
-%90
- /s_t /c_t /s_p /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf/fonts/tfm/public/baskervillef
-% --vf-directory=texmf/fonts/vf/public/baskervillef
-% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
-% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
-% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
-% --feature=onum --feature=pnum --include-alternates=*.swash --feature=aalt
-% --xheight=x BaskervilleF-Regular.otf BaskervilleF-Regular-osf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cvjygd.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cvjygd.enc
index 12f0c125fe6..c7825694aaa 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cvjygd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cvjygd.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_cvjygdpe4epyombwll26l27qbd
-% Encoding created by otftotfm on Mon May 13 16:21:22 2019
+% Encoding created by otftotfm on Sat Jun 6 15:04:23 2020
% Command line follows encoding
/AutoEnc_cvjygdpe4epyombwll26l27qbd [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_e3xw3x.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_e3xw3x.enc
index fba904b061c..aaee1e12a1e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_e3xw3x.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_e3xw3x.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_e3xw3xozn5bs7ze5codsi77nvd
-% Encoding created by otftotfm on Mon May 13 16:20:26 2019
+% Encoding created by otftotfm on Sat Jun 6 15:03:54 2020
% Command line follows encoding
/AutoEnc_e3xw3xozn5bs7ze5codsi77nvd [
%00
@@ -57,9 +57,7 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=sups --ligkern=* {KL} * --xheight=x
-% BaskervilleF-Bold.otf BaskervilleF-Bold-sup-ly1'
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sups --ligkern=*
+% {KL} * --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_6mhi2z.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_e5ewsu.enc
index d668aad8488..8afeac3c3a4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_6mhi2z.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_e5ewsu.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_6mhi2zjjk6cwsjxnk5zpvd5haf
-% Encoding created by otftotfm on Mon May 13 16:20:25 2019
+%%AutoEnc_e5ewsuhlwjtckwxyl3bkzky6mg
+% Encoding created by otftotfm on Sat Jun 6 15:03:48 2020
% Command line follows encoding
-/AutoEnc_6mhi2zjjk6cwsjxnk5zpvd5haf [
+/AutoEnc_e5ewsuhlwjtckwxyl3bkzky6mg [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,16 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
-% --feature=pnum --feature=smcp --unicoding=germandbls =: SSsmall
-% --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-osf-sc-ot1'
+% --feature=pnum --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Bold.otf
+% BaskervilleF-Bold-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vaofbk.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_etzx2k.enc
index 9c46d73a692..11929ae23c2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vaofbk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_etzx2k.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_vaofbkxs27ufi3xtwdg3hkghea
-% Encoding created by otftotfm on Mon May 13 16:20:24 2019
+%%AutoEnc_etzx2kxblronahmbt4swbkr7jb
+% Encoding created by otftotfm on Sat Jun 6 15:03:47 2020
% Command line follows encoding
-/AutoEnc_vaofbkxs27ufi3xtwdg3hkghea [
+/AutoEnc_etzx2kxblronahmbt4swbkr7jb [
%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_b /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
+ /f_f /dotlessi /dotlessj /f_i /f_l /f_f_i /f_f_l /f_b
%20
- /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=onum --feature=pnum --xheight=x
-% BaskervilleF-Bold.otf BaskervilleF-Bold-osf-t1'
+% --feature=liga --feature=onum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_invrxa.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_fcs4fj.enc
index 3cf3bb29281..8bacb574d3f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_invrxa.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_fcs4fj.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_invrxa2p2b7pmfdljszsyalqsg
-% Encoding created by otftotfm on Mon May 13 16:21:03 2019
+%%AutoEnc_fcs4fjofblpaxboqi5ydb43ojd
+% Encoding created by otftotfm on Sat Jun 6 15:04:06 2020
% Command line follows encoding
-/AutoEnc_invrxa2p2b7pmfdljszsyalqsg [
+/AutoEnc_fcs4fjofblpaxboqi5ydb43ojd [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -11,7 +11,7 @@
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
/.notdef /i.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
%20
- /uni2423 /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
/parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
%30
/zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Italic.otf
-% BaskervilleF-Italic-tosf-sc-t1'
+% --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-Italic.otf BaskervilleF-Italic-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_gliky3.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_gliky3.enc
new file mode 100644
index 00000000000..2014207f3c8
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_gliky3.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_gliky3rk4uqmdtbgvkj7ee4yoc
+% Encoding created by otftotfm on Sat Jun 6 15:04:13 2020
+% Command line follows encoding
+/AutoEnc_gliky3rk4uqmdtbgvkj7ee4yoc [
+%00
+ /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap
+ /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /C /bar
+%10
+ /.notdef /.notdef /quotedblbase /.notdef /.notdef /twelveudash /threequartersemdash /.notdef
+ /arrowleft /arrowright /tieaccentlowercase /tieaccentcapital /.notdef /.notdef /.notdef /.notdef
+%20
+ /blank /.notdef /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
+ /.notdef /.notdef /asteriskmath /.notdef /comma /hyphendbl /period /fraction
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /.notdef /.notdef /uni3008 /minus /uni3009 /.notdef
+%40
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /uni2127 /.notdef /bigcircle
+%50
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni2126
+ /.notdef /.notdef /.notdef /openbracketleft /.notdef /openbracketright /arrowup /arrowdown
+%60
+ /grave /.notdef /born /divorced /died /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /leaf /married /.notdef /.notdef
+%70
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /hyphendbl
+%80
+ /breve /caron /hungarumlaut /.notdef /dagger /daggerdbl /.notdef /perthousand
+ /bullet /.notdef /dollar.oldstyle /cent.oldstyle /florin /colonmonetary /won /naira
+%90
+ /guarani /peso /lira /prescription /interrobang /interrobangdown /dong /trademark
+ /pertenthousand /pilcrow /baht /numero /discount /estimated /openbullet /servicemark
+%A0
+ /quillbracketleft /quillbracketright /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /copyleft /logicalnot /circledP /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph.alt /periodcentered
+ /referencemark /one.superior /ordmasculine /radical /onequarter /onehalf /threequarters /Euro
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ts1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
+% --feature=pnum --xheight=x BaskervilleF-Regular.otf
+% BaskervilleF-Regular-osf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_fj77ru.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_gmq6ah.enc
index 54ab39476c3..55e8152a6a9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_fj77ru.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_gmq6ah.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_fj77ruprpne2vztoqa3wxcdngb
-% Encoding created by otftotfm on Mon May 13 16:20:32 2019
+%%AutoEnc_gmq6ahea4mxqou5exi2d7yfoaf
+% Encoding created by otftotfm on Sat Jun 6 15:03:54 2020
% Command line follows encoding
-/AutoEnc_fj77ruprpne2vztoqa3wxcdngb [
+/AutoEnc_gmq6ahea4mxqou5exi2d7yfoaf [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -11,7 +11,7 @@
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
/.notdef /i.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
%20
- /uni2423 /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
/parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
%30
/zero /one /two /three /four /five /six /seven
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Bold.otf
-% BaskervilleF-Bold-tlf-sc-t1'
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_oyegn6.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_hwnpjr.enc
index 41cc3150423..629aa86bee6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_oyegn6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_hwnpjr.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_oyegn6ipmcr4ztb5dspzin22ec
-% Encoding created by otftotfm on Mon May 13 16:20:47 2019
+%%AutoEnc_hwnpjrein7ggqxrqnmnvk2yxpd
+% Encoding created by otftotfm on Sat Jun 6 15:03:57 2020
% Command line follows encoding
-/AutoEnc_oyegn6ipmcr4ztb5dspzin22ec [
+/AutoEnc_hwnpjrein7ggqxrqnmnvk2yxpd [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -29,8 +29,8 @@
/p /q /r /s /t /u /v /w
/x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
%80
- /f_f /f_i /f_l /f_f_i /f_f_l /f_b /f_h /f_k
- /f_j /f_t /Lslash /f_f_b /f_f_h /f_f_k /f_f_j /f_f_t
+ /f_b /f_h /f_k /f_j /f_t /f_f_b /f_f_h /f_f_k
+ /f_f_j /f_f_t /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
%90
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
-% --feature=tnum --xheight=x BaskervilleF-BoldItalic.otf
-% BaskervilleF-BoldItalic-tosf-ot1'
+% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --xheight=x
+% BaskervilleF-BoldItalic.otf BaskervilleF-BoldItalic-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_i3q27v.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_hykkzd.enc
index 1d267963e38..37920f11cf2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_i3q27v.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_hykkzd.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_i3q27vzedkw6fn266zghpzrntf
-% Encoding created by otftotfm on Mon May 13 16:20:52 2019
+%%AutoEnc_hykkzds5ndzmoa6loq3uc4bymh
+% Encoding created by otftotfm on Sat Jun 6 15:04:04 2020
% Command line follows encoding
-/AutoEnc_i3q27vzedkw6fn266zghpzrntf [
+/AutoEnc_hykkzds5ndzmoa6loq3uc4bymh [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,16 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
-% --feature=pnum --feature=smcp --unicoding=germandbls =: SSsmall
-% --xheight=x BaskervilleF-Italic.otf BaskervilleF-Italic-osf-sc-ot1'
+% --feature=pnum --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Italic.otf
+% BaskervilleF-Italic-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_m3z5kj.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ihgygy.enc
index f9a4cb2712c..82fa175783f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_m3z5kj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ihgygy.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_m3z5kjwccggzym2qfshaxf2cqb
-% Encoding created by otftotfm on Mon May 13 16:21:11 2019
+%%AutoEnc_ihgygy5yz4o7xmpx6xdxndvm6b
+% Encoding created by otftotfm on Sat Jun 6 15:04:16 2020
% Command line follows encoding
-/AutoEnc_m3z5kjwccggzym2qfshaxf2cqb [
+/AutoEnc_ihgygy5yz4o7xmpx6xdxndvm6b [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,16 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
-% --feature=pnum --feature=smcp --unicoding=germandbls =: SSsmall
-% --xheight=x BaskervilleF-Regular.otf BaskervilleF-Regular-lf-sc-ot1'
+% --feature=pnum --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Regular.otf
+% BaskervilleF-Regular-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_iy3fha.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_iy3fha.enc
index b4bdd47e01a..2042c646e3c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_iy3fha.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_iy3fha.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_iy3fham3r6unca3huoqdcitprg
-% Encoding created by otftotfm on Mon May 13 16:21:09 2019
+% Encoding created by otftotfm on Sat Jun 6 15:04:19 2020
% Command line follows encoding
/AutoEnc_iy3fham3r6unca3huoqdcitprg [
%00
@@ -57,9 +57,7 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=sups
-% --ligkern=* {KL} * --xheight=x BaskervilleF-Regular.otf
-% BaskervilleF-Regular-sup-ot1'
+% --coding-scheme=TEX TEXT --feature=sups --ligkern=* {KL} * --xheight=x
+% BaskervilleF-Regular.otf BaskervilleF-Regular-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_jayro7.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_jayro7.enc
deleted file mode 100644
index 9d27a043cf3..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_jayro7.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_jayro7a3n6nllmnjln7paa3ela
-% Encoding created by otftotfm on Mon May 13 16:21:18 2019
-% Command line follows encoding
-/AutoEnc_jayro7a3n6nllmnjln7paa3ela [
-%00
- /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
- /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
-%80
- /f_f /f_i /f_l /f_f_i /f_f_l /f_b /f_h /f_j
- /f_k /f_t /Lslash /f_f_b /f_f_h /f_f_j /f_f_k /f_f_t
-%90
- /s_t /c_t /s_p /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf/fonts/tfm/public/baskervillef
-% --vf-directory=texmf/fonts/vf/public/baskervillef
-% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
-% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
-% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
-% --feature=onum --feature=tnum --include-alternates=*.swash --feature=aalt
-% --xheight=x BaskervilleF-Regular.otf BaskervilleF-Regular-tosf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bvbtx2.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_jjbdnj.enc
index cd241c18f8c..5cc4df5d6aa 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_bvbtx2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_jjbdnj.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_bvbtx2zhwyxsshhyaj4eo67vhb
-% Encoding created by otftotfm on Mon May 13 16:20:27 2019
+%%AutoEnc_jjbdnjefoce6le43n7yvhya4pg
+% Encoding created by otftotfm on Sat Jun 6 15:03:54 2020
% Command line follows encoding
-/AutoEnc_bvbtx2zhwyxsshhyaj4eo67vhb [
+/AutoEnc_jjbdnjefoce6le43n7yvhya4pg [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -11,7 +11,7 @@
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
/.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
%20
- /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft.superior /parenright.superior /asterisk /plus /comma.superior /hyphen.superior /period.superior /slash.superior
%30
/zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
@@ -57,9 +57,8 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=sups --ligkern=* {KL} * --xheight=x
-% BaskervilleF-Bold.otf BaskervilleF-Bold-sup-t1'
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=sups
+% --ligkern=* {KL} * --xheight=x BaskervilleF-Bold.otf
+% BaskervilleF-Bold-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kodzea.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kodzea.enc
index 18981b35be0..cbd3ad035f5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kodzea.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kodzea.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_kodzeagf364epytensbsmcckta
-% Encoding created by otftotfm on Mon May 13 16:21:05 2019
+% Encoding created by otftotfm on Sat Jun 6 15:04:17 2020
% Command line follows encoding
/AutoEnc_kodzeagf364epytensbsmcckta [
%00
@@ -57,9 +57,7 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=dnom --feature=kern --feature=liga
-% --ligkern=* {KL} * --xheight=x BaskervilleF-Regular.otf
-% BaskervilleF-Regular-dnom-ot1'
+% --coding-scheme=TEX TEXT --feature=dnom --ligkern=* {KL} * --xheight=x
+% BaskervilleF-Regular.otf BaskervilleF-Regular-dnom-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_koujiy.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_koujiy.enc
deleted file mode 100644
index c20984fc15e..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_koujiy.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_koujiyecq5yd25tzzspz6usuvh
-% Encoding created by otftotfm on Mon May 13 16:20:29 2019
-% Command line follows encoding
-/AutoEnc_koujiyecq5yd25tzzspz6usuvh [
-%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
- /s_t /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
-%20
- /uni2423 /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 /Eng /Ohungarumlaut /Racute
-%90
- /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
- /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
-%A0
- /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
- /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
-%B0
- /rcaron /sacute /scaron /uni015F /tcaron /uni0163 /uhungarumlaut /uring
- /ydieresis /zacute /zcaron /zdotaccent /ij /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/baskervillef
-% --vf-directory=texmf/fonts/vf/public/baskervillef
-% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
-% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
-% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.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 --xheight=x
-% BaskervilleF-Bold.otf BaskervilleF-Bold-lf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kua26b.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kua26b.enc
deleted file mode 100644
index f22896849ca..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kua26b.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_kua26bn66d6edms3ua44yx54af
-% Encoding created by otftotfm on Mon May 13 16:20:26 2019
-% Command line follows encoding
-/AutoEnc_kua26bn66d6edms3ua44yx54af [
-%00
- /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
- /eight.oldstyle /nine.oldstyle /colon /semicolon /exclamdown /equal /questiondown /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
-%80
- /f_f /f_i /f_l /f_f_i /f_f_l /s_t /c_t /s_p
- /f_b /f_h /Lslash /f_j /f_k /f_t /f_f_b /f_f_h
-%90
- /f_f_j /f_f_k /f_f_t /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf/fonts/tfm/public/baskervillef
-% --vf-directory=texmf/fonts/vf/public/baskervillef
-% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
-% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
-% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
-% --feature=onum --feature=pnum --include-alternates=*.swash --feature=aalt
-% --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-osf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_s6fzkp.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_lfhy4n.enc
index 3f601bc4082..b4483998dc3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_s6fzkp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_lfhy4n.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_s6fzkptimks62fcr5z3lscb75a
-% Encoding created by otftotfm on Mon May 13 16:20:28 2019
+%%AutoEnc_lfhy4nyorzlx4oc6pexu3kusff
+% Encoding created by otftotfm on Sat Jun 6 15:03:51 2020
% Command line follows encoding
-/AutoEnc_s6fzkptimks62fcr5z3lscb75a [
+/AutoEnc_lfhy4nyorzlx4oc6pexu3kusff [
%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_b /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
+ /f_f /dotlessi /dotlessj /f_i /f_l /f_f_i /f_f_l /f_b
%20
- /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=lnum --feature=pnum --xheight=x
-% BaskervilleF-Bold.otf BaskervilleF-Bold-lf-t1'
+% --feature=liga --feature=lnum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-lf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_lfjjhs.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_lfjjhs.enc
new file mode 100644
index 00000000000..8b3a9754eea
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_lfjjhs.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_lfjjhszqopyzizhow2kgowpvyb
+% Encoding created by otftotfm on Sat Jun 6 15:04:18 2020
+% Command line follows encoding
+/AutoEnc_lfjjhszqopyzizhow2kgowpvyb [
+%00
+ /f_j /Euro.sc /f_f_j /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
+%10
+ /i.sc /j.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle.sc /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /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 /mu /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 /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-Regular.otf BaskervilleF-Regular-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ljx3jq.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_lh5uiy.enc
index 91fb3c25b16..d46a840bff7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ljx3jq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_lh5uiy.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_ljx3jquyfniyweqlactcrhi23e
-% Encoding created by otftotfm on Mon May 13 16:21:21 2019
+%%AutoEnc_lh5uiykjsw52utqrwx4b57tl7b
+% Encoding created by otftotfm on Sat Jun 6 15:04:22 2020
% Command line follows encoding
-/AutoEnc_ljx3jquyfniyweqlactcrhi23e [
+/AutoEnc_lh5uiykjsw52utqrwx4b57tl7b [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Omega /f_f /f_i /f_l /f_f_i /f_f_l
%10
/dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -29,8 +29,8 @@
/p /q /r /s /t /u /v /w
/x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
%80
- /f_f /f_i /f_l /f_f_i /f_f_l /f_b /f_h /f_k
- /f_j /f_t /Lslash /f_f_b /f_f_h /f_f_k /f_f_j /f_f_t
+ /f_b /f_h /f_k /f_j /f_t /f_f_b /f_f_h /f_f_k
+ /f_f_j /f_f_t /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
%90
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_igqvi4.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_lkeymy.enc
index 382f3be2e5a..b1b502d1261 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_igqvi4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_lkeymy.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_igqvi4zadxv453aa66t4xnu7db
-% Encoding created by otftotfm on Mon May 13 16:20:32 2019
+%%AutoEnc_lkeymyxu5nxjwp3njo7c2vcgph
+% Encoding created by otftotfm on Sat Jun 6 15:04:17 2020
% Command line follows encoding
-/AutoEnc_igqvi4zadxv453aa66t4xnu7db [
+/AutoEnc_lkeymyxu5nxjwp3njo7c2vcgph [
%00
- /f_j /Euro /f_f_j /f_f /fraction /dotaccent /hungarumlaut /ogonek
- /f_i /f_l /.notdef /f_f_i /f_f_l /s_t /c_t /s_p
+ /f_j /Euro /f_f_j /f_b /fraction /dotaccent /hungarumlaut /ogonek
+ /f_h /f_k /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
%10
/dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -38,7 +38,7 @@
/uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
- /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /degree /plusminus /two.superior /three.superior /acute /mu /pilcrow /periodcentered
/cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
%C0
/Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.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 --xheight=x
-% BaskervilleF-Bold.otf BaskervilleF-Bold-tlf-swash-ly1'
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --xheight=x BaskervilleF-Regular.otf
+% BaskervilleF-Regular-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kb3ura.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_m7qm6t.enc
index 2f2409598da..9139ff5415f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kb3ura.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_m7qm6t.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_kb3uraujjitspwxnomtfiuvs4f
-% Encoding created by otftotfm on Mon May 13 16:20:29 2019
+%%AutoEnc_m7qm6t5pxkyezk4dczizvefrzb
+% Encoding created by otftotfm on Sat Jun 6 15:03:52 2020
% Command line follows encoding
-/AutoEnc_kb3uraujjitspwxnomtfiuvs4f [
+/AutoEnc_m7qm6t5pxkyezk4dczizvefrzb [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -11,7 +11,7 @@
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
/.notdef /i.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
%20
- /uni2423 /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
/parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
%30
/zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Bold.otf
-% BaskervilleF-Bold-lf-sc-t1'
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_b5lrlg.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_mby7uf.enc
index 01d88b48b98..b9b27c1e297 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_b5lrlg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_mby7uf.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_b5lrlgewtpvnzikziqxh6dxs5b
-% Encoding created by otftotfm on Mon May 13 16:20:30 2019
+%%AutoEnc_mby7ufpw4genipkbwduve24c3h
+% Encoding created by otftotfm on Sat Jun 6 15:03:53 2020
% Command line follows encoding
-/AutoEnc_b5lrlgewtpvnzikziqxh6dxs5b [
+/AutoEnc_mby7ufpw4genipkbwduve24c3h [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -29,8 +29,8 @@
/p /q /r /s /t /u /v /w
/x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
%80
- /f_f /f_i /f_l /f_f_i /f_f_l /f_b /f_h /f_j
- /f_k /f_t /Lslash /f_f_b /f_f_h /f_f_j /f_f_k /f_f_t
+ /f_b /f_h /f_j /f_k /f_t /f_f_b /f_f_h /f_f_j
+ /f_f_k /f_f_t /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
%90
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
-% --feature=tnum --xheight=x BaskervilleF-Bold.otf
-% BaskervilleF-Bold-tlf-ot1'
+% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_n43ddx.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_n43ddx.enc
deleted file mode 100644
index bb7737c6ded..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_n43ddx.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_n43ddxvgz5ia2z5jy4scnppfzb
-% Encoding created by otftotfm on Mon May 13 16:20:42 2019
-% Command line follows encoding
-/AutoEnc_n43ddxvgz5ia2z5jy4scnppfzb [
-%00
- /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
- /eight.prop /nine.prop /colon /semicolon /exclamdown /equal /questiondown /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
-%80
- /f_f /f_i /f_l /f_f_i /f_f_l /f_b /f_h /f_k
- /f_j /f_t /Lslash /f_f_b /f_f_h /f_f_k /f_f_j /f_f_t
-%90
- /s_t /c_t /s_p /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf/fonts/tfm/public/baskervillef
-% --vf-directory=texmf/fonts/vf/public/baskervillef
-% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
-% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
-% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
-% --feature=lnum --feature=pnum --include-alternates=*.swash --feature=aalt
-% --xheight=x BaskervilleF-BoldItalic.otf
-% BaskervilleF-BoldItalic-lf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_n4mxmz.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_n4mxmz.enc
deleted file mode 100644
index 953e811e9ba..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_n4mxmz.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_n4mxmzlz5ce6ljqm2ehlowpz6d
-% Encoding created by otftotfm on Mon May 13 16:21:15 2019
-% Command line follows encoding
-/AutoEnc_n4mxmzlz5ce6ljqm2ehlowpz6d [
-%00
- /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
-%80
- /f_f /f_i /f_l /f_f_i /f_f_l /f_b /f_h /f_j
- /f_k /f_t /Lslash /f_f_b /f_f_h /f_f_j /f_f_k /f_f_t
-%90
- /s_t /c_t /s_p /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf/fonts/tfm/public/baskervillef
-% --vf-directory=texmf/fonts/vf/public/baskervillef
-% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
-% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
-% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
-% --feature=lnum --feature=tnum --include-alternates=*.swash --feature=aalt
-% --xheight=x BaskervilleF-Regular.otf BaskervilleF-Regular-tlf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_nvjtae.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_nvjtae.enc
deleted file mode 100644
index a321af86545..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_nvjtae.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_nvjtaehv7lh6dibhtkoyeavwad
-% Encoding created by otftotfm on Mon May 13 16:20:38 2019
-% Command line follows encoding
-/AutoEnc_nvjtaehv7lh6dibhtkoyeavwad [
-%00
- /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
- /eight.oldstyle /nine.oldstyle /colon /semicolon /exclamdown /equal /questiondown /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
-%80
- /f_f /f_i /f_l /f_f_i /f_f_l /f_b /f_h /f_k
- /f_j /f_t /Lslash /f_f_b /f_f_h /f_f_k /f_f_j /f_f_t
-%90
- /s_t /c_t /s_p /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf/fonts/tfm/public/baskervillef
-% --vf-directory=texmf/fonts/vf/public/baskervillef
-% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
-% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
-% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
-% --feature=onum --feature=pnum --include-alternates=*.swash --feature=aalt
-% --xheight=x BaskervilleF-BoldItalic.otf
-% BaskervilleF-BoldItalic-osf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_eurn55.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ogu2yp.enc
index 86ae877f083..4ba452da238 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_eurn55.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ogu2yp.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_eurn55iutb5udrc277hkyyncgb
-% Encoding created by otftotfm on Mon May 13 16:20:27 2019
+%%AutoEnc_ogu2ypyq6nu77tycdbrxxgzk2b
+% Encoding created by otftotfm on Sat Jun 6 15:03:51 2020
% Command line follows encoding
-/AutoEnc_eurn55iutb5udrc277hkyyncgb [
+/AutoEnc_ogu2ypyq6nu77tycdbrxxgzk2b [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -29,8 +29,8 @@
/p /q /r /s /t /u /v /w
/x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
%80
- /f_f /f_i /f_l /f_f_i /f_f_l /f_b /f_h /f_j
- /f_k /f_t /Lslash /f_f_b /f_f_h /f_f_j /f_f_k /f_f_t
+ /f_b /f_h /f_j /f_k /f_t /f_f_b /f_f_h /f_f_j
+ /f_f_k /f_f_t /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
%90
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,14 +51,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
-% --feature=pnum --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-lf-ot1'
+% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-lf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_owjda7.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_owjda7.enc
deleted file mode 100644
index 3554af30742..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_owjda7.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_owjda7lq4nz6ap4ujmhd6dha6b
-% Encoding created by otftotfm on Mon May 13 16:20:35 2019
-% Command line follows encoding
-/AutoEnc_owjda7lq4nz6ap4ujmhd6dha6b [
-%00
- /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
- /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
-%80
- /f_f /f_i /f_l /f_f_i /f_f_l /s_t /c_t /s_p
- /f_b /f_h /Lslash /f_j /f_k /f_t /f_f_b /f_f_h
-%90
- /f_f_j /f_f_k /f_f_t /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf/fonts/tfm/public/baskervillef
-% --vf-directory=texmf/fonts/vf/public/baskervillef
-% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
-% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
-% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
-% --feature=onum --feature=tnum --include-alternates=*.swash --feature=aalt
-% --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-tosf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_oxcsv2.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_oxcsv2.enc
index ca38d8cda0d..0e417cb89f2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_oxcsv2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_oxcsv2.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_oxcsv2hg7ty6hy2h7acb272cwc
-% Encoding created by otftotfm on Mon May 13 16:21:19 2019
+% Encoding created by otftotfm on Sat Jun 6 15:04:20 2020
% Command line follows encoding
/AutoEnc_oxcsv2hg7ty6hy2h7acb272cwc [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ahcsm7.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_pxbj3a.enc
index 9b6397143c9..2c854c97d29 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ahcsm7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_pxbj3a.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_ahcsm7vaj3onqfm3faomrkznvd
-% Encoding created by otftotfm on Mon May 13 16:20:31 2019
+%%AutoEnc_pxbj3aeajk5dx7jxk7xbgpwczg
+% Encoding created by otftotfm on Sat Jun 6 15:03:53 2020
% Command line follows encoding
-/AutoEnc_ahcsm7vaj3onqfm3faomrkznvd [
+/AutoEnc_pxbj3aeajk5dx7jxk7xbgpwczg [
%00
/f_j /Euro.sc /f_f_j /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
%10
/i.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Bold.otf
-% BaskervilleF-Bold-tlf-sc-ly1'
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_q37ime.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_q37ime.enc
deleted file mode 100644
index 0f8d0965466..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_q37ime.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_q37imeramxysujhsa5sncus7qa
-% Encoding created by otftotfm on Mon May 13 16:20:26 2019
-% Command line follows encoding
-/AutoEnc_q37imeramxysujhsa5sncus7qa [
-%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
- /s_t /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
-%20
- /uni2423 /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 /Eng /Ohungarumlaut /Racute
-%90
- /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
- /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
-%A0
- /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
- /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
-%B0
- /rcaron /sacute /scaron /uni015F /tcaron /uni0163 /uhungarumlaut /uring
- /ydieresis /zacute /zcaron /zdotaccent /ij /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/baskervillef
-% --vf-directory=texmf/fonts/vf/public/baskervillef
-% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
-% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
-% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.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 --xheight=x
-% BaskervilleF-Bold.otf BaskervilleF-Bold-osf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qiwnw4.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qiwnw4.enc
new file mode 100644
index 00000000000..1d5810c5d83
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qiwnw4.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_qiwnw4sfvte5vjd2qzjytternh
+% Encoding created by otftotfm on Sat Jun 6 15:04:15 2020
+% Command line follows encoding
+/AutoEnc_qiwnw4sfvte5vjd2qzjytternh [
+%00
+ /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap
+ /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /C /bar
+%10
+ /.notdef /.notdef /quotedblbase /.notdef /.notdef /twelveudash /threequartersemdash /.notdef
+ /arrowleft /arrowright /tieaccentlowercase /tieaccentcapital /.notdef /.notdef /.notdef /.notdef
+%20
+ /blank /.notdef /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
+ /.notdef /.notdef /asteriskmath /.notdef /comma /hyphendbl /period /fraction
+%30
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /.notdef /.notdef /uni3008 /minus /uni3009 /.notdef
+%40
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /uni2127 /.notdef /bigcircle
+%50
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni2126
+ /.notdef /.notdef /.notdef /openbracketleft /.notdef /openbracketright /arrowup /arrowdown
+%60
+ /grave /.notdef /born /divorced /died /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /leaf /married /.notdef /.notdef
+%70
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /hyphendbl
+%80
+ /breve /caron /hungarumlaut /.notdef /dagger /daggerdbl /.notdef /perthousand
+ /bullet /.notdef /dollar.oldstyle /cent.oldstyle /florin /colonmonetary /won /naira
+%90
+ /guarani /peso /lira /prescription /interrobang /interrobangdown /dong /trademark
+ /pertenthousand /pilcrow /baht /numero /discount /estimated /openbullet /servicemark
+%A0
+ /quillbracketleft /quillbracketright /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /copyleft /logicalnot /circledP /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph.alt /periodcentered
+ /referencemark /one.superior /ordmasculine /radical /onequarter /onehalf /threequarters /Euro
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ts1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
+% --feature=tnum --xheight=x BaskervilleF-Regular.otf
+% BaskervilleF-Regular-tosf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qleltn.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qleltn.enc
deleted file mode 100644
index 8ffed6e469a..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qleltn.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_qleltnq4prj3bhenacwo5mc4lc
-% Encoding created by otftotfm on Mon May 13 16:20:32 2019
-% Command line follows encoding
-/AutoEnc_qleltnq4prj3bhenacwo5mc4lc [
-%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
- /s_t /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
-%20
- /uni2423 /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 /Eng /Ohungarumlaut /Racute
-%90
- /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
- /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
-%A0
- /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
- /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
-%B0
- /rcaron /sacute /scaron /uni015F /tcaron /uni0163 /uhungarumlaut /uring
- /ydieresis /zacute /zcaron /zdotaccent /ij /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/baskervillef
-% --vf-directory=texmf/fonts/vf/public/baskervillef
-% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
-% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
-% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.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 --xheight=x
-% BaskervilleF-Bold.otf BaskervilleF-Bold-tlf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_66iezk.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qvggep.enc
index c799741b5c3..3c5ba9212ad 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_66iezk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qvggep.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_66iezktyy6lnqylxzs5fmaxkqb
-% Encoding created by otftotfm on Mon May 13 16:21:16 2019
+%%AutoEnc_qvggep75y6ugk47j3kmqrtwbyc
+% Encoding created by otftotfm on Sat Jun 6 15:04:14 2020
% Command line follows encoding
-/AutoEnc_66iezktyy6lnqylxzs5fmaxkqb [
+/AutoEnc_qvggep75y6ugk47j3kmqrtwbyc [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -29,8 +29,8 @@
/p /q /r /s /t /u /v /w
/x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
%80
- /f_f /f_i /f_l /f_f_i /f_f_l /f_b /f_h /f_j
- /f_k /f_t /Lslash /f_f_b /f_f_h /f_f_j /f_f_k /f_f_t
+ /f_b /f_h /f_j /f_k /f_t /f_f_b /f_f_h /f_f_j
+ /f_f_k /f_f_t /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
%90
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
-% --feature=tnum --xheight=x BaskervilleF-Regular.otf
-% BaskervilleF-Regular-tosf-ot1'
+% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --xheight=x
+% BaskervilleF-Regular.otf BaskervilleF-Regular-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rqjco3.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rqjco3.enc
new file mode 100644
index 00000000000..c2c070704f0
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rqjco3.enc
@@ -0,0 +1,63 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_rqjco3l7zetgxpdkpohwexblze
+% Encoding created by otftotfm on Sat Jun 6 15:04:19 2020
+% Command line follows encoding
+/AutoEnc_rqjco3l7zetgxpdkpohwexblze [
+%00
+ /f_j /Euro /f_f_j /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
+ /eight.superior /nine.superior /colon /semicolon /less /equal /greater /question
+%40
+ /at.superior /A.superior /B.superior /C.superior /D.superior /E.superior /F.superior /G.superior
+ /H.superior /I.superior /J.superior /K.superior /L.superior /M.superior /N.superior /O.superior
+%50
+ /P.superior /Q.superior /R.superior /S.superior /T.superior /U.superior /V.superior /W.superior
+ /X.superior /Y.superior /Z.superior /bracketleft.superior /backslash.superior /bracketright.superior /circumflex /underscore
+%60
+ /quoteleft /a.superior /b.superior /c.superior /d.superior /e.superior /f.superior /g.superior
+ /h.superior /i.superior /j.superior /k.superior /l.superior /m.superior /n.superior /o.superior
+%70
+ /p.superior /q.superior /r.superior /s.superior /t.superior /u.superior /v.superior /w.superior
+ /x.superior /y.superior /z.superior /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 /mu /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.superior /eacute.superior /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/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sups --ligkern=*
+% {KL} * --xheight=x BaskervilleF-Regular.otf BaskervilleF-Regular-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vunabj.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rtk6yp.enc
index d5170bdf47a..b6a2f8ce517 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vunabj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rtk6yp.enc
@@ -1,21 +1,21 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_vunabjtw4ultvfidespbepo63h
-% Encoding created by otftotfm on Mon May 13 16:20:54 2019
+%%AutoEnc_rtk6ypsz2s5exmsbqhcnbyvkrf
+% Encoding created by otftotfm on Sat Jun 6 15:04:06 2020
% Command line follows encoding
-/AutoEnc_vunabjtw4ultvfidespbepo63h [
+/AutoEnc_rtk6ypsz2s5exmsbqhcnbyvkrf [
%00
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
+ /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap
+ /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /exclam /asterisk
%10
/question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
/arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
%20
- /uni2423 /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
+ /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
/.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
%30
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /.notdef /.notdef /uni3008 /minus /uni3009 /.notdef
%40
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /uni2127 /.notdef /.notdef
@@ -23,22 +23,22 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /arrowup /arrowdown
%60
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /grave /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%70
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /.notdef
%80
- /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
- /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef
+ /breve /caron /hungarumlaut /.notdef /dagger /daggerdbl /.notdef /perthousand
+ /bullet /.notdef /dollar /cent /florin /.notdef /.notdef /.notdef
%90
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
/.notdef /.notdef /.notdef /.notdef /.notdef /estimated /openbullet /servicemark
%A0
/.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
- /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
+ /dieresis /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /macron
%B0
- /degree /plusminus /two.superior /three.superior /.notdef /mu /paragraph /periodcentered
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
/.notdef /one.superior /ordmasculine /.notdef /onequarter /onehalf /threequarters /Euro
%C0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,16 +51,14 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
- /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ts1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --xheight=x
-% BaskervilleF-Italic.otf BaskervilleF-Italic-osf-ts1'
+% --feature=tnum --xheight=x BaskervilleF-Italic.otf
+% BaskervilleF-Italic-tosf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rqwz3b.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_skajg2.enc
index 2fdb2a6fab2..45250ae8f94 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_rqwz3b.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_skajg2.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_rqwz3bua3k6b2wqskt2ntwvo6e
-% Encoding created by otftotfm on Mon May 13 16:20:29 2019
+%%AutoEnc_skajg2z4oyxm62kviplmvp3hvb
+% Encoding created by otftotfm on Sat Jun 6 15:04:15 2020
% Command line follows encoding
-/AutoEnc_rqwz3bua3k6b2wqskt2ntwvo6e [
+/AutoEnc_skajg2z4oyxm62kviplmvp3hvb [
%00
- /f_j /Euro /f_f_j /f_f /fraction /dotaccent /hungarumlaut /ogonek
- /f_i /f_l /.notdef /f_f_i /f_f_l /s_t /c_t /s_p
+ /f_j /Euro /f_f_j /f_b /fraction /dotaccent /hungarumlaut /ogonek
+ /f_h /f_k /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
%10
/dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -38,7 +38,7 @@
/uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
- /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /degree /plusminus /two.superior /three.superior /acute /mu /pilcrow /periodcentered
/cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
%C0
/Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -57,10 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.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 --xheight=x
-% BaskervilleF-Bold.otf BaskervilleF-Bold-lf-swash-ly1'
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --xheight=x BaskervilleF-Regular.otf BaskervilleF-Regular-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_tjuaha.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_srcuqk.enc
index bfbc7dbb9dd..2f8249865c9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_tjuaha.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_srcuqk.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_tjuahat4vog7mdbpg2jqusn46h
-% Encoding created by otftotfm on Mon May 13 16:20:51 2019
+%%AutoEnc_srcuqkcvst2aljrha2cjrxczde
+% Encoding created by otftotfm on Sat Jun 6 15:04:09 2020
% Command line follows encoding
-/AutoEnc_tjuahat4vog7mdbpg2jqusn46h [
+/AutoEnc_srcuqkcvst2aljrha2cjrxczde [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -11,7 +11,7 @@
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
/.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
%20
- /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero.denominator /one.denominator /two.denominator /three.denominator /four.denominator /five.denominator /six.denominator /seven.denominator
@@ -57,9 +57,8 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dnom
-% --feature=kern --feature=liga --ligkern=* {KL} * --xheight=x
-% BaskervilleF-Italic.otf BaskervilleF-Italic-dnom-t1'
+% --ligkern=* {KL} * --xheight=x BaskervilleF-Italic.otf
+% BaskervilleF-Italic-dnom-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_xlbenp.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_t3ys54.enc
index 0d449b1ba4f..9a8f38ac649 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_xlbenp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_t3ys54.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_xlbenpvoqdsmtln7klpy74gd7h
-% Encoding created by otftotfm on Mon May 13 16:21:00 2019
+%%AutoEnc_t3ys54xz6ojob6w32rqmgjio3g
+% Encoding created by otftotfm on Sat Jun 6 15:04:10 2020
% Command line follows encoding
-/AutoEnc_xlbenpvoqdsmtln7klpy74gd7h [
+/AutoEnc_t3ys54xz6ojob6w32rqmgjio3g [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,16 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
-% --feature=smcp --feature=tnum --unicoding=germandbls =: SSsmall
-% --xheight=x BaskervilleF-Italic.otf BaskervilleF-Italic-tlf-sc-ot1'
+% --feature=smcp --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Italic.otf
+% BaskervilleF-Italic-tlf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_t7zhq6.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_t7zhq6.enc
deleted file mode 100644
index 192098e62bb..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_t7zhq6.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_t7zhq6k7ychjgpgr4jdvdl3g4g
-% Encoding created by otftotfm on Mon May 13 16:20:49 2019
-% Command line follows encoding
-/AutoEnc_t7zhq6k7ychjgpgr4jdvdl3g4g [
-%00
- /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
- /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
-%80
- /f_f /f_i /f_l /f_f_i /f_f_l /f_b /f_h /f_k
- /f_j /f_t /Lslash /f_f_b /f_f_h /f_f_k /f_f_j /f_f_t
-%90
- /s_t /c_t /s_p /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf/fonts/tfm/public/baskervillef
-% --vf-directory=texmf/fonts/vf/public/baskervillef
-% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
-% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
-% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
-% --feature=onum --feature=tnum --include-alternates=*.swash --feature=aalt
-% --xheight=x BaskervilleF-BoldItalic.otf
-% BaskervilleF-BoldItalic-tosf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kuzvvg.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_th2k46.enc
index a914fc0732e..aab6907513e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kuzvvg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_th2k46.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_kuzvvgbsucjn7pnyxsopyop6we
-% Encoding created by otftotfm on Mon May 13 16:20:57 2019
+%%AutoEnc_th2k46cndbjforpqhvio5ohcib
+% Encoding created by otftotfm on Sat Jun 6 15:04:08 2020
% Command line follows encoding
-/AutoEnc_kuzvvgbsucjn7pnyxsopyop6we [
+/AutoEnc_th2k46cndbjforpqhvio5ohcib [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -11,7 +11,7 @@
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
/.notdef /i.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
%20
- /uni2423 /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
/parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
%30
/zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Italic.otf
-% BaskervilleF-Italic-lf-sc-t1'
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-Italic.otf BaskervilleF-Italic-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_pqfamk.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_to6jjw.enc
index 13d2b617375..e508382d725 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_pqfamk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_to6jjw.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_pqfamkphgu4z2jxsqz6hzpbxdd
-% Encoding created by otftotfm on Mon May 13 16:20:25 2019
+%%AutoEnc_to6jjwb4jttkdkj7hunagwb4ye
+% Encoding created by otftotfm on Sat Jun 6 15:04:11 2020
% Command line follows encoding
-/AutoEnc_pqfamkphgu4z2jxsqz6hzpbxdd [
+/AutoEnc_to6jjwb4jttkdkj7hunagwb4ye [
%00
- /f_j /Euro /f_f_j /f_f /fraction /dotaccent /hungarumlaut /ogonek
- /f_i /f_l /.notdef /f_f_i /f_f_l /s_t /c_t /s_p
+ /f_j /Euro /f_f_j /f_b /fraction /dotaccent /hungarumlaut /ogonek
+ /f_h /f_k /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
%10
/dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -38,7 +38,7 @@
/uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
%B0
- /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /degree /plusminus /two.superior /three.superior /acute /mu /pilcrow /periodcentered
/cedilla /one.superior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
%C0
/Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.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 --xheight=x
-% BaskervilleF-Bold.otf BaskervilleF-Bold-osf-swash-ly1'
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --xheight=x BaskervilleF-Regular.otf
+% BaskervilleF-Regular-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_twn2qn.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_twn2qn.enc
index 8b00feb188d..7eb7c87df0c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_twn2qn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_twn2qn.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_twn2qnxymh7f4dnrbtn3atx5ah
-% Encoding created by otftotfm on Mon May 13 16:20:40 2019
+% Encoding created by otftotfm on Sat Jun 6 15:04:02 2020
% Command line follows encoding
/AutoEnc_twn2qnxymh7f4dnrbtn3atx5ah [
%00
@@ -57,9 +57,7 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=sups
-% --ligkern=* {KL} * --xheight=x BaskervilleF-BoldItalic.otf
-% BaskervilleF-BoldItalic-sup-ot1'
+% --coding-scheme=TEX TEXT --feature=sups --ligkern=* {KL} * --xheight=x
+% BaskervilleF-BoldItalic.otf BaskervilleF-BoldItalic-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cgvvj5.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_typa7y.enc
index 8b2945af6bd..a22a214b0a7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_cgvvj5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_typa7y.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_cgvvj5w6lwwrkjtpfhzcq7he5e
-% Encoding created by otftotfm on Mon May 13 16:20:37 2019
+%%AutoEnc_typa7yunsr32nzoulwexk3hdph
+% Encoding created by otftotfm on Sat Jun 6 15:03:56 2020
% Command line follows encoding
-/AutoEnc_cgvvj5w6lwwrkjtpfhzcq7he5e [
+/AutoEnc_typa7yunsr32nzoulwexk3hdph [
%00
/f_j /Euro /f_f_j /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
%10
/i.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-BoldItalic.otf
-% BaskervilleF-BoldItalic-osf-sc-ly1'
+% --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-BoldItalic.otf BaskervilleF-BoldItalic-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_e6c7a3.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ueebfa.enc
index bcf21d60e12..1d13bb839c4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_e6c7a3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ueebfa.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_e6c7a3m7rmxskz3tdcih2de6sf
-% Encoding created by otftotfm on Mon May 13 16:20:52 2019
+%%AutoEnc_ueebfadqd7gbn4isdaad5c2tsh
+% Encoding created by otftotfm on Sat Jun 6 15:04:04 2020
% Command line follows encoding
-/AutoEnc_e6c7a3m7rmxskz3tdcih2de6sf [
+/AutoEnc_ueebfadqd7gbn4isdaad5c2tsh [
%00
/f_j /Euro.sc /f_f_j /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
%10
/i.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Italic.otf
-% BaskervilleF-Italic-osf-sc-ly1'
+% --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-Italic.otf BaskervilleF-Italic-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_taxp3x.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uf5aa7.enc
index 72a2ea0f9b1..120311c2ee0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_taxp3x.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uf5aa7.enc
@@ -1,17 +1,17 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_taxp3xvmurqhhb57xcdp3fvkwh
-% Encoding created by otftotfm on Mon May 13 16:20:31 2019
+%%AutoEnc_uf5aa7qjk6zmrqsgnyzon5oxdh
+% Encoding created by otftotfm on Sat Jun 6 15:03:53 2020
% Command line follows encoding
-/AutoEnc_taxp3xvmurqhhb57xcdp3fvkwh [
+/AutoEnc_uf5aa7qjk6zmrqsgnyzon5oxdh [
%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_b /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
+ /f_f /dotlessi /dotlessj /f_i /f_l /f_f_i /f_f_l /f_b
%20
- /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero /one /two /three /four /five /six /seven
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=lnum --feature=tnum --xheight=x
-% BaskervilleF-Bold.otf BaskervilleF-Bold-tlf-t1'
+% --feature=liga --feature=lnum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uf7ozb.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uf7ozb.enc
index 7321d1fcd33..dbc3f042183 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uf7ozb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uf7ozb.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_uf7ozbvq5rlswadh3b7hkzyuxb
-% Encoding created by otftotfm on Mon May 13 16:20:27 2019
+% Encoding created by otftotfm on Sat Jun 6 15:03:54 2020
% Command line follows encoding
/AutoEnc_uf7ozbvq5rlswadh3b7hkzyuxb [
%00
@@ -57,9 +57,7 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=sups
-% --ligkern=* {KL} * --xheight=x BaskervilleF-Bold.otf
-% BaskervilleF-Bold-sup-ot1'
+% --coding-scheme=TEX TEXT --feature=sups --ligkern=* {KL} * --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qycpdj.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ugitcp.enc
index e3982cd751b..8c700ba606d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qycpdj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ugitcp.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_qycpdjwi3svnylo3etgi6kb6ye
-% Encoding created by otftotfm on Mon May 13 16:21:17 2019
+%%AutoEnc_ugitcphp5mthz44gox755ybnwe
+% Encoding created by otftotfm on Sat Jun 6 15:04:14 2020
% Command line follows encoding
-/AutoEnc_qycpdjwi3svnylo3etgi6kb6ye [
+/AutoEnc_ugitcphp5mthz44gox755ybnwe [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,16 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
-% --feature=smcp --feature=tnum --unicoding=germandbls =: SSsmall
-% --xheight=x BaskervilleF-Regular.otf BaskervilleF-Regular-tosf-sc-ot1'
+% --feature=smcp --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Regular.otf
+% BaskervilleF-Regular-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_tqvuvp.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uqoays.enc
index 1e267683852..b4b68997d84 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_tqvuvp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uqoays.enc
@@ -1,21 +1,21 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_tqvuvpa7xkkhprhmvjvsqh7atb
-% Encoding created by otftotfm on Mon May 13 16:20:26 2019
+%%AutoEnc_uqoaysmj44fofcmatx3k5hcshd
+% Encoding created by otftotfm on Sat Jun 6 15:03:50 2020
% Command line follows encoding
-/AutoEnc_tqvuvpa7xkkhprhmvjvsqh7atb [
+/AutoEnc_uqoaysmj44fofcmatx3k5hcshd [
%00
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
+ /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap
+ /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /exclam /asterisk
%10
/question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
/arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
%20
- /uni2423 /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
+ /uni2422 /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
/.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
%30
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
+ /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+ /eight.taboldstyle /nine.taboldstyle /.notdef /.notdef /uni3008 /minus /uni3009 /.notdef
%40
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /uni2127 /.notdef /bigcircle
@@ -23,22 +23,22 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /arrowup /arrowdown
%60
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /grave /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%70
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /.notdef
%80
- /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
- /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef
+ /breve /caron /hungarumlaut /.notdef /dagger /daggerdbl /.notdef /perthousand
+ /bullet /.notdef /dollar /cent /florin /.notdef /.notdef /.notdef
%90
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
/.notdef /.notdef /.notdef /.notdef /.notdef /estimated /openbullet /servicemark
%A0
/.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
- /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
+ /dieresis /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /macron
%B0
- /degree /plusminus /two.superior /three.superior /.notdef /mu /paragraph /periodcentered
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
/.notdef /one.superior /ordmasculine /.notdef /onequarter /onehalf /threequarters /Euro
%C0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,16 +51,14 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
- /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ts1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --xheight=x
-% BaskervilleF-Bold.otf BaskervilleF-Bold-osf-ts1'
+% --feature=tnum --xheight=x BaskervilleF-Bold.otf
+% BaskervilleF-Bold-tosf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_pjh6nq.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uutbpy.enc
index 3a217a8d474..e3575038faf 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_pjh6nq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_uutbpy.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_pjh6nq5ax2npvuuz7hentgcixa
-% Encoding created by otftotfm on Mon May 13 16:21:03 2019
+%%AutoEnc_uutbpymhev2vvptvtb4whbw4ra
+% Encoding created by otftotfm on Sat Jun 6 15:04:05 2020
% Command line follows encoding
-/AutoEnc_pjh6nq5ax2npvuuz7hentgcixa [
+/AutoEnc_uutbpymhev2vvptvtb4whbw4ra [
%00
/f_j /Euro.sc /f_f_j /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
%10
/i.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Italic.otf
-% BaskervilleF-Italic-tosf-sc-ly1'
+% --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-Italic.otf BaskervilleF-Italic-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ve4agh.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ve4agh.enc
index 155da5c8a0c..8269b95a5c7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ve4agh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ve4agh.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ve4aghg7nepngxing4ssq3k3db
-% Encoding created by otftotfm on Mon May 13 16:20:50 2019
+% Encoding created by otftotfm on Sat Jun 6 15:04:09 2020
% Command line follows encoding
/AutoEnc_ve4aghg7nepngxing4ssq3k3db [
%00
@@ -57,9 +57,7 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=dnom --feature=kern --feature=liga
-% --ligkern=* {KL} * --xheight=x BaskervilleF-Italic.otf
-% BaskervilleF-Italic-dnom-ot1'
+% --coding-scheme=TEX TEXT --feature=dnom --ligkern=* {KL} * --xheight=x
+% BaskervilleF-Italic.otf BaskervilleF-Italic-dnom-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_dzrx7a.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vydigt.enc
index 345e46bcba2..1819eb84f9e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_dzrx7a.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vydigt.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_dzrx7an55wjkpskxuo36woxz2e
-% Encoding created by otftotfm on Mon May 13 16:20:41 2019
+%%AutoEnc_vydigtq2x57kduxxzr573k7pbf
+% Encoding created by otftotfm on Sat Jun 6 15:03:59 2020
% Command line follows encoding
-/AutoEnc_dzrx7an55wjkpskxuo36woxz2e [
+/AutoEnc_vydigtq2x57kduxxzr573k7pbf [
%00
/f_j /Euro /f_f_j /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
%10
/i.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-BoldItalic.otf
-% BaskervilleF-BoldItalic-lf-sc-ly1'
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-BoldItalic.otf BaskervilleF-BoldItalic-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_evqzha.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_w4i4io.enc
index c9c88684a92..7c42de98776 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_evqzha.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_w4i4io.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_evqzhabt2ymucdn7hepiveujfh
-% Encoding created by otftotfm on Mon May 13 16:20:53 2019
+%%AutoEnc_w4i4io333qc2hu5cgrmlb5bhgb
+% Encoding created by otftotfm on Sat Jun 6 15:04:04 2020
% Command line follows encoding
-/AutoEnc_evqzhabt2ymucdn7hepiveujfh [
+/AutoEnc_w4i4io333qc2hu5cgrmlb5bhgb [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -11,7 +11,7 @@
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
/.notdef /i.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
%20
- /uni2423 /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
/parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
%30
/zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Italic.otf
-% BaskervilleF-Italic-osf-sc-t1'
+% --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-Italic.otf BaskervilleF-Italic-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_w54rd4.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_w54rd4.enc
new file mode 100644
index 00000000000..0b9ccb7e169
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_w54rd4.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_w54rd4fk7e4ciq6amdcyronpdg
+% Encoding created by otftotfm on Sat Jun 6 15:04:16 2020
+% Command line follows encoding
+/AutoEnc_w54rd4fk7e4ciq6amdcyronpdg [
+%00
+ /f_j /Euro.sc /f_f_j /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
+%10
+ /i.sc /j.sc /grave /acute /caron /breve /macron /ring
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
+%30
+ /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+ /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question.sc
+%40
+ /at.sc /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.sc /backslash.sc /bracketright.sc /circumflex /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle.sc /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /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 /mu /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 /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-Regular.otf BaskervilleF-Regular-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vezlo5.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wbekxi.enc
index e566ffe271a..51666311375 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_vezlo5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wbekxi.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_vezlo55ek4ttribb5efnv55xqh
-% Encoding created by otftotfm on Mon May 13 16:20:56 2019
+%%AutoEnc_wbekxi5bluby6keidfocvh2n3f
+% Encoding created by otftotfm on Sat Jun 6 15:04:07 2020
% Command line follows encoding
-/AutoEnc_vezlo55ek4ttribb5efnv55xqh [
+/AutoEnc_wbekxi5bluby6keidfocvh2n3f [
%00
/f_j /Euro.sc /f_f_j /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
%10
/i.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Italic.otf
-% BaskervilleF-Italic-lf-sc-ly1'
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-Italic.otf BaskervilleF-Italic-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_lwrbox.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wn2rfu.enc
index 44bed53fc05..71aae63d5a3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_lwrbox.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wn2rfu.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_lwrbox7se3wd5cogjqnndamurd
-% Encoding created by otftotfm on Mon May 13 16:20:34 2019
+%%AutoEnc_wn2rfuc6gphtqljiplvbzqfzwh
+% Encoding created by otftotfm on Sat Jun 6 15:03:50 2020
% Command line follows encoding
-/AutoEnc_lwrbox7se3wd5cogjqnndamurd [
+/AutoEnc_wn2rfuc6gphtqljiplvbzqfzwh [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -11,7 +11,7 @@
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
/.notdef /i.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
%20
- /uni2423 /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
+ /space /exclam.sc /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
/parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen /period /slash.sc
%30
/zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Bold.otf
-% BaskervilleF-Bold-tosf-sc-t1'
+% --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wxljbs.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wxljbs.enc
new file mode 100644
index 00000000000..8e4771fa34c
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wxljbs.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_wxljbsrd56x6hirojjsa5xhmte
+% Encoding created by otftotfm on Sat Jun 6 15:04:04 2020
+% Command line follows encoding
+/AutoEnc_wxljbsrd56x6hirojjsa5xhmte [
+%00
+ /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap
+ /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /exclam /asterisk
+%10
+ /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
+ /arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
+%20
+ /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
+ /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
+%30
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /.notdef /.notdef /uni3008 /minus /uni3009 /.notdef
+%40
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /uni2127 /.notdef /.notdef
+%50
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /arrowup /arrowdown
+%60
+ /grave /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%70
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /.notdef
+%80
+ /breve /caron /hungarumlaut /.notdef /dagger /daggerdbl /.notdef /perthousand
+ /bullet /.notdef /dollar /cent /florin /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
+ /.notdef /.notdef /.notdef /.notdef /.notdef /estimated /openbullet /servicemark
+%A0
+ /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /macron
+%B0
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
+ /.notdef /one.superior /ordmasculine /.notdef /onequarter /onehalf /threequarters /Euro
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ts1
+% --tfm-directory=texmf/fonts/tfm/public/baskervillef
+% --vf-directory=texmf/fonts/vf/public/baskervillef
+% --type1-directory=texmf/fonts/type1/public/baskervillef
+% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
+% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
+% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
+% --feature=pnum --xheight=x BaskervilleF-Italic.otf
+% BaskervilleF-Italic-osf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_iy3qnl.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wybx5h.enc
index 9d43db71aab..7ba662dfb1f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_iy3qnl.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wybx5h.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_iy3qnlc4ybp2275r37kkmahnad
-% Encoding created by otftotfm on Mon May 13 16:20:41 2019
+%%AutoEnc_wybx5hnfzg5cslzk4fa5cbansa
+% Encoding created by otftotfm on Sat Jun 6 15:03:59 2020
% Command line follows encoding
-/AutoEnc_iy3qnlc4ybp2275r37kkmahnad [
+/AutoEnc_wybx5hnfzg5cslzk4fa5cbansa [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -29,8 +29,8 @@
/p /q /r /s /t /u /v /w
/x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
%80
- /f_f /f_i /f_l /f_f_i /f_f_l /f_b /f_h /f_k
- /f_j /f_t /Lslash /f_f_b /f_f_h /f_f_k /f_f_j /f_f_t
+ /f_b /f_h /f_k /f_j /f_t /f_f_b /f_f_h /f_f_k
+ /f_f_j /f_f_t /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
%90
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
-% --feature=pnum --xheight=x BaskervilleF-BoldItalic.otf
-% BaskervilleF-BoldItalic-lf-ot1'
+% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --xheight=x
+% BaskervilleF-BoldItalic.otf BaskervilleF-BoldItalic-lf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_a6zfty.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wyngyv.enc
index f72789167dd..37ad050d808 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_a6zfty.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_wyngyv.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_a6zftyie7ga4xtk56tjysnur7f
-% Encoding created by otftotfm on Mon May 13 16:20:33 2019
+%%AutoEnc_wyngyvekc5ecngshq6mipejegb
+% Encoding created by otftotfm on Sat Jun 6 15:03:49 2020
% Command line follows encoding
-/AutoEnc_a6zftyie7ga4xtk56tjysnur7f [
+/AutoEnc_wyngyvekc5ecngshq6mipejegb [
%00
- /f_j /Euro /f_f_j /f_f /fraction /dotaccent /hungarumlaut /ogonek
- /f_i /f_l /.notdef /f_f_i /f_f_l /f_b /f_h /f_k
+ /f_j /Euro /f_f_j /f_b /fraction /dotaccent /hungarumlaut /ogonek
+ /f_h /f_k /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
%10
/dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
/cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -57,9 +57,9 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=tnum --xheight=x
-% BaskervilleF-Bold.otf BaskervilleF-Bold-tosf-ly1'
+% --feature=liga --feature=onum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --xheight=x BaskervilleF-Bold.otf BaskervilleF-Bold-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_mebvzg.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_x7qzb2.enc
index 45b82ceb69c..ceffcab8557 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_mebvzg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_x7qzb2.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_mebvzgvfpivqsviu2wolu4ciug
-% Encoding created by otftotfm on Mon May 13 16:20:34 2019
+%%AutoEnc_x7qzb2jl2juxcypka356hwo6pb
+% Encoding created by otftotfm on Sat Jun 6 15:03:50 2020
% Command line follows encoding
-/AutoEnc_mebvzgvfpivqsviu2wolu4ciug [
+/AutoEnc_x7qzb2jl2juxcypka356hwo6pb [
%00
/f_j /Euro.sc /f_f_j /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
%10
/i.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Bold.otf
-% BaskervilleF-Bold-tosf-sc-ly1'
+% --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_xucdkt.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_xpcegd.enc
index 0511ae7360e..6e9836c8f33 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_xucdkt.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_xpcegd.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_xucdktxx5lr2c7yo3ukj37nmna
-% Encoding created by otftotfm on Mon May 13 16:20:24 2019
+%%AutoEnc_xpcegdgpjabwi2ohnxegeaeqqd
+% Encoding created by otftotfm on Sat Jun 6 15:03:55 2020
% Command line follows encoding
-/AutoEnc_xucdktxx5lr2c7yo3ukj37nmna [
+/AutoEnc_xpcegdgpjabwi2ohnxegeaeqqd [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -29,8 +29,8 @@
/p /q /r /s /t /u /v /w
/x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
%80
- /f_f /f_i /f_l /f_f_i /f_f_l /f_b /f_h /f_j
- /f_k /f_t /Lslash /f_f_b /f_f_h /f_f_j /f_f_k /f_f_t
+ /f_b /f_h /f_k /f_j /f_t /f_f_b /f_f_h /f_f_k
+ /f_f_j /f_f_t /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
%90
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
-% --feature=pnum --xheight=x BaskervilleF-Bold.otf
-% BaskervilleF-Bold-osf-ot1'
+% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --xheight=x
+% BaskervilleF-BoldItalic.otf BaskervilleF-BoldItalic-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_xt7x67.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_xt7x67.enc
deleted file mode 100644
index 1dcfebe8ffc..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_xt7x67.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_xt7x675c4ydss3csqdu3eabdmf
-% Encoding created by otftotfm on Mon May 13 16:21:12 2019
-% Command line follows encoding
-/AutoEnc_xt7x675c4ydss3csqdu3eabdmf [
-%00
- /.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
- /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring
- /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
-%20
- /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
- /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
- /eight.prop /nine.prop /colon /semicolon /exclamdown /equal /questiondown /question
-%40
- /at /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
-%60
- /quoteleft /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
-%80
- /f_f /f_i /f_l /f_f_i /f_f_l /f_b /f_h /f_j
- /f_k /f_t /Lslash /f_f_b /f_f_h /f_f_j /f_f_k /f_f_t
-%90
- /s_t /c_t /s_p /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=texmf/fonts/tfm/public/baskervillef
-% --vf-directory=texmf/fonts/vf/public/baskervillef
-% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
-% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
-% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=TEX TEXT --feature=dlig --feature=kern --feature=liga
-% --feature=lnum --feature=pnum --include-alternates=*.swash --feature=aalt
-% --xheight=x BaskervilleF-Regular.otf BaskervilleF-Regular-lf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qptswd.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_y3x75k.enc
index b1f61363b74..d4904a262ed 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_qptswd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_y3x75k.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_qptswd2yxesyyukiurjr5qlcmc
-% Encoding created by otftotfm on Mon May 13 16:20:36 2019
+%%AutoEnc_y3x75ktpd4pvbxqn2bu4wswdlc
+% Encoding created by otftotfm on Sat Jun 6 15:03:47 2020
% Command line follows encoding
-/AutoEnc_qptswd2yxesyyukiurjr5qlcmc [
+/AutoEnc_y3x75ktpd4pvbxqn2bu4wswdlc [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -29,8 +29,8 @@
/p /q /r /s /t /u /v /w
/x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
%80
- /f_f /f_i /f_l /f_f_i /f_f_l /f_b /f_h /f_k
- /f_j /f_t /Lslash /f_f_b /f_f_h /f_f_k /f_f_j /f_f_t
+ /f_b /f_h /f_j /f_k /f_t /f_f_b /f_f_h /f_f_j
+ /f_f_k /f_f_t /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
%90
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum
-% --feature=pnum --xheight=x BaskervilleF-BoldItalic.otf
-% BaskervilleF-BoldItalic-osf-ot1'
+% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kqfmr4.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_y7xbvf.enc
index e550e2627d8..07bf077ae42 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kqfmr4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_y7xbvf.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_kqfmr4op42f4wos4geinkaz3pf
-% Encoding created by otftotfm on Mon May 13 16:20:40 2019
+%%AutoEnc_y7xbvfmholxcwsugptf3uuptda
+% Encoding created by otftotfm on Sat Jun 6 15:04:02 2020
% Command line follows encoding
-/AutoEnc_kqfmr4op42f4wos4geinkaz3pf [
+/AutoEnc_y7xbvfmholxcwsugptf3uuptda [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -11,7 +11,7 @@
/quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
/.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef
%20
- /uni2423 /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
/zero.superior /one.superior /two.superior /three.superior /four.superior /five.superior /six.superior /seven.superior
@@ -57,9 +57,8 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
-% --feature=liga --feature=sups --ligkern=* {KL} * --xheight=x
-% BaskervilleF-BoldItalic.otf BaskervilleF-BoldItalic-sup-t1'
+% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=sups
+% --ligkern=* {KL} * --xheight=x BaskervilleF-BoldItalic.otf
+% BaskervilleF-BoldItalic-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_3oppw2.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ymdv6d.enc
index acb6ff883a7..95d5cd002f4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_3oppw2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_ymdv6d.enc
@@ -1,44 +1,44 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_3oppw2eannu7yl3zsk5u3c2sfg
-% Encoding created by otftotfm on Mon May 13 16:21:09 2019
+%%AutoEnc_ymdv6dcwwd4l4ghnxh2saj4t3b
+% Encoding created by otftotfm on Sat Jun 6 15:03:49 2020
% Command line follows encoding
-/AutoEnc_3oppw2eannu7yl3zsk5u3c2sfg [
+/AutoEnc_ymdv6dcwwd4l4ghnxh2saj4t3b [
%00
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
+ /grave.cap /acute.cap /circumflex.cap /tilde.cap /dieresis.cap /hungarumlaut.cap /ring.cap /caron.cap
+ /breve.cap /macron.cap /dotaccent.cap /cedilla /ogonek /quotesinglbase /exclam /asterisk
%10
/question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
/arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
%20
- /uni2423 /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
+ /uni2422 /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
/.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
%30
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
+ /zero.oldstyle /one.oldstyle /two.oldstyle /three.oldstyle /four.oldstyle /five.oldstyle /six.oldstyle /seven.oldstyle
+ /eight.oldstyle /nine.oldstyle /.notdef /.notdef /uni3008 /minus /uni3009 /.notdef
%40
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /uni2127 /.notdef /bigcircle
%50
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni2126
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /arrowup /arrowdown
%60
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /grave /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%70
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /asciitilde /.notdef
%80
- /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
- /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef
+ /breve /caron /hungarumlaut /.notdef /dagger /daggerdbl /.notdef /perthousand
+ /bullet /.notdef /dollar /cent /florin /.notdef /.notdef /.notdef
%90
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
/.notdef /.notdef /.notdef /.notdef /.notdef /estimated /openbullet /servicemark
%A0
/.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
- /.notdef /copyright /ordfeminine /.notdef /logicalnot /circledP /registered /.notdef
+ /dieresis /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /macron
%B0
- /degree /plusminus /two.superior /three.superior /.notdef /mu /paragraph /periodcentered
+ /degree /plusminus /two.superior /three.superior /acute /mu /paragraph /periodcentered
/.notdef /one.superior /ordmasculine /.notdef /onequarter /onehalf /threequarters /Euro
%C0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,16 +51,14 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
- /f_f_l /f_f_i /f_f /f_l /l /f_i /i /f
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ts1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
-% --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
-% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --xheight=x
-% BaskervilleF-Regular.otf BaskervilleF-Regular-osf-ts1'
+% --feature=pnum --xheight=x BaskervilleF-Bold.otf
+% BaskervilleF-Bold-osf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zfeutd.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zfeutd.enc
deleted file mode 100644
index 0848d47c7dd..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zfeutd.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_zfeutdwt6mr7rkk75qznvbwomd
-% Encoding created by otftotfm on Mon May 13 16:20:35 2019
-% Command line follows encoding
-/AutoEnc_zfeutdwt6mr7rkk75qznvbwomd [
-%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
- /s_t /dotlessi /dotlessj /f_f /f_i /f_l /f_f_i /f_f_l
-%20
- /uni2423 /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 /Eng /Ohungarumlaut /Racute
-%90
- /Rcaron /Sacute /Scaron /uni015E /Tcaron /uni0162 /Uhungarumlaut /Uring
- /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
-%A0
- /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
- /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute
-%B0
- /rcaron /sacute /scaron /uni015F /tcaron /uni0163 /uhungarumlaut /uring
- /ydieresis /zacute /zcaron /zdotaccent /ij /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/baskervillef
-% --vf-directory=texmf/fonts/vf/public/baskervillef
-% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
-% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
-% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.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 --xheight=x
-% BaskervilleF-Bold.otf BaskervilleF-Bold-tosf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_u24co6.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zkzy6d.enc
index 53b835e0ced..22274e93a0e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_u24co6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zkzy6d.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_u24co66kukxsm5tw24nzdk4t5g
-% Encoding created by otftotfm on Mon May 13 16:20:44 2019
+%%AutoEnc_zkzy6dcjbad47bynl3qndgajia
+% Encoding created by otftotfm on Sat Jun 6 15:04:00 2020
% Command line follows encoding
-/AutoEnc_u24co66kukxsm5tw24nzdk4t5g [
+/AutoEnc_zkzy6dcjbad47bynl3qndgajia [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -29,8 +29,8 @@
/p /q /r /s /t /u /v /w
/x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
%80
- /f_f /f_i /f_l /f_f_i /f_f_l /f_b /f_h /f_k
- /f_j /f_t /Lslash /f_f_b /f_f_h /f_f_k /f_f_j /f_f_t
+ /f_b /f_h /f_k /f_j /f_t /f_f_b /f_f_h /f_f_k
+ /f_f_j /f_f_t /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
%90
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
-% --feature=tnum --xheight=x BaskervilleF-BoldItalic.otf
-% BaskervilleF-BoldItalic-tlf-ot1'
+% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --xheight=x
+% BaskervilleF-BoldItalic.otf BaskervilleF-BoldItalic-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_owa6ha.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zpc5ms.enc
index 87c6a31e7cc..3c62e3d1aa1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_owa6ha.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zpc5ms.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_owa6hagzg7m2vxxsm6lccoucja
-% Encoding created by otftotfm on Mon May 13 16:21:14 2019
+%%AutoEnc_zpc5ms24fsood3gzyovsgs5osh
+% Encoding created by otftotfm on Sat Jun 6 15:04:18 2020
% Command line follows encoding
-/AutoEnc_owa6hagzg7m2vxxsm6lccoucja [
+/AutoEnc_zpc5ms24fsood3gzyovsgs5osh [
%00
/.notdef /Delta /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -51,15 +51,16 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
%F0
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=lnum
-% --feature=smcp --feature=tnum --unicoding=germandbls =: SSsmall
-% --xheight=x BaskervilleF-Regular.otf BaskervilleF-Regular-tlf-sc-ot1'
+% --feature=smcp --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Regular.otf
+% BaskervilleF-Regular-tlf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kragcu.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zvejcx.enc
index 0dca5a24b72..e0b5f2fe4de 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_kragcu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zvejcx.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_kragcuo7gbcbvdkufnw6xtdhpc
-% Encoding created by otftotfm on Mon May 13 16:20:24 2019
+%%AutoEnc_zvejcxuk5lpenhs4rq5l3y4eqb
+% Encoding created by otftotfm on Sat Jun 6 15:03:48 2020
% Command line follows encoding
-/AutoEnc_kragcuo7gbcbvdkufnw6xtdhpc [
+/AutoEnc_zvejcxuk5lpenhs4rq5l3y4eqb [
%00
/f_j /Euro.sc /f_f_j /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /f_f_l /f_f_i /f_f /f_l /f_i
%10
/i.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -57,10 +57,10 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall --xheight=x BaskervilleF-Bold.otf
-% BaskervilleF-Bold-osf-sc-ly1'
+% --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --xheight=x
+% BaskervilleF-Bold.otf BaskervilleF-Bold-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zygn7r.enc b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zygn7r.enc
index 29cc2d451af..8fe45ae3c9f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zygn7r.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/baskervillef/zba_zygn7r.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_zygn7rhg5zr43fj6xb7ihxnfhe
-% Encoding created by otftotfm on Mon May 13 16:20:50 2019
+% Encoding created by otftotfm on Sat Jun 6 15:04:08 2020
% Command line follows encoding
/AutoEnc_zygn7rhg5zr43fj6xb7ihxnfhe [
%00
@@ -57,9 +57,7 @@
% --tfm-directory=texmf/fonts/tfm/public/baskervillef
% --vf-directory=texmf/fonts/vf/public/baskervillef
% --type1-directory=texmf/fonts/type1/public/baskervillef
-% --truetype-directory=texmf/fonts/truetype/public/baskervillef
% --encoding-directory=texmf/fonts/enc/dvips/baskervillef
% --map-file=texmf/fonts/map/dvips/baskervillef/BaskervilleF.map --no-updmap
-% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dnom
-% --feature=kern --feature=liga --ligkern=* {KL} * --xheight=x
-% BaskervilleF-Italic.otf BaskervilleF-Italic-dnom-ly1'
+% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dnom --ligkern=*
+% {KL} * --xheight=x BaskervilleF-Italic.otf BaskervilleF-Italic-dnom-ly1'