summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/fonts/enc/dvips/cochineal
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-11-14 21:18:38 +0000
committerKarl Berry <karl@freefriends.org>2021-11-14 21:18:38 +0000
commitab7a84bcbf30675831657e3a3b79790e85c8dc4d (patch)
tree3c4544232e278bb593800e0b51580620a35f4304 /Master/texmf-dist/fonts/enc/dvips/cochineal
parentefb2d1d046b7f209f18fbc449e44ec58de6c675b (diff)
cochineal (14nov21)
git-svn-id: svn://tug.org/texlive/trunk@61056 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/fonts/enc/dvips/cochineal')
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2eakhu.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vb2qex.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2expjo.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2gvyjv.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2wxnkf.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2zgday.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3brrog.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3q3crd.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3r6zg3.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cochineal/coch_apzg65.enc)22
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3tt4zg.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_47bkd3.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4a4q4m.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4agesf.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4cigjb.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cochineal/coch_huz7n5.enc)22
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4plcvc.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4uy2eu.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5bitfe.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5f3gw2.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5o2hga.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5tib5i.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5tmqae.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5xilzy.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5xjvtq.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6lje3b.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6ry5ir.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6uoyes.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6wh55u.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6xmcha.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7fzfry.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7trhhc.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7v73vk.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aeaj7m.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aiajjq.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_alzuis.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_awf6hz.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7fuy52.enc)18
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_azqnwz.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bat6hu.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bhnmej.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bi2nei.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bjqtqq.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bjtzvy.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bnbjdf.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bp2pg7.enc15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cacm2n.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cbs7ow.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cuw7wa.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_d2hjcw.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_da7weg.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dbsvsj.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ddt3vr.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bhbiwe.enc)22
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_df5kan.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_djzri5.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dwjlw5.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dx3muq.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dxwjai.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_e745te.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_e77avd.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eluj5m.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ermyhb.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fcuols.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fdemcn.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fgurd2.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_g2axst.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gcpa6j.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gkpez6.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_grutwx.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_h2t4ei.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hqneph.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ibp3xz.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ikkvry.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cochineal/coch_izjs6r.enc)22
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_j7mi7a.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jgxutr.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jhwmea.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jhwq7e.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jmow3t.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ns6y37.enc)24
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kbpxlj.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kbxkrg.enc15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kfj2qw.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kfnsdu.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_klonus.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ktoy4w.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kuld3f.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kxx5cy.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kzot5v.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l47tcy.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l64ji6.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lchlkf.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ldgozj.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cochineal/coch_f6cstm.enc)22
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_liz2hd.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lqmdx6.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lropbz.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lzqtrs.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7cy5le.enc)22
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_m4bmrm.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_max2ec.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uk6vx5.enc)22
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mo2enl.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mu7xli.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ekjpcs.enc)20
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nj5yu3.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wdpw3f.enc)22
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nlwa7l.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nraham.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_o4vutb.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_o5mx43.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_odnecf.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_okzdl2.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ol4knl.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_opxmsy.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_oqmhja.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_otkq6i.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_p7j4gw.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pf3hrr.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pfcyih.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2cqomt.enc)22
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pilffg.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cochineal/coch_d2sl3v.enc)22
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pqzq4p.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_q35ey5.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_q4ulxa.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qkxc47.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qqsbmj.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qy633g.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qyvxxn.enc15
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qzhi24.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r2kqsv.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rix5n3.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rv5tmq.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3m7z6q.enc)22
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_s4niqi.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5dzpv7.enc)22
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_saoql6.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sc4bro.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sq6y2y.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sygphi.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_syo7sr.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t556x2.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t7e5d4.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tfefcu.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_th736v.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fn4k7j.enc)22
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tjygyt.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tkhq7f.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tnxjqs.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mgd2ev.enc)22
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tzth5f.enc66
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_u3j4lk.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uavkhn.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uemkt3.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7kg32s.enc)22
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uh66oa.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uqbj7f.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vew4u5.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vpdkzq.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_w6vdgs.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wa4y3o.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wcbuwv.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wnd62o.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wpweoy.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wuwrcy.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_x3v6nt.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_x4ugem.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xaxcx7.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xsridg.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_y3tmc2.enc (renamed from Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4srkt4.enc)22
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ygltby.enc16
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yprnrw.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_z2oun7.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zbphsw.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zg5irv.enc12
158 files changed, 1491 insertions, 933 deletions
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vb2qex.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2eakhu.enc
index 7f1dd1a5576..d47ccfa49b7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vb2qex.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2eakhu.enc
@@ -1,11 +1,11 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_vb2qexjjaq22oguih3zjk34uzb
-% Encoding created by otftotfm on Mon Sep 14 22:42:30 2020
+%%AutoEnc_2eakhuqy5mvv2jjhzng5lgrofg
+% Encoding created by otftotfm on Sun Nov 7 16:37:02 2021
% Command line follows encoding
-/AutoEnc_vb2qexjjaq22oguih3zjk34uzb [
+/AutoEnc_2eakhuqy5mvv2jjhzng5lgrofg [
%00
- /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /Euro /.notdef /.notdef /fraction.denom /dotaccent /hungarumlaut /ogonek
/uniFB02 /.notdef /uni200C /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
%10
/dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=dnom --ligkern=* {KL} * --space-factor=1.06635
% Cochineal-Roman.otf Cochineal-Roman-dnom-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2expjo.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2expjo.enc
index a86b3a0f992..12a3a5c3d95 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2expjo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2expjo.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_2expjo42guqsy363euuguk44if
-% Encoding created by otftotfm on Mon Sep 14 22:42:24 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:06 2021
% Command line follows encoding
/AutoEnc_2expjo42guqsy363euuguk44if [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=dlig --feature=kern --feature=liga --feature=lnum --feature=pnum
% --feature=swsh --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2gvyjv.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2gvyjv.enc
index 7f549003785..83e74cfc8cb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2gvyjv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2gvyjv.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_2gvyjv6rul2yspsiq52jslfnwg
-% Encoding created by otftotfm on Mon Sep 14 22:42:34 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:09 2021
% Command line follows encoding
/AutoEnc_2gvyjv6rul2yspsiq52jslfnwg [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=onum --feature=pnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2wxnkf.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2wxnkf.enc
index 6d3da629512..35b61a9d3a3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2wxnkf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2wxnkf.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_2wxnkf53zy7vjiak6l6rjs4xrg
-% Encoding created by otftotfm on Mon Sep 14 22:41:42 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:16 2021
% Command line follows encoding
/AutoEnc_2wxnkf53zy7vjiak6l6rjs4xrg [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=lnum --feature=pnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2zgday.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2zgday.enc
index f6cd9270c04..b77c9e78514 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2zgday.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2zgday.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_2zgdayjlytletb3q4z5pyn7xzh
-% Encoding created by otftotfm on Mon Sep 14 22:42:30 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:08 2021
% Command line follows encoding
/AutoEnc_2zgdayjlytletb3q4z5pyn7xzh [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=sups --ligkern=* {KL} * --space-factor=1.06635
% Cochineal-Roman.otf Cochineal-Roman-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3brrog.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3brrog.enc
index dcec8cd2411..2bf4c4ddd0a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3brrog.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3brrog.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_3brrogoxg6la2r6v3lmqjnramb
-% Encoding created by otftotfm on Mon Sep 14 22:42:18 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:57 2021
% Command line follows encoding
/AutoEnc_3brrogoxg6la2r6v3lmqjnramb [
%00
@@ -54,13 +54,15 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Italic.otf Cochineal-Italic-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3q3crd.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3q3crd.enc
index 35ed47d0c04..802bd67ed97 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3q3crd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3q3crd.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_3q3crdxrnygxtgz4spx6l6gr7d
-% Encoding created by otftotfm on Mon Sep 14 22:42:36 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:10 2021
% Command line follows encoding
/AutoEnc_3q3crdxrnygxtgz4spx6l6gr7d [
%00
@@ -54,13 +54,15 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_apzg65.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3r6zg3.enc
index 4050668a83c..fd74369df38 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_apzg65.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3r6zg3.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_apzg65vf2pg6nmnbvv4dqi5wph
-% Encoding created by otftotfm on Mon Sep 14 22:42:32 2020
+%%AutoEnc_3r6zg32dyk464mr3oxnr5shrvd
+% Encoding created by otftotfm on Sun Nov 7 16:37:13 2021
% Command line follows encoding
-/AutoEnc_apzg65vf2pg6nmnbvv4dqi5wph [
+/AutoEnc_3r6zg32dyk464mr3oxnr5shrvd [
%00
- /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /uniFB02.sc /.notdef /uni200C /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+ /f.sc /Euro /i.sc /l.sc /fraction /dotaccent /hungarumlaut /ogonek
+ /uniFB02.sc /s.sc /uni200C /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
%10
/dotlessi.sc /j.sc /grave /acute.sc /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,13 +54,15 @@
/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=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3tt4zg.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3tt4zg.enc
index a87257b5089..83d6fac4f2f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3tt4zg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3tt4zg.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_3tt4zgqhjrr6i5fyh7u2mnv33b
-% Encoding created by otftotfm on Mon Sep 14 22:41:49 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:13 2021
% Command line follows encoding
/AutoEnc_3tt4zgqhjrr6i5fyh7u2mnv33b [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=dlig --feature=kern --feature=liga --feature=lnum --feature=swsh
% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_47bkd3.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_47bkd3.enc
index 26600b3f91a..ad604da6bc7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_47bkd3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_47bkd3.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_47bkd3eyyerxbezjwdpofkhpoa
-% Encoding created by otftotfm on Mon Sep 14 22:42:09 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:49 2021
% Command line follows encoding
/AutoEnc_47bkd3eyyerxbezjwdpofkhpoa [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=lnum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4a4q4m.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4a4q4m.enc
new file mode 100644
index 00000000000..f6b9f6d35b1
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4a4q4m.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_4a4q4mls6um5mqrcvegwey45ec
+% Encoding created by otftotfm on Sun Nov 7 16:36:21 2021
+% Command line follows encoding
+/AutoEnc_4a4q4mls6um5mqrcvegwey45ec [
+%00
+ /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+ /Phi /Psi /uni03A9 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+%10
+ /dotlessi /uni0237 /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.onum /one.onum /two.onum /three.onum /five.onum /five.onum /six.onum /seven.onum
+ /eight.onum /nine.onum /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.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=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4agesf.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4agesf.enc
index 42a095c342f..7761b52a0de 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4agesf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4agesf.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_4agesfndybccbvczanjkuvsphe
-% Encoding created by otftotfm on Mon Sep 14 22:42:23 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:06 2021
% Command line follows encoding
/AutoEnc_4agesfndybccbvczanjkuvsphe [
%00
@@ -54,13 +54,15 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_huz7n5.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4cigjb.enc
index b304aa516d7..c174ab2b1f6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_huz7n5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4cigjb.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_huz7n526fu6fb3b4zm67tj2q6a
-% Encoding created by otftotfm on Mon Sep 14 22:41:55 2020
+%%AutoEnc_4cigjb6wfdkelwlhnnwtjgopne
+% Encoding created by otftotfm on Sun Nov 7 16:36:22 2021
% Command line follows encoding
-/AutoEnc_huz7n526fu6fb3b4zm67tj2q6a [
+/AutoEnc_4cigjb6wfdkelwlhnnwtjgopne [
%00
/Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
/Phi /Psi /uni03A9 /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
@@ -14,7 +14,7 @@
/space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
- /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
+ /zero.onum /one.onum /two.onum /three.onum /five.onum /five.onum /six.onum /seven.onum
/eight.onum /nine.onum /colon /semicolon /exclamdown /equal /questiondown /question
%40
/at /A /B /C /D /E /F /G
@@ -54,13 +54,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=onum --feature=pnum --feature=smcp --ligkern=f i =: fi
% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --unicoding=germandbls =: SSsmall --space-factor=1.06635
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall --space-factor=1.06635
% Cochineal-Bold.otf Cochineal-Bold-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4plcvc.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4plcvc.enc
index ff6ef2597e9..c812465eadf 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4plcvc.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4plcvc.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_4plcvclfw5oqhh2c5qbwaibc3c
-% Encoding created by otftotfm on Mon Sep 14 22:41:48 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:13 2021
% Command line follows encoding
/AutoEnc_4plcvclfw5oqhh2c5qbwaibc3c [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=dlig --feature=kern --feature=liga --feature=lnum --feature=swsh
% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4uy2eu.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4uy2eu.enc
new file mode 100644
index 00000000000..0c76efe0897
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4uy2eu.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_4uy2euhxqbrgm76bfy553puuhd
+% Encoding created by otftotfm on Sun Nov 7 16:36:24 2021
+% Command line follows encoding
+/AutoEnc_4uy2euhxqbrgm76bfy553puuhd [
+%00
+ /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+ /Phi /Psi /uni03A9 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+%10
+ /dotlessi /uni0237 /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.onum /one.onum /two.onum /three.onum /five.onum /five.onum /six.onum /seven.onum
+ /eight.onum /nine.onum /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.alt01 /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.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=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --force --coding-scheme=TEX TEXT --feature=dlig --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=swsh --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --include-alternates=*.swash --space-factor=1.06635
+% Cochineal-Bold.otf Cochineal-Bold-osf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5bitfe.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5bitfe.enc
index e7d54780ce0..23d90c00e2d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5bitfe.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5bitfe.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_5bitfekk67ldax653y6oamlfvc
-% Encoding created by otftotfm on Mon Sep 14 22:41:50 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:20 2021
% Command line follows encoding
/AutoEnc_5bitfekk67ldax653y6oamlfvc [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=sups --ligkern=* {KL} * --space-factor=1.06635
% Cochineal-Bold.otf Cochineal-Bold-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5f3gw2.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5f3gw2.enc
index dc6a9455e7c..8f9135bf86e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5f3gw2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5f3gw2.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_5f3gw2bq6ybxzbg4dovve2frka
-% Encoding created by otftotfm on Mon Sep 14 22:41:53 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:28 2021
% Command line follows encoding
/AutoEnc_5f3gw2bq6ybxzbg4dovve2frka [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=dlig --feature=kern --feature=liga --feature=onum --feature=swsh
% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5o2hga.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5o2hga.enc
index 6a5840bc452..19994afc7ac 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5o2hga.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5o2hga.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_5o2hga3ppywv6vdeus4d2hky4e
-% Encoding created by otftotfm on Mon Sep 14 22:42:25 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:03 2021
% Command line follows encoding
/AutoEnc_5o2hga3ppywv6vdeus4d2hky4e [
%00
@@ -54,10 +54,10 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=sinf --ligkern=*
% {KL} * --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-inf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5tib5i.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5tib5i.enc
index c04ae5ce584..474fc73495c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5tib5i.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5tib5i.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_5tib5io377t463nedzuu5l4xze
-% Encoding created by otftotfm on Mon Sep 14 22:42:15 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:52 2021
% Command line follows encoding
/AutoEnc_5tib5io377t463nedzuu5l4xze [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=sups --ligkern=*
% {KL} * --space-factor=1.06635 Cochineal-Italic.otf
% Cochineal-Italic-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5tmqae.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5tmqae.enc
index 02a7cd1bc1c..fc06a6de96f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5tmqae.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5tmqae.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_5tmqaenpbkl6oh6smarwcfttqb
-% Encoding created by otftotfm on Mon Sep 14 22:42:12 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:43 2021
% Command line follows encoding
/AutoEnc_5tmqaenpbkl6oh6smarwcfttqb [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=lnum --feature=tnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5xilzy.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5xilzy.enc
index f855ad91640..60e8d7c8670 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5xilzy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5xilzy.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_5xilzyneap6k7cudwj6y2cepnf
-% Encoding created by otftotfm on Mon Sep 14 22:42:25 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:04 2021
% Command line follows encoding
/AutoEnc_5xilzyneap6k7cudwj6y2cepnf [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=sinf --ligkern=* {KL} * --space-factor=1.06635
% Cochineal-Roman.otf Cochineal-Roman-inf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5xjvtq.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5xjvtq.enc
index f51afae8fcf..f35f1d24f65 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5xjvtq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5xjvtq.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_5xjvtqhpbcqim4ueqpdcsetevh
-% Encoding created by otftotfm on Mon Sep 14 22:42:19 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:52 2021
% Command line follows encoding
/AutoEnc_5xjvtqhpbcqim4ueqpdcsetevh [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=onum --feature=pnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6lje3b.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6lje3b.enc
index fef1ab04412..fdd42c8e6fb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6lje3b.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6lje3b.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_6lje3bgugdokq6zkefzufrtx2f
-% Encoding created by otftotfm on Mon Sep 14 22:42:14 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:46 2021
% Command line follows encoding
/AutoEnc_6lje3bgugdokq6zkefzufrtx2f [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=dlig --feature=kern
% --feature=liga --feature=lnum --feature=swsh --feature=tnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6ry5ir.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6ry5ir.enc
index 822b85105f2..afe53727dfb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6ry5ir.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6ry5ir.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_6ry5irdxs5vu44ub5afjggru7b
-% Encoding created by otftotfm on Mon Sep 14 22:42:17 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:56 2021
% Command line follows encoding
/AutoEnc_6ry5irdxs5vu44ub5afjggru7b [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6uoyes.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6uoyes.enc
index 07bd78d813a..6c0a4a44ae8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6uoyes.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6uoyes.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_6uoyesu2zdpgg7zf223buhy3ic
-% Encoding created by otftotfm on Mon Sep 14 22:41:43 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:17 2021
% Command line follows encoding
/AutoEnc_6uoyesu2zdpgg7zf223buhy3ic [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=lnum --feature=pnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6wh55u.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6wh55u.enc
index 4855699c6d0..281b59378b1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6wh55u.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6wh55u.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_6wh55upnd6qdlricgj4joq4rye
-% Encoding created by otftotfm on Mon Sep 14 22:42:13 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:45 2021
% Command line follows encoding
/AutoEnc_6wh55upnd6qdlricgj4joq4rye [
%00
@@ -54,13 +54,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=lnum --feature=smcp --feature=tnum --ligkern=f i =: fi
% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --unicoding=germandbls =: SSsmall --space-factor=1.06635
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall --space-factor=1.06635
% Cochineal-Italic.otf Cochineal-Italic-tlf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6xmcha.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6xmcha.enc
index ee17064ea39..1f8c73e9f57 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6xmcha.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6xmcha.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_6xmcha3vob3odbuyee3q6u6dpb
-% Encoding created by otftotfm on Mon Sep 14 22:42:48 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:27 2021
% Command line follows encoding
/AutoEnc_6xmcha3vob3odbuyee3q6u6dpb [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7fzfry.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7fzfry.enc
index f3a7ca55e43..9713bba99ed 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7fzfry.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7fzfry.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_7fzfrye3756oasgkv7kqe37bgh
-% Encoding created by otftotfm on Mon Sep 14 22:42:32 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:13 2021
% Command line follows encoding
/AutoEnc_7fzfrye3756oasgkv7kqe37bgh [
%00
@@ -54,13 +54,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=onum --feature=smcp --feature=tnum --ligkern=f i =: fi
% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --unicoding=germandbls =: SSsmall --space-factor=1.06635
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall --space-factor=1.06635
% Cochineal-Roman.otf Cochineal-Roman-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7trhhc.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7trhhc.enc
index 581f941d1c8..2a2d902da29 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7trhhc.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7trhhc.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_7trhhccfby3myg6a2kk5nxnbla
-% Encoding created by otftotfm on Mon Sep 14 22:41:46 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:15 2021
% Command line follows encoding
/AutoEnc_7trhhccfby3myg6a2kk5nxnbla [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=sinf --ligkern=* {KL} * --space-factor=1.06635
% Cochineal-Bold.otf Cochineal-Bold-inf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7v73vk.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7v73vk.enc
index 1080a435ecc..57901cd5cfe 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7v73vk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7v73vk.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_7v73vk5pbwkzn4lcvupirxdy3c
-% Encoding created by otftotfm on Mon Sep 14 22:42:32 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:14 2021
% Command line follows encoding
/AutoEnc_7v73vk5pbwkzn4lcvupirxdy3c [
%00
@@ -54,13 +54,15 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aeaj7m.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aeaj7m.enc
index 7adab2e381e..9b9da678827 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aeaj7m.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aeaj7m.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_aeaj7mfbmcdcxbxx4hkkdkknhe
-% Encoding created by otftotfm on Mon Sep 14 22:42:47 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:26 2021
% Command line follows encoding
/AutoEnc_aeaj7mfbmcdcxbxx4hkkdkknhe [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aiajjq.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aiajjq.enc
index 91c8e953677..216b102b83a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aiajjq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aiajjq.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_aiajjqmznordrmwu35co4nc4ng
-% Encoding created by otftotfm on Mon Sep 14 22:42:29 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:02 2021
% Command line follows encoding
/AutoEnc_aiajjqmznordrmwu35co4nc4ng [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=dlig --feature=kern --feature=liga --feature=lnum --feature=swsh
% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_alzuis.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_alzuis.enc
index 9de9a835567..fb84989f037 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_alzuis.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_alzuis.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_alzuis7iufwqpwg356rpvdaoye
-% Encoding created by otftotfm on Mon Sep 14 22:42:18 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:58 2021
% Command line follows encoding
/AutoEnc_alzuis7iufwqpwg356rpvdaoye [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=dlig --feature=kern
% --feature=liga --feature=onum --feature=swsh --feature=tnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7fuy52.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_awf6hz.enc
index c613262d45e..853674b1c96 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7fuy52.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_awf6hz.enc
@@ -1,11 +1,11 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_7fuy525xwntphkw2cwuuorlrfd
-% Encoding created by otftotfm on Mon Sep 14 22:42:16 2020
+%%AutoEnc_awf6hzreatkg6ikliyaw4oksmh
+% Encoding created by otftotfm on Sun Nov 7 16:36:47 2021
% Command line follows encoding
-/AutoEnc_7fuy525xwntphkw2cwuuorlrfd [
+/AutoEnc_awf6hzreatkg6ikliyaw4oksmh [
%00
- /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /.notdef /Euro /.notdef /.notdef /fraction.denom /dotaccent /hungarumlaut /ogonek
/uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
%10
/dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=dnom --ligkern=* {KL} * --space-factor=1.06635
% Cochineal-Italic.otf Cochineal-Italic-dnom-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_azqnwz.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_azqnwz.enc
new file mode 100644
index 00000000000..68926a0a59c
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_azqnwz.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_azqnwzd2pnuezxqa2jz4jbtlpe
+% Encoding created by otftotfm on Sun Nov 7 16:36:21 2021
+% Command line follows encoding
+/AutoEnc_azqnwzd2pnuezxqa2jz4jbtlpe [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+%10
+ /dotlessi /uni0237 /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.onum /one.onum /two.onum /three.onum /five.onum /five.onum /six.onum /seven.onum
+ /eight.onum /nine.onum /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 /.notdef /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+ /degree /plusminus /.notdef /.notdef /acute /mu /paragraph /periodcentered
+ /cedilla /.notdef /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=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=kern --feature=liga --feature=onum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --space-factor=1.06635 Cochineal-Bold.otf
+% Cochineal-Bold-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bat6hu.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bat6hu.enc
index b25eb65b9f9..ef4e3d57bd9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bat6hu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bat6hu.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_bat6huaxlarmh3dlkrp7s6cqxh
-% Encoding created by otftotfm on Mon Sep 14 22:42:21 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:55 2021
% Command line follows encoding
/AutoEnc_bat6huaxlarmh3dlkrp7s6cqxh [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=dlig --feature=kern
% --feature=liga --feature=onum --feature=pnum --feature=swsh --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bhnmej.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bhnmej.enc
index 0aa5c63d508..8ae7912c005 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bhnmej.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bhnmej.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_bhnmejtlctflnp7ouzpjtqnvnh
-% Encoding created by otftotfm on Mon Sep 14 22:42:40 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:18 2021
% Command line follows encoding
/AutoEnc_bhnmejtlctflnp7ouzpjtqnvnh [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bi2nei.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bi2nei.enc
index 4c21d2ac7a8..cba4e735d83 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bi2nei.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bi2nei.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_bi2neif4oq6qocph6zxigqycuf
-% Encoding created by otftotfm on Mon Sep 14 22:41:46 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:10 2021
% Command line follows encoding
/AutoEnc_bi2neif4oq6qocph6zxigqycuf [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=lnum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bjqtqq.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bjqtqq.enc
index 3f7defaf2a3..573c617eb67 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bjqtqq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bjqtqq.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_bjqtqqd7b67zm5lygy6kctvade
-% Encoding created by otftotfm on Mon Sep 14 22:42:30 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:03 2021
% Command line follows encoding
/AutoEnc_bjqtqqd7b67zm5lygy6kctvade [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=dnom --ligkern=*
% {KL} * --space-factor=1.06635 Cochineal-Roman.otf
% Cochineal-Roman-dnom-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bjtzvy.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bjtzvy.enc
index 85b91295173..0a1ab8fa5d9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bjtzvy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bjtzvy.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_bjtzvy7xsa26jgfqevxfmtcuje
-% Encoding created by otftotfm on Mon Sep 14 22:42:31 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:12 2021
% Command line follows encoding
/AutoEnc_bjtzvy7xsa26jgfqevxfmtcuje [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=onum --feature=tnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bnbjdf.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bnbjdf.enc
index 5d908b20335..a6d1ed36a93 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bnbjdf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bnbjdf.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_bnbjdfgg2hi7ke6bu3kxjy3h7b
-% Encoding created by otftotfm on Mon Sep 14 22:42:28 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:01 2021
% Command line follows encoding
/AutoEnc_bnbjdfgg2hi7ke6bu3kxjy3h7b [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=dlig --feature=kern --feature=liga --feature=lnum --feature=swsh
% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bp2pg7.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bp2pg7.enc
index f2b7e533107..4812498f257 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bp2pg7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bp2pg7.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_bp2pg75q5xisunxglyhb7oqeoh
-% Encoding created by otftotfm on Mon Sep 14 22:41:54 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:38 2021
% Command line follows encoding
/AutoEnc_bp2pg75q5xisunxglyhb7oqeoh [
%00
@@ -54,12 +54,13 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=onum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-osf-ot1'
+% --space-factor=1.06635 Cochineal-BoldItalic.otf
+% Cochineal-BoldItalic-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cacm2n.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cacm2n.enc
index bbdd79c0368..e5309208e83 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cacm2n.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cacm2n.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_cacm2nphkgwlbkuxmhiek5ge2e
-% Encoding created by otftotfm on Mon Sep 14 22:42:05 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:42 2021
% Command line follows encoding
/AutoEnc_cacm2nphkgwlbkuxmhiek5ge2e [
%00
@@ -54,14 +54,16 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-BoldItalic.otf
% Cochineal-BoldItalic-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cbs7ow.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cbs7ow.enc
index f6c0324cb8e..f68f5e8289e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cbs7ow.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cbs7ow.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_cbs7owb565auquingynbqxgufc
-% Encoding created by otftotfm on Mon Sep 14 22:42:22 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:05 2021
% Command line follows encoding
/AutoEnc_cbs7owb565auquingynbqxgufc [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=lnum --feature=pnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cuw7wa.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cuw7wa.enc
index 93044df018c..2acb5900beb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cuw7wa.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cuw7wa.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_cuw7wajtew6hl4napzi5enxrkf
-% Encoding created by otftotfm on Mon Sep 14 22:42:26 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:00 2021
% Command line follows encoding
/AutoEnc_cuw7wajtew6hl4napzi5enxrkf [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=lnum --feature=tnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_d2hjcw.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_d2hjcw.enc
index 8603584db9b..7c54a4b2b45 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_d2hjcw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_d2hjcw.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_d2hjcwa6t3bz6tpp5xerb57jaf
-% Encoding created by otftotfm on Mon Sep 14 22:41:45 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:19 2021
% Command line follows encoding
/AutoEnc_d2hjcwa6t3bz6tpp5xerb57jaf [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=dlig --feature=kern --feature=liga --feature=lnum --feature=pnum
% --feature=swsh --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_da7weg.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_da7weg.enc
index c6e75bd4934..931b42fd179 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_da7weg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_da7weg.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_da7wegl552xqhqoul32uypyaff
-% Encoding created by otftotfm on Mon Sep 14 22:42:05 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:42 2021
% Command line follows encoding
/AutoEnc_da7wegl552xqhqoul32uypyaff [
%00
@@ -54,13 +54,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=onum --feature=smcp --feature=tnum --ligkern=f i =: fi
% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --unicoding=germandbls =: SSsmall --space-factor=1.06635
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall --space-factor=1.06635
% Cochineal-BoldItalic.otf Cochineal-BoldItalic-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dbsvsj.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dbsvsj.enc
index 7dc81799ee8..056e19eab7e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dbsvsj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dbsvsj.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_dbsvsju7wranjs3uy6zqrnlqtd
-% Encoding created by otftotfm on Mon Sep 14 22:42:18 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:58 2021
% Command line follows encoding
/AutoEnc_dbsvsju7wranjs3uy6zqrnlqtd [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=dlig --feature=kern --feature=liga --feature=onum --feature=swsh
% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bhbiwe.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ddt3vr.enc
index 9d2ab184ec5..992bb074f9d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bhbiwe.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ddt3vr.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_bhbiwebhcs6j6jtwlcjgsp46sb
-% Encoding created by otftotfm on Mon Sep 14 22:42:26 2020
+%%AutoEnc_ddt3vrzad2yxfcqrgtek4crdvc
+% Encoding created by otftotfm on Sun Nov 7 16:37:00 2021
% Command line follows encoding
-/AutoEnc_bhbiwebhcs6j6jtwlcjgsp46sb [
+/AutoEnc_ddt3vrzad2yxfcqrgtek4crdvc [
%00
- /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /uniFB02.sc /.notdef /uni200C /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+ /f.sc /Euro /i.sc /l.sc /fraction /dotaccent /hungarumlaut /ogonek
+ /uniFB02.sc /s.sc /uni200C /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
%10
/dotlessi.sc /j.sc /grave /acute.sc /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,13 +54,15 @@
/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=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_df5kan.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_df5kan.enc
index 85ca4ffe71f..a491c5b0bb3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_df5kan.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_df5kan.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_df5kanyvyyo32t5mkev4lbikza
-% Encoding created by otftotfm on Mon Sep 14 22:42:24 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:07 2021
% Command line follows encoding
/AutoEnc_df5kanyvyyo32t5mkev4lbikza [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=dlig --feature=kern --feature=liga --feature=lnum --feature=pnum
% --feature=swsh --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_djzri5.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_djzri5.enc
index dd7de70d3e4..5afe30f41d5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_djzri5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_djzri5.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_djzri5hp5fpc7ya2dhy5ibmxpe
-% Encoding created by otftotfm on Mon Sep 14 22:42:46 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:25 2021
% Command line follows encoding
/AutoEnc_djzri5hp5fpc7ya2dhy5ibmxpe [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dwjlw5.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dwjlw5.enc
index 9aa3ce428f6..02c49a6b68f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dwjlw5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dwjlw5.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_dwjlw5zlfdnqawwsq5t2puub6f
-% Encoding created by otftotfm on Mon Sep 14 22:41:50 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:25 2021
% Command line follows encoding
/AutoEnc_dwjlw5zlfdnqawwsq5t2puub6f [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=onum --feature=tnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dx3muq.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dx3muq.enc
index 3a2bbd92ada..029e42fdfa9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dx3muq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dx3muq.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_dx3muqjgdgtsxwlxs3v3qhqvbb
-% Encoding created by otftotfm on Mon Sep 14 22:42:36 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:10 2021
% Command line follows encoding
/AutoEnc_dx3muqjgdgtsxwlxs3v3qhqvbb [
%00
@@ -54,13 +54,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=onum --feature=pnum --feature=smcp --ligkern=f i =: fi
% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --unicoding=germandbls =: SSsmall --space-factor=1.06635
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall --space-factor=1.06635
% Cochineal-Roman.otf Cochineal-Roman-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dxwjai.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dxwjai.enc
index 199bb645c92..ff39d8ee938 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dxwjai.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dxwjai.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_dxwjai2ytgxk6uqznhbwb2ywrc
-% Encoding created by otftotfm on Mon Sep 14 22:42:33 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:14 2021
% Command line follows encoding
/AutoEnc_dxwjai2ytgxk6uqznhbwb2ywrc [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=dlig --feature=kern
% --feature=liga --feature=onum --feature=swsh --feature=tnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_e745te.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_e745te.enc
index 39469d7e980..993b28b920a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_e745te.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_e745te.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_e745tedy4rvtcqmlomumhhw7wd
-% Encoding created by otftotfm on Mon Sep 14 22:41:52 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:27 2021
% Command line follows encoding
/AutoEnc_e745tedy4rvtcqmlomumhhw7wd [
%00
@@ -54,13 +54,15 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_e77avd.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_e77avd.enc
index 3a6cc05262a..73a3f40d2d4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_e77avd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_e77avd.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_e77avdwuzuoqj4gmkugo3h2jhg
-% Encoding created by otftotfm on Mon Sep 14 22:41:50 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:15 2021
% Command line follows encoding
/AutoEnc_e77avdwuzuoqj4gmkugo3h2jhg [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=dnom --ligkern=* {KL} * --space-factor=1.06635
% Cochineal-Bold.otf Cochineal-Bold-dnom-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eluj5m.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eluj5m.enc
index 2a8a4880882..ed90be9ab6b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eluj5m.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eluj5m.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_eluj5mbp3disvyld56zxnm6ava
-% Encoding created by otftotfm on Mon Sep 14 22:42:17 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:57 2021
% Command line follows encoding
/AutoEnc_eluj5mbp3disvyld56zxnm6ava [
%00
@@ -54,13 +54,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=onum --feature=smcp --feature=tnum --ligkern=f i =: fi
% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --unicoding=germandbls =: SSsmall --space-factor=1.06635
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall --space-factor=1.06635
% Cochineal-Italic.otf Cochineal-Italic-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ermyhb.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ermyhb.enc
index c84ab34a581..46dc3566e91 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ermyhb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ermyhb.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ermyhbetcp5jz6ncsy6xtshcxh
-% Encoding created by otftotfm on Mon Sep 14 22:42:29 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:02 2021
% Command line follows encoding
/AutoEnc_ermyhbetcp5jz6ncsy6xtshcxh [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=dlig --feature=kern
% --feature=liga --feature=lnum --feature=swsh --feature=tnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fcuols.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fcuols.enc
new file mode 100644
index 00000000000..c12b8a4ddcc
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fcuols.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_fcuolsuquoklnrg22ftdmakiwa
+% Encoding created by otftotfm on Sun Nov 7 16:36:22 2021
+% Command line follows encoding
+/AutoEnc_fcuolsuquoklnrg22ftdmakiwa [
+%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
+ /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+%20
+ /blank /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.onum /one.onum /two.onum /three.onum /five.onum /five.onum /six.onum /seven.onum
+ /eight.onum /nine.onum /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 /Scedilla /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 /scedilla /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=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=kern --feature=liga --feature=onum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --space-factor=1.06635 Cochineal-Bold.otf
+% Cochineal-Bold-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fdemcn.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fdemcn.enc
index 7ad96d28d86..def8c98a016 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fdemcn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fdemcn.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_fdemcn77e2ihlz6zh53267gxcf
-% Encoding created by otftotfm on Mon Sep 14 22:41:48 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:13 2021
% Command line follows encoding
/AutoEnc_fdemcn77e2ihlz6zh53267gxcf [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=dlig --feature=kern
% --feature=liga --feature=lnum --feature=swsh --feature=tnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fgurd2.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fgurd2.enc
index 050ca060b28..86df836c32e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fgurd2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fgurd2.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_fgurd2rxw7vck5wfbej272yrcf
-% Encoding created by otftotfm on Mon Sep 14 22:42:12 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:48 2021
% Command line follows encoding
/AutoEnc_fgurd2rxw7vck5wfbej272yrcf [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=sinf --ligkern=*
% {KL} * --space-factor=1.06635 Cochineal-Italic.otf
% Cochineal-Italic-inf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_g2axst.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_g2axst.enc
index ad9577384bf..0fa5cd52fcc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_g2axst.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_g2axst.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_g2axstndqcuatftmhxiiqceqyg
-% Encoding created by otftotfm on Mon Sep 14 22:42:11 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:51 2021
% Command line follows encoding
/AutoEnc_g2axstndqcuatftmhxiiqceqyg [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=dlig --feature=kern
% --feature=liga --feature=lnum --feature=pnum --feature=swsh --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gcpa6j.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gcpa6j.enc
index 9935f2f1b4f..32abb384984 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gcpa6j.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gcpa6j.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_gcpa6jbet5iv7bomecsafd5xlf
-% Encoding created by otftotfm on Mon Sep 14 22:42:26 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:59 2021
% Command line follows encoding
/AutoEnc_gcpa6jbet5iv7bomecsafd5xlf [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=lnum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gkpez6.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gkpez6.enc
index ad0d0d3749f..07b7b011869 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gkpez6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gkpez6.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_gkpez64rkll3wg6ykk23fjwlif
-% Encoding created by otftotfm on Mon Sep 14 22:42:12 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:44 2021
% Command line follows encoding
/AutoEnc_gkpez64rkll3wg6ykk23fjwlif [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=lnum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_grutwx.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_grutwx.enc
index 02df8362e37..12d0c5494a7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_grutwx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_grutwx.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_grutwx5bog4ctqrndwcw6y5sma
-% Encoding created by otftotfm on Mon Sep 14 22:42:11 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:51 2021
% Command line follows encoding
/AutoEnc_grutwx5bog4ctqrndwcw6y5sma [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=dlig --feature=kern --feature=liga --feature=lnum --feature=pnum
% --feature=swsh --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_h2t4ei.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_h2t4ei.enc
index 2af9a04965f..0ce6d75c5a2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_h2t4ei.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_h2t4ei.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_h2t4ei6ygg2xvtps2qc6oy5s2b
-% Encoding created by otftotfm on Mon Sep 14 22:41:45 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:15 2021
% Command line follows encoding
/AutoEnc_h2t4ei6ygg2xvtps2qc6oy5s2b [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=sinf --ligkern=* {KL} * --space-factor=1.06635
% Cochineal-Bold.otf Cochineal-Bold-inf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hqneph.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hqneph.enc
index 7fac3fa6225..9f3d76f007c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hqneph.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hqneph.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_hqnephxb2qnshowcomnuu54lpf
-% Encoding created by otftotfm on Mon Sep 14 22:42:30 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:07 2021
% Command line follows encoding
/AutoEnc_hqnephxb2qnshowcomnuu54lpf [
%00
@@ -54,10 +54,10 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=sups --ligkern=*
% {KL} * --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ibp3xz.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ibp3xz.enc
index f821c8be2ea..9db0c2832c0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ibp3xz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ibp3xz.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ibp3xzf3374zpre2xenoktotig
-% Encoding created by otftotfm on Mon Sep 14 22:41:54 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:38 2021
% Command line follows encoding
/AutoEnc_ibp3xzf3374zpre2xenoktotig [
%00
@@ -54,13 +54,13 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=onum --feature=pnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --space-factor=1.06635 Cochineal-Bold.otf
-% Cochineal-Bold-osf-t1'
+% --ligkern=ff l =: ffl --space-factor=1.06635 Cochineal-BoldItalic.otf
+% Cochineal-BoldItalic-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_izjs6r.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ikkvry.enc
index eb4ebe4a41a..1e2d77f6c17 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_izjs6r.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ikkvry.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_izjs6ruqi6zmxqz45ki5zzdwma
-% Encoding created by otftotfm on Mon Sep 14 22:42:01 2020
+%%AutoEnc_ikkvryexk6xu7oj4arafeiusqa
+% Encoding created by otftotfm on Sun Nov 7 16:36:30 2021
% Command line follows encoding
-/AutoEnc_izjs6ruqi6zmxqz45ki5zzdwma [
+/AutoEnc_ikkvryexk6xu7oj4arafeiusqa [
%00
- /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+ /f.sc /Euro /i.sc /l.sc /fraction /dotaccent /hungarumlaut /ogonek
+ /uniFB02.sc /s.sc /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
%10
/i.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,14 +54,16 @@
/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=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-BoldItalic.otf
% Cochineal-BoldItalic-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_j7mi7a.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_j7mi7a.enc
index 33790edf6e3..c77c7ab0b76 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_j7mi7a.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_j7mi7a.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_j7mi7a77kptz6h3g6c6dc5b6ug
-% Encoding created by otftotfm on Mon Sep 14 22:42:24 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:06 2021
% Command line follows encoding
/AutoEnc_j7mi7a77kptz6h3g6c6dc5b6ug [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=dlig --feature=kern
% --feature=liga --feature=lnum --feature=pnum --feature=swsh --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jgxutr.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jgxutr.enc
index 8142dde061a..eaf0f2116ae 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jgxutr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jgxutr.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_jgxutrgxm2ckmm7uie77js763b
-% Encoding created by otftotfm on Mon Sep 14 22:42:37 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:11 2021
% Command line follows encoding
/AutoEnc_jgxutrgxm2ckmm7uie77js763b [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=dlig --feature=kern
% --feature=liga --feature=onum --feature=pnum --feature=swsh --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jhwmea.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jhwmea.enc
index 00bf4e3eccd..3aed87c3984 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jhwmea.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jhwmea.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_jhwmeafgxlianngtvv52ct4j3h
-% Encoding created by otftotfm on Mon Sep 14 22:42:39 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:17 2021
% Command line follows encoding
/AutoEnc_jhwmeafgxlianngtvv52ct4j3h [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jhwq7e.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jhwq7e.enc
index 761389337cb..77e083fbd22 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jhwq7e.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jhwq7e.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_jhwq7e5kty5yjkwv3jskljxmzh
-% Encoding created by otftotfm on Mon Sep 14 22:41:44 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:18 2021
% Command line follows encoding
/AutoEnc_jhwq7e5kty5yjkwv3jskljxmzh [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=dlig --feature=kern --feature=liga --feature=lnum --feature=pnum
% --feature=swsh --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ns6y37.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jmow3t.enc
index 25c991c2246..9eb1d1ab247 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ns6y37.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jmow3t.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_ns6y37d4ibmi3dtxu7z4phrc4f
-% Encoding created by otftotfm on Mon Sep 14 22:41:55 2020
+%%AutoEnc_jmow3tno43n2vygsvhpft5ndsb
+% Encoding created by otftotfm on Sun Nov 7 16:36:22 2021
% Command line follows encoding
-/AutoEnc_ns6y37d4ibmi3dtxu7z4phrc4f [
+/AutoEnc_jmow3tno43n2vygsvhpft5ndsb [
%00
- /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+ /f.sc /Euro /i.sc /l.sc /fraction /dotaccent /hungarumlaut /ogonek
+ /uniFB02.sc /s.sc /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
%10
/dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -14,7 +14,7 @@
/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
- /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
+ /zero.onum /one.onum /two.onum /three.onum /five.onum /five.onum /six.onum /seven.onum
/eight.onum /nine.onum /colon /semicolon /less /equal /greater /question
%40
/at /A /B /C /D /E /F /G
@@ -54,13 +54,15 @@
/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=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kbpxlj.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kbpxlj.enc
index 20ec4b936f5..e97a867a9cf 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kbpxlj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kbpxlj.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_kbpxlj4p55qzsuqu2a3jq4qjng
-% Encoding created by otftotfm on Mon Sep 14 22:42:37 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:11 2021
% Command line follows encoding
/AutoEnc_kbpxlj4p55qzsuqu2a3jq4qjng [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=dlig --feature=kern --feature=liga --feature=onum --feature=pnum
% --feature=swsh --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kbxkrg.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kbxkrg.enc
index 5b7f0ab1f7b..df75c953a37 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kbxkrg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kbxkrg.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_kbxkrgydh7la3uztlzivll73th
-% Encoding created by otftotfm on Mon Sep 14 22:41:56 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:39 2021
% Command line follows encoding
/AutoEnc_kbxkrgydh7la3uztlzivll73th [
%00
@@ -54,13 +54,14 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=dlig --feature=kern --feature=liga --feature=onum --feature=pnum
% --feature=swsh --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --include-alternates=*.swash
-% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-osf-swash-ly1'
+% --space-factor=1.06635 Cochineal-BoldItalic.otf
+% Cochineal-BoldItalic-osf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kfj2qw.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kfj2qw.enc
index 5d6d760b066..51ce66973fe 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kfj2qw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kfj2qw.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_kfj2qwi5n3nkkjs3gabmuoh5pd
-% Encoding created by otftotfm on Mon Sep 14 22:42:48 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:26 2021
% Command line follows encoding
/AutoEnc_kfj2qwi5n3nkkjs3gabmuoh5pd [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kfnsdu.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kfnsdu.enc
index 7e5d89e97db..7e337f8a7d0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kfnsdu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kfnsdu.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_kfnsduygzq46nlvsputaedpava
-% Encoding created by otftotfm on Mon Sep 14 22:42:39 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:17 2021
% Command line follows encoding
/AutoEnc_kfnsduygzq46nlvsputaedpava [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_klonus.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_klonus.enc
index 29c7d859db5..08823e4eaff 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_klonus.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_klonus.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_klonusw6nbezxddru7kumoerdc
-% Encoding created by otftotfm on Mon Sep 14 22:42:16 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:56 2021
% Command line follows encoding
/AutoEnc_klonusw6nbezxddru7kumoerdc [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=onum --feature=tnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ktoy4w.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ktoy4w.enc
index d894637641e..61711485795 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ktoy4w.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ktoy4w.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ktoy4wqx55iuopz72o4kxu4ema
-% Encoding created by otftotfm on Mon Sep 14 22:42:19 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:53 2021
% Command line follows encoding
/AutoEnc_ktoy4wqx55iuopz72o4kxu4ema [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=onum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kuld3f.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kuld3f.enc
index 6f1efcc52c0..517a2ac6f77 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kuld3f.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kuld3f.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_kuld3frxweybc4kqtus5gxvmmc
-% Encoding created by otftotfm on Mon Sep 14 22:41:58 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:35 2021
% Command line follows encoding
/AutoEnc_kuld3frxweybc4kqtus5gxvmmc [
%00
@@ -54,13 +54,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=lnum --feature=pnum --feature=smcp --ligkern=f i =: fi
% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --unicoding=germandbls =: SSsmall --space-factor=1.06635
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall --space-factor=1.06635
% Cochineal-BoldItalic.otf Cochineal-BoldItalic-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kxx5cy.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kxx5cy.enc
index 647eebf3d8c..a47d543b1c3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kxx5cy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kxx5cy.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_kxx5cyhhuehgmzfjkl2dswix6a
-% Encoding created by otftotfm on Mon Sep 14 22:42:01 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:30 2021
% Command line follows encoding
/AutoEnc_kxx5cyhhuehgmzfjkl2dswix6a [
%00
@@ -54,13 +54,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=lnum --feature=smcp --feature=tnum --ligkern=f i =: fi
% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --unicoding=germandbls =: SSsmall --space-factor=1.06635
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall --space-factor=1.06635
% Cochineal-BoldItalic.otf Cochineal-BoldItalic-tlf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kzot5v.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kzot5v.enc
index 9377994eb24..bcbe401503f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kzot5v.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kzot5v.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_kzot5vsk32d7wpjxdq5eoc35ye
-% Encoding created by otftotfm on Mon Sep 14 22:41:45 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:19 2021
% Command line follows encoding
/AutoEnc_kzot5vsk32d7wpjxdq5eoc35ye [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=dlig --feature=kern
% --feature=liga --feature=lnum --feature=pnum --feature=swsh --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l47tcy.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l47tcy.enc
index 33eaa10ebdc..fb048454412 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l47tcy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l47tcy.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_l47tcyn7v3pldrdby5hlx32l4g
-% Encoding created by otftotfm on Mon Sep 14 22:42:14 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:45 2021
% Command line follows encoding
/AutoEnc_l47tcyn7v3pldrdby5hlx32l4g [
%00
@@ -54,13 +54,15 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Italic.otf Cochineal-Italic-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l64ji6.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l64ji6.enc
index 7eacee96de2..2889a0a6df4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l64ji6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l64ji6.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_l64ji6aomvrfcpoxvz4yo2eycb
-% Encoding created by otftotfm on Mon Sep 14 22:42:49 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:29 2021
% Command line follows encoding
/AutoEnc_l64ji6aomvrfcpoxvz4yo2eycb [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lchlkf.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lchlkf.enc
index b2e2de5ca80..ad65179b0ca 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lchlkf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lchlkf.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_lchlkfg4toijubrimt2gqiaorg
-% Encoding created by otftotfm on Mon Sep 14 22:41:54 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:37 2021
% Command line follows encoding
/AutoEnc_lchlkfg4toijubrimt2gqiaorg [
%00
@@ -54,13 +54,13 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=onum --feature=pnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl --space-factor=1.06635 Cochineal-Bold.otf
-% Cochineal-Bold-osf-ly1'
+% --ligkern=ff l =: ffl --space-factor=1.06635 Cochineal-BoldItalic.otf
+% Cochineal-BoldItalic-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_f6cstm.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ldgozj.enc
index 6967562afd2..18cc679f6e0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_f6cstm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ldgozj.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_f6cstmpez52rgs4utdrrhgp2zf
-% Encoding created by otftotfm on Mon Sep 14 22:41:47 2020
+%%AutoEnc_ldgozjten7brbr2olsydfmvjwd
+% Encoding created by otftotfm on Sun Nov 7 16:36:11 2021
% Command line follows encoding
-/AutoEnc_f6cstmpez52rgs4utdrrhgp2zf [
+/AutoEnc_ldgozjten7brbr2olsydfmvjwd [
%00
- /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+ /f.sc /Euro /i.sc /l.sc /fraction /dotaccent /hungarumlaut /ogonek
+ /uniFB02.sc /s.sc /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
%10
/dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,13 +54,15 @@
/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=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_liz2hd.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_liz2hd.enc
index 366804a9ed8..ceeec8b66c1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_liz2hd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_liz2hd.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_liz2hdhnqe6tu65ttnpf2lr2uf
-% Encoding created by otftotfm on Mon Sep 14 22:42:33 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:15 2021
% Command line follows encoding
/AutoEnc_liz2hdhnqe6tu65ttnpf2lr2uf [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=dlig --feature=kern --feature=liga --feature=onum --feature=swsh
% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lqmdx6.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lqmdx6.enc
index 4133499f66f..176e26137b7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lqmdx6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lqmdx6.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_lqmdx65qbs53pvllukfbxm4k4b
-% Encoding created by otftotfm on Mon Sep 14 22:42:31 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:12 2021
% Command line follows encoding
/AutoEnc_lqmdx65qbs53pvllukfbxm4k4b [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=onum --feature=tnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lropbz.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lropbz.enc
index 7e5a054340b..5f6a0fca880 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lropbz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lropbz.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_lropbztnwnqtacoy5aqentv3xf
-% Encoding created by otftotfm on Mon Sep 14 22:41:58 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:35 2021
% Command line follows encoding
/AutoEnc_lropbztnwnqtacoy5aqentv3xf [
%00
@@ -54,14 +54,16 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-BoldItalic.otf
% Cochineal-BoldItalic-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7cy5le.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lzqtrs.enc
index 8d690e73192..3d366b3921b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7cy5le.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lzqtrs.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_7cy5lez7nzzb6zdiqr7flixhac
-% Encoding created by otftotfm on Mon Sep 14 22:42:35 2020
+%%AutoEnc_lzqtrspb36hpyrr5xzmtcroqld
+% Encoding created by otftotfm on Sun Nov 7 16:37:09 2021
% Command line follows encoding
-/AutoEnc_7cy5lez7nzzb6zdiqr7flixhac [
+/AutoEnc_lzqtrspb36hpyrr5xzmtcroqld [
%00
- /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /uniFB02.sc /.notdef /uni200C /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+ /f.sc /Euro /i.sc /l.sc /fraction /dotaccent /hungarumlaut /ogonek
+ /uniFB02.sc /s.sc /uni200C /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
%10
/dotlessi.sc /j.sc /grave /acute.sc /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,13 +54,15 @@
/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=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_m4bmrm.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_m4bmrm.enc
new file mode 100644
index 00000000000..693a5ca3da4
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_m4bmrm.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_m4bmrmpac33v4rk74ebwxwl4ee
+% Encoding created by otftotfm on Sun Nov 7 16:36:14 2021
+% Command line follows encoding
+/AutoEnc_m4bmrmpac33v4rk74ebwxwl4ee [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction.denom /dotaccent /hungarumlaut /ogonek
+ /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+%10
+ /dotlessi /uni0237 /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 /fraction
+%30
+ /zero.denom /one.denom /two.denom /three.denom /four.denom /five.denom /six.denom /seven.denom
+ /eight.denom /nine.denom /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 /.notdef /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+ /degree /plusminus /.notdef /.notdef /acute /mu /paragraph /periodcentered
+ /cedilla /.notdef /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=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=dnom --ligkern=* {KL} * --space-factor=1.06635
+% Cochineal-Bold.otf Cochineal-Bold-dnom-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uk6vx5.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_max2ec.enc
index 90f949762c5..563d71b22ab 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uk6vx5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_max2ec.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_uk6vx5yhbzww45kuyzhpfnhpvd
-% Encoding created by otftotfm on Mon Sep 14 22:42:17 2020
+%%AutoEnc_max2ecvco25u2grqxyjpjmiuaa
+% Encoding created by otftotfm on Sun Nov 7 16:36:57 2021
% Command line follows encoding
-/AutoEnc_uk6vx5yhbzww45kuyzhpfnhpvd [
+/AutoEnc_max2ecvco25u2grqxyjpjmiuaa [
%00
- /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+ /f.sc /Euro /i.sc /l.sc /fraction /dotaccent /hungarumlaut /ogonek
+ /uniFB02.sc /s.sc /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
%10
/dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,13 +54,15 @@
/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=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Italic.otf Cochineal-Italic-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mo2enl.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mo2enl.enc
index 657623dad4d..931742dd843 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mo2enl.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mo2enl.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_mo2enllui5somazbketwl7ctag
-% Encoding created by otftotfm on Mon Sep 14 22:42:01 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:31 2021
% Command line follows encoding
/AutoEnc_mo2enllui5somazbketwl7ctag [
%00
@@ -54,14 +54,16 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-BoldItalic.otf
% Cochineal-BoldItalic-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ekjpcs.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mu7xli.enc
index c12a0d2eed0..5af2a32c9c1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ekjpcs.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mu7xli.enc
@@ -1,9 +1,9 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_ekjpcs3naq6ghi6qtuarqomzff
-% Encoding created by otftotfm on Mon Sep 14 22:41:55 2020
+%%AutoEnc_mu7xliximjcmd5tduwbz4v7wdf
+% Encoding created by otftotfm on Sun Nov 7 16:36:23 2021
% Command line follows encoding
-/AutoEnc_ekjpcs3naq6ghi6qtuarqomzff [
+/AutoEnc_mu7xliximjcmd5tduwbz4v7wdf [
%00
/grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
/breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
@@ -14,7 +14,7 @@
/blank /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
%30
- /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
+ /zero.onum /one.onum /two.onum /three.onum /five.onum /five.onum /six.onum /seven.onum
/eight.onum /nine.onum /colon /semicolon /less /equal /greater /question
%40
/at /A /B /C /D /E /F /G
@@ -54,13 +54,15 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wdpw3f.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nj5yu3.enc
index e5415761d46..ba049d80cb6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wdpw3f.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nj5yu3.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_wdpw3fnsnqo676aeanifbjgohc
-% Encoding created by otftotfm on Mon Sep 14 22:42:23 2020
+%%AutoEnc_nj5yu3pjtk5vxd4ouzyx5vlpkf
+% Encoding created by otftotfm on Sun Nov 7 16:37:05 2021
% Command line follows encoding
-/AutoEnc_wdpw3fnsnqo676aeanifbjgohc [
+/AutoEnc_nj5yu3pjtk5vxd4ouzyx5vlpkf [
%00
- /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /uniFB02.sc /.notdef /uni200C /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+ /f.sc /Euro /i.sc /l.sc /fraction /dotaccent /hungarumlaut /ogonek
+ /uniFB02.sc /s.sc /uni200C /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
%10
/dotlessi.sc /j.sc /grave /acute.sc /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,13 +54,15 @@
/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=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nlwa7l.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nlwa7l.enc
index e1d246bcbc2..4678a21b3f3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nlwa7l.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nlwa7l.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_nlwa7lmo5sm5wheszba5vawnzg
-% Encoding created by otftotfm on Mon Sep 14 22:42:20 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:54 2021
% Command line follows encoding
/AutoEnc_nlwa7lmo5sm5wheszba5vawnzg [
%00
@@ -54,13 +54,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=onum --feature=pnum --feature=smcp --ligkern=f i =: fi
% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --unicoding=germandbls =: SSsmall --space-factor=1.06635
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall --space-factor=1.06635
% Cochineal-Italic.otf Cochineal-Italic-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nraham.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nraham.enc
new file mode 100644
index 00000000000..c2afc9309c3
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nraham.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_nraham3r6spfytmghqcifk4swh
+% Encoding created by otftotfm on Sun Nov 7 16:36:24 2021
+% Command line follows encoding
+/AutoEnc_nraham3r6spfytmghqcifk4swh [
+%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
+ /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+%20
+ /blank /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.onum /one.onum /two.onum /three.onum /five.onum /five.onum /six.onum /seven.onum
+ /eight.onum /nine.onum /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.alt01 /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 /Scedilla /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 /scedilla /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=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
+% --feature=dlig --feature=kern --feature=liga --feature=onum --feature=pnum
+% --feature=swsh --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --include-alternates=*.swash
+% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-osf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_o4vutb.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_o4vutb.enc
index 5c81c787bbc..c83f6367055 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_o4vutb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_o4vutb.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_o4vutbcoh6bpn756xdfz7jo6ye
-% Encoding created by otftotfm on Mon Sep 14 22:42:14 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:45 2021
% Command line follows encoding
/AutoEnc_o4vutbcoh6bpn756xdfz7jo6ye [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=dlig --feature=kern --feature=liga --feature=lnum --feature=swsh
% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_o5mx43.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_o5mx43.enc
index a3e9db2b60c..99f33ff4cb6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_o5mx43.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_o5mx43.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_o5mx43eztao2flwui42cf62y7c
-% Encoding created by otftotfm on Mon Sep 14 22:41:50 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:14 2021
% Command line follows encoding
/AutoEnc_o5mx43eztao2flwui42cf62y7c [
%00
@@ -54,10 +54,10 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=dnom --ligkern=*
% {KL} * --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-dnom-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_odnecf.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_odnecf.enc
index c33bc497b6f..d9c7c33108f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_odnecf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_odnecf.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_odnecf56uaegkv3szk56ibz3nh
-% Encoding created by otftotfm on Mon Sep 14 22:42:48 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:27 2021
% Command line follows encoding
/AutoEnc_odnecf56uaegkv3szk56ibz3nh [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_okzdl2.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_okzdl2.enc
index e0e1c33daad..ba4e5ea6e3f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_okzdl2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_okzdl2.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_okzdl25xdng2gzeqkcqqro7vwg
-% Encoding created by otftotfm on Mon Sep 14 22:41:48 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:12 2021
% Command line follows encoding
/AutoEnc_okzdl25xdng2gzeqkcqqro7vwg [
%00
@@ -54,13 +54,15 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ol4knl.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ol4knl.enc
index d9a86b45d83..8c33e121960 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ol4knl.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ol4knl.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ol4knl3nho3pty54qpfksxqh5e
-% Encoding created by otftotfm on Mon Sep 14 22:41:44 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:18 2021
% Command line follows encoding
/AutoEnc_ol4knl3nho3pty54qpfksxqh5e [
%00
@@ -54,13 +54,15 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_opxmsy.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_opxmsy.enc
index 4d74b6ed364..0b4fc2a265a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_opxmsy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_opxmsy.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_opxmsyw6zjshlwr3eqjuujlqje
-% Encoding created by otftotfm on Mon Sep 14 22:41:42 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:16 2021
% Command line follows encoding
/AutoEnc_opxmsyw6zjshlwr3eqjuujlqje [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=lnum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_oqmhja.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_oqmhja.enc
index 8d3e32ef0bd..3a17755db53 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_oqmhja.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_oqmhja.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_oqmhjaxu2dyfmkoxtpa3cajtbh
-% Encoding created by otftotfm on Mon Sep 14 22:41:56 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:40 2021
% Command line follows encoding
/AutoEnc_oqmhjaxu2dyfmkoxtpa3cajtbh [
%00
@@ -54,13 +54,13 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=dlig --feature=kern
% --feature=liga --feature=onum --feature=pnum --feature=swsh --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
% --ligkern=ff l =: ffl --include-alternates=*.swash --space-factor=1.06635
-% Cochineal-Bold.otf Cochineal-Bold-osf-swash-ot1'
+% Cochineal-BoldItalic.otf Cochineal-BoldItalic-osf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_otkq6i.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_otkq6i.enc
index a8ccb84e1ce..8190d0a8565 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_otkq6i.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_otkq6i.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_otkq6ixcgcqmbm3iihglaroo4c
-% Encoding created by otftotfm on Mon Sep 14 22:41:47 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:11 2021
% Command line follows encoding
/AutoEnc_otkq6ixcgcqmbm3iihglaroo4c [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=lnum --feature=tnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_p7j4gw.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_p7j4gw.enc
index b4a46030dc3..54b716957e6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_p7j4gw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_p7j4gw.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_p7j4gwq534taxestytn2kgcoch
-% Encoding created by otftotfm on Mon Sep 14 22:42:49 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:29 2021
% Command line follows encoding
/AutoEnc_p7j4gwq534taxestytn2kgcoch [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pf3hrr.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pf3hrr.enc
index 3e151d1a6e6..4d5487baba6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pf3hrr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pf3hrr.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_pf3hrr3rskvv4t72apy5ekuhgg
-% Encoding created by otftotfm on Mon Sep 14 22:42:25 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:03 2021
% Command line follows encoding
/AutoEnc_pf3hrr3rskvv4t72apy5ekuhgg [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=sinf --ligkern=* {KL} * --space-factor=1.06635
% Cochineal-Roman.otf Cochineal-Roman-inf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2cqomt.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pfcyih.enc
index 785dfadffb7..2a2f68fe184 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2cqomt.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pfcyih.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_2cqomtcxhhouctp5anbnq7jawh
-% Encoding created by otftotfm on Mon Sep 14 22:42:07 2020
+%%AutoEnc_pfcyihraq2up6ktaxziuwzrd7d
+% Encoding created by otftotfm on Sun Nov 7 16:36:38 2021
% Command line follows encoding
-/AutoEnc_2cqomtcxhhouctp5anbnq7jawh [
+/AutoEnc_pfcyihraq2up6ktaxziuwzrd7d [
%00
- /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+ /f.sc /Euro /i.sc /l.sc /fraction /dotaccent /hungarumlaut /ogonek
+ /uniFB02.sc /s.sc /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
%10
/i.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,14 +54,16 @@
/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=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-BoldItalic.otf
% Cochineal-BoldItalic-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_d2sl3v.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pilffg.enc
index 0a5a6cbfdb1..6b998c1e482 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_d2sl3v.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pilffg.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_d2sl3vwplck6gkl5b64gu7v2uh
-% Encoding created by otftotfm on Mon Sep 14 22:41:51 2020
+%%AutoEnc_pilffgcv4xd62dkr5vy7k2z5he
+% Encoding created by otftotfm on Sun Nov 7 16:36:26 2021
% Command line follows encoding
-/AutoEnc_d2sl3vwplck6gkl5b64gu7v2uh [
+/AutoEnc_pilffgcv4xd62dkr5vy7k2z5he [
%00
- /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+ /f.sc /Euro /i.sc /l.sc /fraction /dotaccent /hungarumlaut /ogonek
+ /uniFB02.sc /s.sc /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
%10
/dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,13 +54,15 @@
/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=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pqzq4p.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pqzq4p.enc
index bcf49fed5fb..3b666368c47 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pqzq4p.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pqzq4p.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_pqzq4pps5ekq6gvm6zkavxtlfd
-% Encoding created by otftotfm on Mon Sep 14 22:42:22 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:04 2021
% Command line follows encoding
/AutoEnc_pqzq4pps5ekq6gvm6zkavxtlfd [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=lnum --feature=pnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_q35ey5.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_q35ey5.enc
index a729fe958dd..14060991363 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_q35ey5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_q35ey5.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_q35ey5ysflpeyi5npf72j2oqpd
-% Encoding created by otftotfm on Mon Sep 14 22:42:08 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:39 2021
% Command line follows encoding
/AutoEnc_q35ey5ysflpeyi5npf72j2oqpd [
%00
@@ -54,14 +54,16 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-BoldItalic.otf
% Cochineal-BoldItalic-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_q4ulxa.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_q4ulxa.enc
index 38d08550028..d2dc841a14f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_q4ulxa.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_q4ulxa.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_q4ulxagmzpsazliec7ky4yuuzg
-% Encoding created by otftotfm on Mon Sep 14 22:42:15 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:52 2021
% Command line follows encoding
/AutoEnc_q4ulxagmzpsazliec7ky4yuuzg [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=sups --ligkern=* {KL} * --space-factor=1.06635
% Cochineal-Italic.otf Cochineal-Italic-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qkxc47.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qkxc47.enc
index 29a7a3f3ead..1965f58ddf0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qkxc47.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qkxc47.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_qkxc47oumttoiemq4frcbg3isg
-% Encoding created by otftotfm on Mon Sep 14 22:42:31 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:12 2021
% Command line follows encoding
/AutoEnc_qkxc47oumttoiemq4frcbg3isg [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qqsbmj.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qqsbmj.enc
index 7db41e763b0..f87f28edfe4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qqsbmj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qqsbmj.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_qqsbmjapirqcrlkpass5d3u2dd
-% Encoding created by otftotfm on Mon Sep 14 22:42:49 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:28 2021
% Command line follows encoding
/AutoEnc_qqsbmjapirqcrlkpass5d3u2dd [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qy633g.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qy633g.enc
index 4e474ab9e5b..85e1538028f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qy633g.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qy633g.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_qy633g7pi7zr2az4fkhqmngxpa
-% Encoding created by otftotfm on Mon Sep 14 22:42:30 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:03 2021
% Command line follows encoding
/AutoEnc_qy633g7pi7zr2az4fkhqmngxpa [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=dnom --ligkern=* {KL} * --space-factor=1.06635
% Cochineal-Roman.otf Cochineal-Roman-dnom-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qyvxxn.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qyvxxn.enc
index fb5bb178498..aec691bcd49 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qyvxxn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qyvxxn.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_qyvxxnril4wsr5ozy2pv44yhjg
-% Encoding created by otftotfm on Mon Sep 14 22:41:57 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:40 2021
% Command line follows encoding
/AutoEnc_qyvxxnril4wsr5ozy2pv44yhjg [
%00
@@ -54,13 +54,14 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=dlig --feature=kern --feature=liga --feature=onum --feature=pnum
% --feature=swsh --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --include-alternates=*.swash
-% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-osf-swash-t1'
+% --space-factor=1.06635 Cochineal-BoldItalic.otf
+% Cochineal-BoldItalic-osf-swash-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qzhi24.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qzhi24.enc
index c24d9b1723a..5ae7346f16a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qzhi24.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qzhi24.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_qzhi24oahixfcuer3z4caw2zwf
-% Encoding created by otftotfm on Mon Sep 14 22:42:47 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:26 2021
% Command line follows encoding
/AutoEnc_qzhi24oahixfcuer3z4caw2zwf [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r2kqsv.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r2kqsv.enc
index 4b80d5efd32..f78af168f0a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r2kqsv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r2kqsv.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_r2kqsvbtgnxameqsidhctp2nsa
-% Encoding created by otftotfm on Mon Sep 14 22:41:46 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:15 2021
% Command line follows encoding
/AutoEnc_r2kqsvbtgnxameqsidhctp2nsa [
%00
@@ -54,10 +54,10 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=sinf --ligkern=*
% {KL} * --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-inf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rix5n3.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rix5n3.enc
index 18fc795e020..220cc8a5fdc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rix5n3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rix5n3.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_rix5n3jgmg3i7qh2hsgbnykcgc
-% Encoding created by otftotfm on Mon Sep 14 22:42:22 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:04 2021
% Command line follows encoding
/AutoEnc_rix5n3jgmg3i7qh2hsgbnykcgc [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=lnum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3m7z6q.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rv5tmq.enc
index be35343baca..2b7ab9c99ea 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3m7z6q.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rv5tmq.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_3m7z6qmhkby6vsp4sl76m7odwe
-% Encoding created by otftotfm on Mon Sep 14 22:42:05 2020
+%%AutoEnc_rv5tmqogswaj72dn7kxhv4pmog
+% Encoding created by otftotfm on Sun Nov 7 16:36:41 2021
% Command line follows encoding
-/AutoEnc_3m7z6qmhkby6vsp4sl76m7odwe [
+/AutoEnc_rv5tmqogswaj72dn7kxhv4pmog [
%00
- /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+ /f.sc /Euro /i.sc /l.sc /fraction /dotaccent /hungarumlaut /ogonek
+ /uniFB02.sc /s.sc /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
%10
/i.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,14 +54,16 @@
/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=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-BoldItalic.otf
% Cochineal-BoldItalic-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5dzpv7.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_s4niqi.enc
index 7506b81845c..d7b4ba3ad35 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5dzpv7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_s4niqi.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_5dzpv7z4wa37w6ligtogc2qznf
-% Encoding created by otftotfm on Mon Sep 14 22:41:58 2020
+%%AutoEnc_s4niqieppxfdjhoanzavbs3tsf
+% Encoding created by otftotfm on Sun Nov 7 16:36:34 2021
% Command line follows encoding
-/AutoEnc_5dzpv7z4wa37w6ligtogc2qznf [
+/AutoEnc_s4niqieppxfdjhoanzavbs3tsf [
%00
- /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+ /f.sc /Euro /i.sc /l.sc /fraction /dotaccent /hungarumlaut /ogonek
+ /uniFB02.sc /s.sc /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
%10
/i.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,14 +54,16 @@
/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=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-BoldItalic.otf
% Cochineal-BoldItalic-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_saoql6.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_saoql6.enc
index 3b205ac5ccc..cdd86652de2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_saoql6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_saoql6.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_saoql6lkqdudibpnm3bzjamugf
-% Encoding created by otftotfm on Mon Sep 14 22:42:49 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:28 2021
% Command line follows encoding
/AutoEnc_saoql6lkqdudibpnm3bzjamugf [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sc4bro.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sc4bro.enc
index d0a42136476..324f0bb5933 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sc4bro.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sc4bro.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_sc4brovlhfhu6thqs72ddt6rtb
-% Encoding created by otftotfm on Mon Sep 14 22:42:34 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:08 2021
% Command line follows encoding
/AutoEnc_sc4brovlhfhu6thqs72ddt6rtb [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=onum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sq6y2y.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sq6y2y.enc
index 9e0fef7d397..9735cd0bc2a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sq6y2y.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sq6y2y.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_sq6y2yhnx5oq4rrswmmep6awwd
-% Encoding created by otftotfm on Mon Sep 14 22:42:09 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:48 2021
% Command line follows encoding
/AutoEnc_sq6y2yhnx5oq4rrswmmep6awwd [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=lnum --feature=pnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sygphi.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sygphi.enc
index 17644f0b7de..ce9a4d40ea5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sygphi.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sygphi.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_sygphiuntk27djb3jaxbuajzzc
-% Encoding created by otftotfm on Mon Sep 14 22:42:28 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:01 2021
% Command line follows encoding
/AutoEnc_sygphiuntk27djb3jaxbuajzzc [
%00
@@ -54,13 +54,15 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_syo7sr.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_syo7sr.enc
index 301fbb4b41d..91494349138 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_syo7sr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_syo7sr.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_syo7srsdmimiap2mupa7ninj6c
-% Encoding created by otftotfm on Mon Sep 14 22:41:52 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:26 2021
% Command line follows encoding
/AutoEnc_syo7srsdmimiap2mupa7ninj6c [
%00
@@ -54,13 +54,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=onum --feature=smcp --feature=tnum --ligkern=f i =: fi
% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --unicoding=germandbls =: SSsmall --space-factor=1.06635
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall --space-factor=1.06635
% Cochineal-Bold.otf Cochineal-Bold-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t556x2.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t556x2.enc
index a2cae8b649b..59599fe9f2a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t556x2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t556x2.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_t556x2zgbsfsvvrjinbokllaib
-% Encoding created by otftotfm on Mon Sep 14 22:41:47 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:12 2021
% Command line follows encoding
/AutoEnc_t556x2zgbsfsvvrjinbokllaib [
%00
@@ -54,13 +54,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=lnum --feature=smcp --feature=tnum --ligkern=f i =: fi
% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --unicoding=germandbls =: SSsmall --space-factor=1.06635
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall --space-factor=1.06635
% Cochineal-Bold.otf Cochineal-Bold-tlf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t7e5d4.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t7e5d4.enc
index d59867aae24..326f011dd7d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t7e5d4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t7e5d4.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_t7e5d4famh3ebc2alyd3odxpse
-% Encoding created by otftotfm on Mon Sep 14 22:42:25 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:59 2021
% Command line follows encoding
/AutoEnc_t7e5d4famh3ebc2alyd3odxpse [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=lnum --feature=tnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tfefcu.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tfefcu.enc
index d210d863c86..76b4c7fd154 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tfefcu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tfefcu.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_tfefcuijuytjhtdfvbs7ctbamb
-% Encoding created by otftotfm on Mon Sep 14 22:41:46 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:10 2021
% Command line follows encoding
/AutoEnc_tfefcuijuytjhtdfvbs7ctbamb [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=lnum --feature=tnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fn4k7j.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_th736v.enc
index 8c327c8109d..93883de5f7a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fn4k7j.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_th736v.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_fn4k7jm5252woin3hqcxwbwmyd
-% Encoding created by otftotfm on Mon Sep 14 22:42:13 2020
+%%AutoEnc_th736vajgltt65gfrm6svtukqh
+% Encoding created by otftotfm on Sun Nov 7 16:36:44 2021
% Command line follows encoding
-/AutoEnc_fn4k7jm5252woin3hqcxwbwmyd [
+/AutoEnc_th736vajgltt65gfrm6svtukqh [
%00
- /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+ /f.sc /Euro /i.sc /l.sc /fraction /dotaccent /hungarumlaut /ogonek
+ /uniFB02.sc /s.sc /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
%10
/dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,13 +54,15 @@
/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=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Italic.otf Cochineal-Italic-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tjygyt.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tjygyt.enc
index e5b431d0fe1..816963f1f04 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tjygyt.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tjygyt.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_tjygytsdvb3ibep3ubi244b4dc
-% Encoding created by otftotfm on Mon Sep 14 22:41:49 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:20 2021
% Command line follows encoding
/AutoEnc_tjygytsdvb3ibep3ubi244b4dc [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=sups --ligkern=* {KL} * --space-factor=1.06635
% Cochineal-Bold.otf Cochineal-Bold-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tkhq7f.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tkhq7f.enc
index b2591018818..9dad7c05347 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tkhq7f.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tkhq7f.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_tkhq7fz6bkobo6yfaqhm6f6nph
-% Encoding created by otftotfm on Mon Sep 14 22:42:07 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:39 2021
% Command line follows encoding
/AutoEnc_tkhq7fz6bkobo6yfaqhm6f6nph [
%00
@@ -54,13 +54,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=onum --feature=pnum --feature=smcp --ligkern=f i =: fi
% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --unicoding=germandbls =: SSsmall --space-factor=1.06635
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall --space-factor=1.06635
% Cochineal-BoldItalic.otf Cochineal-BoldItalic-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mgd2ev.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tnxjqs.enc
index 3b604d0568a..64b46ce79c9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mgd2ev.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tnxjqs.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_mgd2evtkihmtazd6ya54qrmaua
-% Encoding created by otftotfm on Mon Sep 14 22:42:20 2020
+%%AutoEnc_tnxjqsinkmufbcxslevpugjy4f
+% Encoding created by otftotfm on Sun Nov 7 16:36:53 2021
% Command line follows encoding
-/AutoEnc_mgd2evtkihmtazd6ya54qrmaua [
+/AutoEnc_tnxjqsinkmufbcxslevpugjy4f [
%00
- /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+ /f.sc /Euro /i.sc /l.sc /fraction /dotaccent /hungarumlaut /ogonek
+ /uniFB02.sc /s.sc /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
%10
/dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,13 +54,15 @@
/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=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Italic.otf Cochineal-Italic-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tzth5f.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tzth5f.enc
new file mode 100644
index 00000000000..c1279aa1ec5
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tzth5f.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_tzth5f3snxpafc4fzk5osvvpjc
+% Encoding created by otftotfm on Sun Nov 7 16:36:23 2021
+% Command line follows encoding
+/AutoEnc_tzth5f3snxpafc4fzk5osvvpjc [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+%10
+ /dotlessi /uni0237 /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.onum /one.onum /two.onum /three.onum /five.onum /five.onum /six.onum /seven.onum
+ /eight.onum /nine.onum /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.alt01 /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 /.notdef /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /macron
+%B0
+ /degree /plusminus /.notdef /.notdef /acute /mu /paragraph /periodcentered
+ /cedilla /.notdef /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=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
+% --feature=dlig --feature=kern --feature=liga --feature=onum --feature=pnum
+% --feature=swsh --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --include-alternates=*.swash
+% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-osf-swash-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_u3j4lk.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_u3j4lk.enc
index fddff0ba0dc..5b121883e79 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_u3j4lk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_u3j4lk.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_u3j4lkpeughdtpqublpkd6pw7f
-% Encoding created by otftotfm on Mon Sep 14 22:41:51 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:25 2021
% Command line follows encoding
/AutoEnc_u3j4lkpeughdtpqublpkd6pw7f [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=onum --feature=tnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uavkhn.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uavkhn.enc
index 2f38d9cf3d2..bc4ac32fc5e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uavkhn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uavkhn.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_uavkhny4l4hkyezdrqdpf4hnuf
-% Encoding created by otftotfm on Mon Sep 14 22:41:53 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:27 2021
% Command line follows encoding
/AutoEnc_uavkhny4l4hkyezdrqdpf4hnuf [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=dlig --feature=kern --feature=liga --feature=onum --feature=swsh
% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7kg32s.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uemkt3.enc
index 1bc55ef05b1..b8e2cf40c70 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7kg32s.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uemkt3.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_7kg32s57h6377ggkwmjp656d4e
-% Encoding created by otftotfm on Mon Sep 14 22:41:43 2020
+%%AutoEnc_uemkt3dlynk2opap3mksbva6qb
+% Encoding created by otftotfm on Sun Nov 7 16:36:17 2021
% Command line follows encoding
-/AutoEnc_7kg32s57h6377ggkwmjp656d4e [
+/AutoEnc_uemkt3dlynk2opap3mksbva6qb [
%00
- /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+ /f.sc /Euro /i.sc /l.sc /fraction /dotaccent /hungarumlaut /ogonek
+ /uniFB02.sc /s.sc /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
%10
/dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,13 +54,15 @@
/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=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uh66oa.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uh66oa.enc
index b369298ede8..6ed69719590 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uh66oa.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uh66oa.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_uh66oarjpfdr7j27diin2k5led
-% Encoding created by otftotfm on Mon Sep 14 22:42:46 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:24 2021
% Command line follows encoding
/AutoEnc_uh66oarjpfdr7j27diin2k5led [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uqbj7f.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uqbj7f.enc
index 224054a6d7c..8eb6e66808f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uqbj7f.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uqbj7f.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_uqbj7f5zu7a64xuex6cid7oqyd
-% Encoding created by otftotfm on Mon Sep 14 22:42:33 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:14 2021
% Command line follows encoding
/AutoEnc_uqbj7f5zu7a64xuex6cid7oqyd [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=dlig --feature=kern --feature=liga --feature=onum --feature=swsh
% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vew4u5.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vew4u5.enc
index 5a668f950b0..bbe411f8ca1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vew4u5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vew4u5.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_vew4u56rzvu2n2ssgszl46wpyd
-% Encoding created by otftotfm on Mon Sep 14 22:42:27 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:00 2021
% Command line follows encoding
/AutoEnc_vew4u56rzvu2n2ssgszl46wpyd [
%00
@@ -54,13 +54,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=lnum --feature=smcp --feature=tnum --ligkern=f i =: fi
% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --unicoding=germandbls =: SSsmall --space-factor=1.06635
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall --space-factor=1.06635
% Cochineal-Roman.otf Cochineal-Roman-tlf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vpdkzq.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vpdkzq.enc
index ffc1674dc4f..443937b29ca 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vpdkzq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vpdkzq.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_vpdkzqgby3qodo2np7n2ojagjb
-% Encoding created by otftotfm on Mon Sep 14 22:42:10 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:50 2021
% Command line follows encoding
/AutoEnc_vpdkzqgby3qodo2np7n2ojagjb [
%00
@@ -54,13 +54,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=lnum --feature=pnum --feature=smcp --ligkern=f i =: fi
% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --unicoding=germandbls =: SSsmall --space-factor=1.06635
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall --space-factor=1.06635
% Cochineal-Italic.otf Cochineal-Italic-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_w6vdgs.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_w6vdgs.enc
index eb74b90d62e..3a97d5aba09 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_w6vdgs.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_w6vdgs.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_w6vdgsq55q7gspxfsubceofp3d
-% Encoding created by otftotfm on Mon Sep 14 22:42:36 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:10 2021
% Command line follows encoding
/AutoEnc_w6vdgsq55q7gspxfsubceofp3d [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=dlig --feature=kern --feature=liga --feature=onum --feature=pnum
% --feature=swsh --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wa4y3o.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wa4y3o.enc
index cb02cb24d71..ad145775418 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wa4y3o.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wa4y3o.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_wa4y3otqtk6der7ddj7btvzijg
-% Encoding created by otftotfm on Mon Sep 14 22:41:49 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:20 2021
% Command line follows encoding
/AutoEnc_wa4y3otqtk6der7ddj7btvzijg [
%00
@@ -54,10 +54,10 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=sups --ligkern=*
% {KL} * --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wcbuwv.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wcbuwv.enc
index 7bece989157..a49a2ddfb02 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wcbuwv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wcbuwv.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_wcbuwvljf4mbw7x3ppm6qikbtd
-% Encoding created by otftotfm on Mon Sep 14 22:42:16 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:47 2021
% Command line follows encoding
/AutoEnc_wcbuwvljf4mbw7x3ppm6qikbtd [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=dnom --ligkern=*
% {KL} * --space-factor=1.06635 Cochineal-Italic.otf
% Cochineal-Italic-dnom-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wnd62o.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wnd62o.enc
index fbf41f30678..ecb32f91722 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wnd62o.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wnd62o.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_wnd62osatxqhhiotu36vcbye2f
-% Encoding created by otftotfm on Mon Sep 14 22:41:43 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:18 2021
% Command line follows encoding
/AutoEnc_wnd62osatxqhhiotu36vcbye2f [
%00
@@ -54,13 +54,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=lnum --feature=pnum --feature=smcp --ligkern=f i =: fi
% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --unicoding=germandbls =: SSsmall --space-factor=1.06635
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall --space-factor=1.06635
% Cochineal-Bold.otf Cochineal-Bold-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wpweoy.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wpweoy.enc
index 0ef2be55763..45f25a62831 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wpweoy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wpweoy.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_wpweoypkngvo3jti4mdlv4kaxf
-% Encoding created by otftotfm on Mon Sep 14 22:41:53 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:28 2021
% Command line follows encoding
/AutoEnc_wpweoypkngvo3jti4mdlv4kaxf [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=dlig --feature=kern
% --feature=liga --feature=onum --feature=swsh --feature=tnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wuwrcy.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wuwrcy.enc
index 824316b9e68..159d531d517 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wuwrcy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wuwrcy.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_wuwrcyin7iz2wuhjlfhmtbesjg
-% Encoding created by otftotfm on Mon Sep 14 22:42:10 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:50 2021
% Command line follows encoding
/AutoEnc_wuwrcyin7iz2wuhjlfhmtbesjg [
%00
@@ -54,13 +54,15 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Italic.otf Cochineal-Italic-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_x3v6nt.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_x3v6nt.enc
index dfb9da7726a..c9696709cc6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_x3v6nt.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_x3v6nt.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_x3v6ntxdzlcsgj576emwhkseka
-% Encoding created by otftotfm on Mon Sep 14 22:42:46 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:25 2021
% Command line follows encoding
/AutoEnc_x3v6ntxdzlcsgj576emwhkseka [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_x4ugem.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_x4ugem.enc
index 9043ecc963c..1580e789f9e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_x4ugem.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_x4ugem.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_x4ugemr4lyaowxh3ncb7qhxtba
-% Encoding created by otftotfm on Mon Sep 14 22:41:51 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:25 2021
% Command line follows encoding
/AutoEnc_x4ugemr4lyaowxh3ncb7qhxtba [
%00
@@ -54,11 +54,11 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xaxcx7.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xaxcx7.enc
index 5e62b1fbce2..d0704df4604 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xaxcx7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xaxcx7.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_xaxcx7aumnpwllap75ckkkk7lc
-% Encoding created by otftotfm on Mon Sep 14 22:42:21 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:54 2021
% Command line follows encoding
/AutoEnc_xaxcx7aumnpwllap75ckkkk7lc [
%00
@@ -54,13 +54,15 @@
/oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
% --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Italic.otf Cochineal-Italic-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xsridg.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xsridg.enc
index 892c85a8b95..c62c864742e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xsridg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xsridg.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_xsridg2zky2dbgd6rhpkzffpid
-% Encoding created by otftotfm on Mon Sep 14 22:42:34 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:08 2021
% Command line follows encoding
/AutoEnc_xsridg2zky2dbgd6rhpkzffpid [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=onum --feature=pnum --ligkern=f i
% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4srkt4.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_y3tmc2.enc
index 6e3ceccb463..a0272a3a111 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4srkt4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_y3tmc2.enc
@@ -1,12 +1,12 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-%%AutoEnc_4srkt4hq7lmvthqwnogt7st3of
-% Encoding created by otftotfm on Mon Sep 14 22:42:10 2020
+%%AutoEnc_y3tmc2lkmkibesobta5gquljhe
+% Encoding created by otftotfm on Sun Nov 7 16:36:49 2021
% Command line follows encoding
-/AutoEnc_4srkt4hq7lmvthqwnogt7st3of [
+/AutoEnc_y3tmc2lkmkibesobta5gquljhe [
%00
- /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
- /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+ /f.sc /Euro /i.sc /l.sc /fraction /dotaccent /hungarumlaut /ogonek
+ /uniFB02.sc /s.sc /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
%10
/dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
/cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,13 +54,15 @@
/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=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =:
+% FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
% --space-factor=1.06635 Cochineal-Italic.otf Cochineal-Italic-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ygltby.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ygltby.enc
index bcd06cc4efd..97879fcd9ec 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ygltby.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ygltby.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ygltbypceuzxquhjdc5xwpxbrd
-% Encoding created by otftotfm on Mon Sep 14 22:42:23 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:05 2021
% Command line follows encoding
/AutoEnc_ygltbypceuzxquhjdc5xwpxbrd [
%00
@@ -54,13 +54,15 @@
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
% --feature=lnum --feature=pnum --feature=smcp --ligkern=f i =: fi
% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl --unicoding=germandbls =: SSsmall --space-factor=1.06635
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall --space-factor=1.06635
% Cochineal-Roman.otf Cochineal-Roman-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yprnrw.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yprnrw.enc
index 1d10197395e..aa277d24350 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yprnrw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yprnrw.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_yprnrw2rdsj7qg2tvl2rh46osd
-% Encoding created by otftotfm on Mon Sep 14 22:42:12 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:47 2021
% Command line follows encoding
/AutoEnc_yprnrw2rdsj7qg2tvl2rh46osd [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=sinf --ligkern=* {KL} * --space-factor=1.06635
% Cochineal-Italic.otf Cochineal-Italic-inf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_z2oun7.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_z2oun7.enc
index a12d1fb0e84..9d4135581e9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_z2oun7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_z2oun7.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_z2oun7lavvqlvnqi6glga2dv7h
-% Encoding created by otftotfm on Mon Sep 14 22:41:50 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:32 2021
% Command line follows encoding
/AutoEnc_z2oun7lavvqlvnqi6glga2dv7h [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=dnom --ligkern=* {KL} * --space-factor=1.06635
-% Cochineal-Bold.otf Cochineal-Bold-dnom-ly1'
+% Cochineal-BoldItalic.otf Cochineal-BoldItalic-dnom-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zbphsw.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zbphsw.enc
index e4530c0f846..0a30942aa3d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zbphsw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zbphsw.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_zbphswbrsntufjuvjzogthkqpd
-% Encoding created by otftotfm on Mon Sep 14 22:42:29 2020
+% Encoding created by otftotfm on Sun Nov 7 16:37:07 2021
% Command line follows encoding
/AutoEnc_zbphswbrsntufjuvjzogthkqpd [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=sups --ligkern=* {KL} * --space-factor=1.06635
% Cochineal-Roman.otf Cochineal-Roman-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zg5irv.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zg5irv.enc
index 387560fdb4c..870c1bebcb2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zg5irv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zg5irv.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_zg5irvlujy2hiai5qoebcv6dhd
-% Encoding created by otftotfm on Mon Sep 14 22:42:21 2020
+% Encoding created by otftotfm on Sun Nov 7 16:36:54 2021
% Command line follows encoding
/AutoEnc_zg5irvlujy2hiai5qoebcv6dhd [
%00
@@ -54,11 +54,11 @@
/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
% Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/type1/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2021/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
% --no-updmap --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI
% --feature=dlig --feature=kern --feature=liga --feature=onum --feature=pnum
% --feature=swsh --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff