cochineal (29mar18)

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

802 files changed, 3271 insertions, 3552 deletions

diff --git a/Master/texmf-dist/fonts/afm/public/cochineal/Cochineal-Bold.afm b/Master/texmf-dist/fonts/afm/public/cochineal/Cochineal-Bold.afm
index 353be726849..00bb13d9ffe 100644
--- a/Master/texmf-dist/fonts/afm/public/cochineal/Cochineal-Bold.afm
+++ b/Master/texmf-dist/fonts/afm/public/cochineal/Cochineal-Bold.afm
@@ -1,8 +1,8 @@
 StartFontMetrics 2.0
-Comment Generated by FontForge 20161003
-Comment Creation Date: Sat Dec 31 17:56:49 2016
+Comment Generated by FontForge 20170730
+Comment Creation Date: Sun Mar 18 10:36:09 2018
 FontName Cochineal-Bold
-FullName Crimson Bold
+FullName Cochineal Bold
 FamilyName Cochineal
 Weight Bold
 Notice (Copyright (c) 2010, Sebastian Kosch (sebastian@aldusleaf.org),)
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gccjw3.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2bdexd.enc
index 1cb34da950f..5aa2d206b1e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gccjw3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2bdexd.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_gccjw3u4i5mvw5ch6nrcg2xmtd
-% Encoding created by otftotfm on Sat Dec 31 18:05:51 2016
+%%AutoEnc_2bdexd3bheqplp2o6xukmhzera
+% Encoding created by otftotfm on Wed Mar 28 19:24:52 2018
 % Command line follows encoding
-/AutoEnc_gccjw3u4i5mvw5ch6nrcg2xmtd [
+/AutoEnc_2bdexd3bheqplp2o6xukmhzera [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
 % --feature=kern --feature=liga --feature=onum --feature=swsh --feature=tnum
 % --include-alternates=*.swash --feature=aalt --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2gcnb2.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2gcnb2.enc
new file mode 100644
index 00000000000..7c7be111d05
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2gcnb2.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_2gcnb2qqzo2t7amd4qeyt2gflf
+% Encoding created by otftotfm on Wed Mar 28 19:25:01 2018
+% Command line follows encoding
+/AutoEnc_2gcnb2qqzo2t7amd4qeyt2gflf [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%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 /one /two /three /four /five /six /seven
+  /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.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 /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=dlig --feature=kern
+% --feature=liga --feature=lnum --feature=swsh --feature=tnum
+% --include-alternates=*.swash --feature=aalt --space-factor=1.06635
+% Cochineal-Bold.otf Cochineal-Bold-tlf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tydrhh.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2hlayp.enc
index fae11ceaf33..ebe3c4bd0c5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tydrhh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2hlayp.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_tydrhhb4swdviw45er75ysdrih
-% Encoding created by otftotfm on Sat Dec 31 18:05:58 2016
+%%AutoEnc_2hlaypvjknmdmdwlmdelewm4ph
+% Encoding created by otftotfm on Wed Mar 28 19:25:18 2018
 % Command line follows encoding
-/AutoEnc_tydrhhb4swdviw45er75ysdrih [
+/AutoEnc_2hlaypvjknmdmdwlmdelewm4ph [
 %00
   /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /i.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --feature=smcp
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ckzf3x.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2lm36b.enc
index 32178d9bbbc..08327c202d5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ckzf3x.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2lm36b.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ckzf3x7x5g6mtdz2tu3z4a6fyf
-% Encoding created by otftotfm on Sat Dec 31 18:05:43 2016
+%%AutoEnc_2lm36bljrtfzfgm3j66m43i3nd
+% Encoding created by otftotfm on Wed Mar 28 19:24:57 2018
 % Command line follows encoding
-/AutoEnc_ckzf3x7x5g6mtdz2tu3z4a6fyf [
+/AutoEnc_2lm36bljrtfzfgm3j66m43i3nd [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --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_jf7qqq.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_327ero.enc
index 7c5d7f343bc..a3d6b5604f9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jf7qqq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_327ero.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_jf7qqqhlnxyyi2yyu2323lvrid
-% Encoding created by otftotfm on Sat Dec 31 18:06:29 2016
+%%AutoEnc_327erotlfdchg5e3n2ycuhf4og
+% Encoding created by otftotfm on Wed Mar 28 19:25:46 2018
 % Command line follows encoding
-/AutoEnc_jf7qqqhlnxyyi2yyu2323lvrid [
+/AutoEnc_327erotlfdchg5e3n2ycuhf4og [
 %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 /uni200C
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=pnum
 % --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-lf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nyeh65.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3ahcfy.enc
index e71f7a5f4d0..a70737ba62d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nyeh65.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3ahcfy.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_nyeh65oko4x5yvacj7zwfbpnzg
-% Encoding created by otftotfm on Sat Dec 31 18:06:41 2016
+%%AutoEnc_3ahcfywe37dany2hmtslgvhu6b
+% Encoding created by otftotfm on Wed Mar 28 19:25:34 2018
 % Command line follows encoding
-/AutoEnc_nyeh65oko4x5yvacj7zwfbpnzg [
+/AutoEnc_3ahcfywe37dany2hmtslgvhu6b [
 %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 /uni200C
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --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_lm7rws.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3ckcz6.enc
index 526c1eca36c..03ebbc9955d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lm7rws.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3ckcz6.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_lm7rwsyufmnkn25rj47m5lhgfb
-% Encoding created by otftotfm on Sat Dec 31 18:06:03 2016
+%%AutoEnc_3ckcz6agums4m3r5kvdmiodwaa
+% Encoding created by otftotfm on Wed Mar 28 19:25:10 2018
 % Command line follows encoding
-/AutoEnc_lm7rwsyufmnkn25rj47m5lhgfb [
+/AutoEnc_3ckcz6agums4m3r5kvdmiodwaa [
 %00
-  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /i.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
 %80
   /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,12 +54,12 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
 % --feature=onum --feature=pnum --feature=smcp --unicoding=germandbls =:
 % SSsmall --space-factor=1.06635 Cochineal-BoldItalic.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tbu25z.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3knxwx.enc
index e819559fc83..5a0627512c5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tbu25z.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3knxwx.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_tbu25zfw5k2xgqfj3tzbpkxd2f
-% Encoding created by otftotfm on Sat Dec 31 18:05:55 2016
+%%AutoEnc_3knxwxu4r25ng4o3o7xjzxfu5e
+% Encoding created by otftotfm on Wed Mar 28 19:25:15 2018
 % Command line follows encoding
-/AutoEnc_tbu25zfw5k2xgqfj3tzbpkxd2f [
+/AutoEnc_3knxwxu4r25ng4o3o7xjzxfu5e [
 %00
   /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /i.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=smcp --feature=tnum
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3led4x.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3led4x.enc
deleted file mode 100644
index 40acee60f80..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3led4x.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_3led4x6vfdonyn5urzyszbztre
-% Encoding created by otftotfm on Sat Dec 31 18:06:53 2016
-% Command line follows encoding
-/AutoEnc_3led4x6vfdonyn5urzyszbztre [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /uni0311 /.notdef /uni0306 /endash /emdash /uni200C
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q.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
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=dlig --feature=kern --feature=liga --feature=lnum
-% --feature=pnum --feature=swsh --include-alternates=*.swash --feature=aalt
-% --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-lf-swash-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4qv7jr.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3lkmdq.enc
index ecbba4410c5..946d606df5a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4qv7jr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3lkmdq.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_4qv7jrl4hqiavnnohtujnufwld
-% Encoding created by otftotfm on Sat Dec 31 18:06:35 2016
+%%AutoEnc_3lkmdqkeptmwde6bufkz6esege
+% Encoding created by otftotfm on Wed Mar 28 19:25:39 2018
 % Command line follows encoding
-/AutoEnc_4qv7jrl4hqiavnnohtujnufwld [
+/AutoEnc_3lkmdqkeptmwde6bufkz6esege [
 %00
-  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute.sc /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
 %80
   /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,12 +54,12 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
 % --feature=onum --feature=pnum --feature=smcp --unicoding=germandbls =:
 % SSsmall --space-factor=1.06635 Cochineal-Roman.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_swy4oa.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3pp4wv.enc
index 1427609bd20..d3c8077db57 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_swy4oa.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3pp4wv.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_swy4oa7suk7v7xrgy4psubsgkh
-% Encoding created by otftotfm on Sat Dec 31 18:06:09 2016
+%%AutoEnc_3pp4wv2uj6mmdoq3sg7cdfphkf
+% Encoding created by otftotfm on Wed Mar 28 19:25:28 2018
 % Command line follows encoding
-/AutoEnc_swy4oa7suk7v7xrgy4psubsgkh [
+/AutoEnc_3pp4wv2uj6mmdoq3sg7cdfphkf [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=tnum --space-factor=1.06635
 % Cochineal-Italic.otf Cochineal-Italic-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4n5rlh.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3uurxv.enc
index 5fc9e818a9d..badd990e255 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4n5rlh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3uurxv.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_4n5rlhixdduffs6onqne2mkzjf
-% Encoding created by otftotfm on Sat Dec 31 18:06:31 2016
+%%AutoEnc_3uurxv4dydpgh6ogolzuygq4ug
+% Encoding created by otftotfm on Wed Mar 28 19:25:47 2018
 % Command line follows encoding
-/AutoEnc_4n5rlhixdduffs6onqne2mkzjf [
+/AutoEnc_3uurxv4dydpgh6ogolzuygq4ug [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /uni200C /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=swsh
 % --include-alternates=*.swash --feature=aalt --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3uwymq.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3uwymq.enc
new file mode 100644
index 00000000000..e57bb86fda6
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3uwymq.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_3uwymqsd6ycnc2tcu2qfe5itkh
+% Encoding created by otftotfm on Wed Mar 28 19:24:59 2018
+% Command line follows encoding
+/AutoEnc_3uwymqsd6ycnc2tcu2qfe5itkh [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%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 /one /two /three /four /five /six /seven
+  /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=tnum --space-factor=1.06635 Cochineal-Bold.otf
+% Cochineal-Bold-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lnko3p.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_462rls.enc
index d38b45355ae..bf8326b1024 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lnko3p.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_462rls.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_lnko3pkepwotmbfzqg3ebq3l2g
-% Encoding created by otftotfm on Sat Dec 31 18:05:50 2016
+%%AutoEnc_462rlsjeinugk6xjimpds2ycqa
+% Encoding created by otftotfm on Wed Mar 28 19:24:51 2018
 % Command line follows encoding
-/AutoEnc_lnko3pkepwotmbfzqg3ebq3l2g [
+/AutoEnc_462rlsjeinugk6xjimpds2ycqa [
 %00
-  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
 %80
   /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,12 +54,12 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
 % --feature=onum --feature=smcp --feature=tnum --unicoding=germandbls =:
 % SSsmall --space-factor=1.06635 Cochineal-Bold.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4gkh24.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4gkh24.enc
deleted file mode 100644
index e1043cffe15..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4gkh24.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_4gkh24pw2xdzzlmsj4eomsrkjd
-% Encoding created by otftotfm on Sat Dec 31 18:06:51 2016
-% Command line follows encoding
-/AutoEnc_4gkh24pw2xdzzlmsj4eomsrkjd [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /uni0311 /.notdef /uni0306 /endash /emdash /uni200C
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /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
-  /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
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=kern --feature=liga --feature=onum --feature=pnum
-% --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-osf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_j4a4qt.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4kirwg.enc
index a000fb62dc9..24ce4691260 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_j4a4qt.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4kirwg.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_j4a4qtsu33u6qxafrapfs5trga
-% Encoding created by otftotfm on Sat Dec 31 18:06:13 2016
+%%AutoEnc_4kirwgvpfcoydkjgxkwsln6hdb
+% Encoding created by otftotfm on Wed Mar 28 19:25:32 2018
 % Command line follows encoding
-/AutoEnc_j4a4qtsu33u6qxafrapfs5trga [
+/AutoEnc_4kirwgvpfcoydkjgxkwsln6hdb [
 %00
   /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --feature=smcp
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hflk7g.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4pifhx.enc
index aa2b02bdbca..2e0a18b9a42 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hflk7g.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4pifhx.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_hflk7giw3nug6wro5ugos23mad
-% Encoding created by otftotfm on Sat Dec 31 18:06:28 2016
+%%AutoEnc_4pifhx7b5j5uxjxeilzq6kgx2a
+% Encoding created by otftotfm on Wed Mar 28 19:25:45 2018
 % Command line follows encoding
-/AutoEnc_hflk7giw3nug6wro5ugos23mad [
+/AutoEnc_4pifhx7b5j5uxjxeilzq6kgx2a [
 %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 /uni200C
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=dlig --feature=kern --feature=liga --feature=lnum --feature=swsh
 % --feature=tnum --include-alternates=*.swash --feature=aalt
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uhgdpa.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4se4qw.enc
index 8524ed4f988..93b9d95aa42 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uhgdpa.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4se4qw.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_uhgdpaic32netfcty5qhzvruga
-% Encoding created by otftotfm on Sat Dec 31 18:06:55 2016
+%%AutoEnc_4se4qwhuysfzv2xl2aggteitsg
+% Encoding created by otftotfm on Wed Mar 28 19:25:51 2018
 % Command line follows encoding
-/AutoEnc_uhgdpaic32netfcty5qhzvruga [
+/AutoEnc_4se4qwhuysfzv2xl2aggteitsg [
 %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
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam.up /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft.up /parenright.up /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown.up /questiondown.up /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4u6kmt.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4u6kmt.enc
deleted file mode 100644
index b8844c97bb6..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4u6kmt.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_4u6kmtbbjenlkl22paajpudw7b
-% Encoding created by otftotfm on Sat Dec 31 18:06:52 2016
-% Command line follows encoding
-/AutoEnc_4u6kmtbbjenlkl22paajpudw7b [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /uni0311 /.notdef /uni0306 /endash /emdash /uni200C
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=kern --feature=liga --feature=lnum --feature=pnum
-% --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-lf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sxkuxx.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4w37pe.enc
index 1cababc3fa6..ad46c4d801f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sxkuxx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4w37pe.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_sxkuxxx2cywrxfhdh5bjgr3sag
-% Encoding created by otftotfm on Sat Dec 31 18:05:36 2016
+%%AutoEnc_4w37pe64v3eq3yxyufs2ifskka
+% Encoding created by otftotfm on Wed Mar 28 19:25:00 2018
 % Command line follows encoding
-/AutoEnc_sxkuxxx2cywrxfhdh5bjgr3sag [
+/AutoEnc_4w37pe64v3eq3yxyufs2ifskka [
 %00
   /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=smcp --feature=tnum
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4wsvu7.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4wsvu7.enc
new file mode 100644
index 00000000000..b69f5546801
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4wsvu7.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_4wsvu7vr6nqqjcfnf66hpqdaga
+% Encoding created by otftotfm on Wed Mar 28 19:25:46 2018
+% Command line follows encoding
+/AutoEnc_4wsvu7vr6nqqjcfnf66hpqdaga [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
+%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.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+  /eight.prop /nine.prop /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --space-factor=1.06635 Cochineal-Roman.otf
+% Cochineal-Roman-lf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t2vkuk.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5dxihi.enc
index 4d07d6b9a90..4cb96554e4e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t2vkuk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5dxihi.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_t2vkuk6ybhzy3qetxure6mxp6a
-% Encoding created by otftotfm on Sat Dec 31 18:05:55 2016
+%%AutoEnc_5dxihil3gosz2b753ewpmuje6e
+% Encoding created by otftotfm on Wed Mar 28 19:25:15 2018
 % Command line follows encoding
-/AutoEnc_t2vkuk6ybhzy3qetxure6mxp6a [
+/AutoEnc_5dxihil3gosz2b753ewpmuje6e [
 %00
-  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /i.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
 %80
   /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,12 +54,12 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
 % --feature=lnum --feature=smcp --feature=tnum --unicoding=germandbls =:
 % SSsmall --space-factor=1.06635 Cochineal-BoldItalic.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5g7rcl.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5g7rcl.enc
new file mode 100644
index 00000000000..2dbf3eb6dd3
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5g7rcl.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_5g7rclcrr5zkeag2ydoawrqhqa
+% Encoding created by otftotfm on Wed Mar 28 19:25:22 2018
+% Command line follows encoding
+/AutoEnc_5g7rclcrr5zkeag2ydoawrqhqa [
+%00
+  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
+  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+  /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+  /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+  /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=smcp --feature=tnum --unicoding=germandbls =:
+% SSsmall --space-factor=1.06635 Cochineal-Italic.otf
+% Cochineal-Italic-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hl6u4r.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5iuvne.enc
index 62a73be4e11..eccfbfa3e76 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hl6u4r.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5iuvne.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_hl6u4rf6httlegpibghi64a6ig
-% Encoding created by otftotfm on Sat Dec 31 18:05:36 2016
+%%AutoEnc_5iuvneucbvorso2wvejyt7lv7b
+% Encoding created by otftotfm on Wed Mar 28 19:24:59 2018
 % Command line follows encoding
-/AutoEnc_hl6u4rf6httlegpibghi64a6ig [
+/AutoEnc_5iuvneucbvorso2wvejyt7lv7b [
 %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
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=tnum
 % --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5rx6tx.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5rx6tx.enc
new file mode 100644
index 00000000000..605a42e2003
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5rx6tx.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_5rx6tx4apyvc3kpanj2g75rz5b
+% Encoding created by otftotfm on Wed Mar 28 19:25:48 2018
+% Command line follows encoding
+/AutoEnc_5rx6tx4apyvc3kpanj2g75rz5b [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
+%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.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+  /eight.prop /nine.prop /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.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 /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=dlig --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=swsh
+% --include-alternates=*.swash --feature=aalt --space-factor=1.06635
+% Cochineal-Roman.otf Cochineal-Roman-lf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_asaeuh.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5v3q2i.enc
index ad23e5d8a39..4a0c724f47e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_asaeuh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5v3q2i.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_asaeuhomp6jq33jba7evcnimfa
-% Encoding created by otftotfm on Sat Dec 31 18:06:24 2016
+%%AutoEnc_5v3q2ik7vctzjtjmp5wezb2t5c
+% Encoding created by otftotfm on Wed Mar 28 19:25:42 2018
 % Command line follows encoding
-/AutoEnc_asaeuhomp6jq33jba7evcnimfa [
+/AutoEnc_5v3q2ik7vctzjtjmp5wezb2t5c [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /uni200C /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dnom
 % --feature=kern --feature=liga --ligkern=* {KL} * --space-factor=1.06635
 % Cochineal-Roman.otf Cochineal-Roman-dnom-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eluacw.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5ye6em.enc
index 6b0910ccc90..b2e0e62f3fd 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eluacw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5ye6em.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_eluacw2sgkvuxabk7zozyqg4zc
-% Encoding created by otftotfm on Sat Dec 31 18:06:34 2016
+%%AutoEnc_5ye6emtshbvxfaac7ctanvfiwd
+% Encoding created by otftotfm on Wed Mar 28 19:25:38 2018
 % Command line follows encoding
-/AutoEnc_eluacw2sgkvuxabk7zozyqg4zc [
+/AutoEnc_5ye6emtshbvxfaac7ctanvfiwd [
 %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 /uni200C
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=pnum
 % --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_oaz2vt.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6iuvsw.enc
index c73aa87f9d7..982543371ba 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_oaz2vt.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6iuvsw.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_oaz2vttx3vojieta57wjq2qwqh
-% Encoding created by otftotfm on Sat Dec 31 18:05:50 2016
+%%AutoEnc_6iuvswur6skc4icjipjt2tngtb
+% Encoding created by otftotfm on Wed Mar 28 19:24:52 2018
 % Command line follows encoding
-/AutoEnc_oaz2vttx3vojieta57wjq2qwqh [
+/AutoEnc_6iuvswur6skc4icjipjt2tngtb [
 %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.sc /j.sc /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /.notdef /dotlessi.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /Uhungarumlaut /Uring
   /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent.sc /dcroat.sc /section
 %A0
   /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
   /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
 %B0
-  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /.notdef /uhungarumlaut.sc /uring.sc
   /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent /ij.sc /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t4kqf4.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6n7xb4.enc
index 8be8ada92d3..fd5b8dea800 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t4kqf4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6n7xb4.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_t4kqf4bhxqmbnvgf5cwsfi3lpf
-% Encoding created by otftotfm on Sat Dec 31 18:06:22 2016
+%%AutoEnc_6n7xb4k65uam6j32wkkxchqjke
+% Encoding created by otftotfm on Wed Mar 28 19:25:22 2018
 % Command line follows encoding
-/AutoEnc_t4kqf4bhxqmbnvgf5cwsfi3lpf [
+/AutoEnc_6n7xb4k65uam6j32wkkxchqjke [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
 % --feature=kern --feature=liga --feature=onum --feature=swsh --feature=tnum
 % --include-alternates=*.swash --feature=aalt --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r7lidj.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6samag.enc
index 195edc7bb01..83ecbbb0b9e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r7lidj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6samag.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_r7lidjar54eq7qhj5t5tgqigbh
-% Encoding created by otftotfm on Sat Dec 31 18:05:35 2016
+%%AutoEnc_6samag633x7qv5delozyb3m3nd
+% Encoding created by otftotfm on Wed Mar 28 19:25:28 2018
 % Command line follows encoding
-/AutoEnc_r7lidjar54eq7qhj5t5tgqigbh [
+/AutoEnc_6samag633x7qv5delozyb3m3nd [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /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
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,12 +54,12 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=lnum --feature=tnum --space-factor=1.06635 Cochineal-Bold.otf
-% Cochineal-Bold-tlf-ot1'
+% --feature=lnum --feature=tnum --space-factor=1.06635 Cochineal-Italic.otf
+% Cochineal-Italic-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_w4afvi.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6xkbmk.enc
index e80e325d35b..d0aaa28581b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_w4afvi.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6xkbmk.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_w4afvizqtahdqakq4azlqvqyea
-% Encoding created by otftotfm on Sat Dec 31 18:05:39 2016
+%%AutoEnc_6xkbmkl3zqccaqybx5dyh57ome
+% Encoding created by otftotfm on Wed Mar 28 19:24:53 2018
 % Command line follows encoding
-/AutoEnc_w4afvizqtahdqakq4azlqvqyea [
+/AutoEnc_6xkbmkl3zqccaqybx5dyh57ome [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
@@ -14,8 +14,8 @@
   /.notdef /.notdef /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
   /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
 %30
-  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /Q /Q.alt01 /.notdef /minus /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
 %40
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,13 +54,13 @@
   /.notdef /.notdef /.notdef /.notdef /l /.notdef /i /f
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
 % --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
 % --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-tlf-ts1'
+% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-tosf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_72apy2.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_72apy2.enc
new file mode 100644
index 00000000000..f08c402b5b3
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_72apy2.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_72apy2krs65x6sfwplhei5hiad
+% Encoding created by otftotfm on Wed Mar 28 19:25:24 2018
+% Command line follows encoding
+/AutoEnc_72apy2krs65x6sfwplhei5hiad [
+%00
+  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
+  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /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 /four.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.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+  /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+  /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+  /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=pnum --feature=smcp --unicoding=germandbls =:
+% SSsmall --space-factor=1.06635 Cochineal-Italic.otf
+% Cochineal-Italic-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7bfc6o.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7bfc6o.enc
deleted file mode 100644
index 6d3f6193bf1..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7bfc6o.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_7bfc6o54femkrvifuhj5cqlpxa
-% Encoding created by otftotfm on Sat Dec 31 18:06:45 2016
-% Command line follows encoding
-/AutoEnc_7bfc6o54femkrvifuhj5cqlpxa [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /.notdef /.notdef /uni0306 /endash /emdash /.notdef
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q.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
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=dlig --feature=kern --feature=liga --feature=onum
-% --feature=swsh --feature=tnum --include-alternates=*.swash --feature=aalt
-% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-tosf-swash-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sechmf.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7dsvym.enc
index fc79559b73c..c127c5b6989 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sechmf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7dsvym.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_sechmfdn7lhihsrzmqf2munkig
-% Encoding created by otftotfm on Sat Dec 31 18:05:51 2016
+%%AutoEnc_7dsvymb2elp4lhhlisrdlapfng
+% Encoding created by otftotfm on Wed Mar 28 19:24:53 2018
 % Command line follows encoding
-/AutoEnc_sechmfdn7lhihsrzmqf2munkig [
+/AutoEnc_7dsvymb2elp4lhhlisrdlapfng [
 %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
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=dlig --feature=kern --feature=liga --feature=onum --feature=swsh
 % --feature=tnum --include-alternates=*.swash --feature=aalt
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7h3ywq.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7h3ywq.enc
deleted file mode 100644
index 56c77bfc8d3..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7h3ywq.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_7h3ywquooyss4wakboi3rggmge
-% Encoding created by otftotfm on Sat Dec 31 18:05:43 2016
-% Command line follows encoding
-/AutoEnc_7h3ywquooyss4wakboi3rggmge [
-%00
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
-%10
-  /question /bar /quotedblbase /exclamdown /questiondown /.notdef /.notdef /.notdef
-  /arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /endash /.notdef
-%20
-  /.notdef /.notdef /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
-  /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
-%30
-  /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
-  /eight.onum /nine.onum /Q /Q.alt01 /.notdef /minus /.notdef /.notdef
-%40
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%50
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni03A9
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /arrowup /arrowdown
-%60
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%70
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%80
-  /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
-  /bullet /.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 /cent /sterling /currency /yen /brokenbar /section
-  /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
-%B0
-  /degree /plusminus /.notdef /.notdef /.notdef /mu /paragraph /periodcentered
-  /.notdef /.notdef /ordmasculine /radical /onequarter /onehalf /threequarters /.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 /multiply /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
-  /.notdef /.notdef /.notdef /.notdef /l /.notdef /i /f
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
-% --feature=onum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
-% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-lf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qoklp4.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7iao2d.enc
index af71dda8695..bfe5267b2b9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qoklp4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7iao2d.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_qoklp4vhvvpdnurilbl6t6u4eg
-% Encoding created by otftotfm on Sat Dec 31 18:06:06 2016
+%%AutoEnc_7iao2dniakbyfe3c67e5nvit2h
+% Encoding created by otftotfm on Wed Mar 28 19:25:08 2018
 % Command line follows encoding
-/AutoEnc_qoklp4vhvvpdnurilbl6t6u4eg [
+/AutoEnc_7iao2dniakbyfe3c67e5nvit2h [
 %00
-  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /i.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
 %80
   /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,12 +54,12 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
 % --feature=onum --feature=smcp --feature=tnum --unicoding=germandbls =:
 % SSsmall --space-factor=1.06635 Cochineal-BoldItalic.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rmihs3.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7n5ozw.enc
index bfd6cba2a6b..00fe402ba7c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rmihs3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7n5ozw.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_rmihs3s5dl47zafpdybr3a6cte
-% Encoding created by otftotfm on Sat Dec 31 18:05:44 2016
+%%AutoEnc_7n5ozwifmjdqmta6eqqsurutme
+% Encoding created by otftotfm on Wed Mar 28 19:24:53 2018
 % Command line follows encoding
-/AutoEnc_rmihs3s5dl47zafpdybr3a6cte [
+/AutoEnc_7n5ozwifmjdqmta6eqqsurutme [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=pnum --space-factor=1.06635
 % Cochineal-Bold.otf Cochineal-Bold-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wpmcrv.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7uj7io.enc
index 1a47662ae6e..f999288e70c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wpmcrv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7uj7io.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_wpmcrvovjnxaupz4xubjd4tosd
-% Encoding created by otftotfm on Sat Dec 31 18:06:28 2016
+%%AutoEnc_7uj7iokoaokbvpxwp2bnnoqsbe
+% Encoding created by otftotfm on Wed Mar 28 19:25:37 2018
 % Command line follows encoding
-/AutoEnc_wpmcrvovjnxaupz4xubjd4tosd [
+/AutoEnc_7uj7iokoaokbvpxwp2bnnoqsbe [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
@@ -14,8 +14,8 @@
   /.notdef /.notdef /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
   /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
 %30
-  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /Q /Q.alt01 /.notdef /minus /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
 %40
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,13 +54,13 @@
   /.notdef /.notdef /.notdef /.notdef /l /.notdef /i /f
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
 % --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
 % --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-tlf-ts1'
+% --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-tosf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hjbta7.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7wf654.enc
index 958cc2b305b..1bcf73fed3c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hjbta7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7wf654.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_hjbta7xnr6v7edjb7f6zgy7i7e
-% Encoding created by otftotfm on Sat Dec 31 18:05:45 2016
+%%AutoEnc_7wf6546ucxuem4rfi6fq3qv6cg
+% Encoding created by otftotfm on Wed Mar 28 19:24:54 2018
 % Command line follows encoding
-/AutoEnc_hjbta7xnr6v7edjb7f6zgy7i7e [
+/AutoEnc_7wf6546ucxuem4rfi6fq3qv6cg [
 %00
   /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=pnum --feature=smcp
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5to7wu.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7ylujt.enc
index 876e13d5e4f..c19ccc2d174 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5to7wu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7ylujt.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_5to7wujtnlqezunvxooho5nmne
-% Encoding created by otftotfm on Sat Dec 31 18:05:47 2016
+%%AutoEnc_7ylujtvhkdkummpgarkbptl2zf
+% Encoding created by otftotfm on Wed Mar 28 19:25:25 2018
 % Command line follows encoding
-/AutoEnc_5to7wujtnlqezunvxooho5nmne [
+/AutoEnc_7ylujtvhkdkummpgarkbptl2zf [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /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
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=dlig --feature=kern
 % --feature=liga --feature=onum --feature=pnum --feature=swsh
 % --include-alternates=*.swash --feature=aalt --space-factor=1.06635
-% Cochineal-Bold.otf Cochineal-Bold-osf-swash-ot1'
+% Cochineal-Italic.otf Cochineal-Italic-osf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r4tuvp.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_a2bs3v.enc
index 4bb33d97d9c..bb48ca3fa0a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r4tuvp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_a2bs3v.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_r4tuvpfdxha6kyaixqtehnqvue
-% Encoding created by otftotfm on Sat Dec 31 18:06:06 2016
+%%AutoEnc_a2bs3vm2rjznnueklgt6o373sb
+% Encoding created by otftotfm on Wed Mar 28 19:25:08 2018
 % Command line follows encoding
-/AutoEnc_r4tuvpfdxha6kyaixqtehnqvue [
+/AutoEnc_a2bs3vm2rjznnueklgt6o373sb [
 %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 /i.sc /j.sc /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /.notdef /i.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /Uhungarumlaut /Uring
   /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent.sc /dcroat.sc /section
 %A0
   /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
   /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
 %B0
-  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /.notdef /uhungarumlaut.sc /uring.sc
   /ydieresis.sc /zacute.sc /zcaron /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2lyzki.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aiszvi.enc
index 4252f60c42b..33c2b2bd2b7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2lyzki.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aiszvi.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_2lyzkihyil54xogctfz3vxrbna
-% Encoding created by otftotfm on Sat Dec 31 18:05:45 2016
+%%AutoEnc_aiszvioatmgagbut46lhbf6ebh
+% Encoding created by otftotfm on Wed Mar 28 19:24:54 2018
 % Command line follows encoding
-/AutoEnc_2lyzkihyil54xogctfz3vxrbna [
+/AutoEnc_aiszvioatmgagbut46lhbf6ebh [
 %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
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=pnum
 % --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_alu2zh.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_alu2zh.enc
new file mode 100644
index 00000000000..60abac89a77
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_alu2zh.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_alu2zhctgc6e2jtnsb2xah2s7d
+% Encoding created by otftotfm on Wed Mar 28 19:24:52 2018
+% Command line follows encoding
+/AutoEnc_alu2zhctgc6e2jtnsb2xah2s7d [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%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.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.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 /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=dlig --feature=kern
+% --feature=liga --feature=onum --feature=swsh --feature=tnum
+% --include-alternates=*.swash --feature=aalt --space-factor=1.06635
+% Cochineal-Bold.otf Cochineal-Bold-tosf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ofxlj7.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ankljj.enc
index 0c81081c6aa..fcc0afb0946 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ofxlj7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ankljj.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ofxlj765jxhraqbgssmodmf2lc
-% Encoding created by otftotfm on Sat Dec 31 18:06:19 2016
+%%AutoEnc_ankljjoqw6lfcrqpceyasnkk5e
+% Encoding created by otftotfm on Wed Mar 28 19:25:25 2018
 % Command line follows encoding
-/AutoEnc_ofxlj765jxhraqbgssmodmf2lc [
+/AutoEnc_ankljjoqw6lfcrqpceyasnkk5e [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=swsh
 % --include-alternates=*.swash --feature=aalt --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mzcfhr.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aonoag.enc
index 063efee64f5..d23e889e8ab 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mzcfhr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aonoag.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_mzcfhrb3khstgj7fzpqcrqvdva
-% Encoding created by otftotfm on Sat Dec 31 18:05:42 2016
+%%AutoEnc_aonoagx5km2dirxcekh7la3hwb
+% Encoding created by otftotfm on Wed Mar 28 19:25:05 2018
 % Command line follows encoding
-/AutoEnc_mzcfhrb3khstgj7fzpqcrqvdva [
+/AutoEnc_aonoagx5km2dirxcekh7la3hwb [
 %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
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=dlig --feature=kern --feature=liga --feature=lnum --feature=pnum
 % --feature=swsh --include-alternates=*.swash --feature=aalt
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l6dunu.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_arhfdy.enc
index 0cc1eb4ab67..8f51973772b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l6dunu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_arhfdy.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_l6dununypfxtstvzqlohzhqsne
-% Encoding created by otftotfm on Sat Dec 31 18:06:18 2016
+%%AutoEnc_arhfdyx6yjijj2nyyirhoswr2g
+% Encoding created by otftotfm on Wed Mar 28 19:25:25 2018
 % Command line follows encoding
-/AutoEnc_l6dununypfxtstvzqlohzhqsne [
+/AutoEnc_arhfdyx6yjijj2nyyirhoswr2g [
 %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.sc /j.sc /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /.notdef /dotlessi.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /Uhungarumlaut /Uring
   /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent.sc /dcroat.sc /section
 %A0
   /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
   /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
 %B0
-  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /.notdef /uhungarumlaut.sc /uring.sc
   /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dv3gwv.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_atrkq4.enc
index fce846b443c..35491b999c5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dv3gwv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_atrkq4.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_dv3gwvehw5ow3zomdoue7uw46a
-% Encoding created by otftotfm on Sat Dec 31 18:06:21 2016
+%%AutoEnc_atrkq46e4ea7b6gr32p6d6wbpe
+% Encoding created by otftotfm on Wed Mar 28 19:25:21 2018
 % Command line follows encoding
-/AutoEnc_dv3gwvehw5ow3zomdoue7uw46a [
+/AutoEnc_atrkq46e4ea7b6gr32p6d6wbpe [
 %00
   /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=smcp --feature=tnum
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_auhtqr.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_auhtqr.enc
new file mode 100644
index 00000000000..ed70b6e03db
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_auhtqr.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_auhtqrrsun2sgdw5eyoygubv5g
+% Encoding created by otftotfm on Wed Mar 28 19:25:29 2018
+% Command line follows encoding
+/AutoEnc_auhtqrrsun2sgdw5eyoygubv5g [
+%00
+  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
+  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero /one /two /three /four /five /six /seven
+  /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+  /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+  /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+  /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=smcp --feature=tnum --unicoding=germandbls =:
+% SSsmall --space-factor=1.06635 Cochineal-Italic.otf
+% Cochineal-Italic-tlf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_av27fu.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_av27fu.enc
deleted file mode 100644
index 04243fa4293..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_av27fu.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_av27fuo7rcu6gc3vguqacjckjg
-% Encoding created by otftotfm on Sat Dec 31 18:06:52 2016
-% Command line follows encoding
-/AutoEnc_av27fuo7rcu6gc3vguqacjckjg [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /uni0311 /.notdef /uni0306 /endash /emdash /uni200C
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=kern --feature=liga --feature=lnum --feature=tnum
-% --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-tlf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_k3bwnd.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_avobnl.enc
index ffc9e5e9098..988e9f2923e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_k3bwnd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_avobnl.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_k3bwndupgmfjoqsfr7rfjqtjqa
-% Encoding created by otftotfm on Sat Dec 31 18:05:58 2016
+%%AutoEnc_avobnlxicnmtwub47b62mqsysd
+% Encoding created by otftotfm on Wed Mar 28 19:25:18 2018
 % Command line follows encoding
-/AutoEnc_k3bwndupgmfjoqsfr7rfjqtjqa [
+/AutoEnc_avobnlxicnmtwub47b62mqsysd [
 %00
-  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /i.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
 %80
   /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,12 +54,12 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
 % --feature=lnum --feature=pnum --feature=smcp --unicoding=germandbls =:
 % SSsmall --space-factor=1.06635 Cochineal-BoldItalic.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sqxi2m.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ayubby.enc
index 82a7e461b89..fb55d14c8fa 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sqxi2m.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ayubby.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_sqxi2mil225mja2tuqxr67okhc
-% Encoding created by otftotfm on Sat Dec 31 18:06:11 2016
+%%AutoEnc_ayubbyqyvxmd7caho34ukudcqf
+% Encoding created by otftotfm on Wed Mar 28 19:25:30 2018
 % Command line follows encoding
-/AutoEnc_sqxi2mil225mja2tuqxr67okhc [
+/AutoEnc_ayubbyqyvxmd7caho34ukudcqf [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
 % --feature=kern --feature=liga --feature=lnum --feature=swsh --feature=tnum
 % --include-alternates=*.swash --feature=aalt --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bbsuch.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bbsuch.enc
deleted file mode 100644
index d90b584ecf7..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bbsuch.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_bbsuchijhqlmybug6vm5ngm3ya
-% Encoding created by otftotfm on Sat Dec 31 18:06:44 2016
-% Command line follows encoding
-/AutoEnc_bbsuchijhqlmybug6vm5ngm3ya [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /.notdef /.notdef /uni0306 /endash /emdash /.notdef
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=kern --feature=liga --feature=lnum --feature=pnum
-% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-lf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4b5cze.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bebzcd.enc
index 6fc0877e9e2..fd038a9c6bb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4b5cze.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bebzcd.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_4b5cze3zd36ml6hd5ia2lmccba
-% Encoding created by otftotfm on Sat Dec 31 18:05:42 2016
+%%AutoEnc_bebzcdw5tofjbeemat4lxq42we
+% Encoding created by otftotfm on Wed Mar 28 19:25:04 2018
 % Command line follows encoding
-/AutoEnc_4b5cze3zd36ml6hd5ia2lmccba [
+/AutoEnc_bebzcdw5tofjbeemat4lxq42we [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=swsh
 % --include-alternates=*.swash --feature=aalt --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_j2ekhj.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bhawim.enc
index 6b9fcda6681..50ddd5d47c3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_j2ekhj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bhawim.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_j2ekhjxon7mkbufjzuf5oaztqb
-% Encoding created by otftotfm on Sat Dec 31 18:06:03 2016
+%%AutoEnc_bhawimte6yf2vqtvpcc2c27woa
+% Encoding created by otftotfm on Wed Mar 28 19:25:11 2018
 % Command line follows encoding
-/AutoEnc_j2ekhjxon7mkbufjzuf5oaztqb [
+/AutoEnc_bhawimte6yf2vqtvpcc2c27woa [
 %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 /i.sc /j.sc /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /.notdef /i.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /Uhungarumlaut /Uring
   /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent.sc /dcroat.sc /section
 %A0
   /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
   /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
 %B0
-  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /.notdef /uhungarumlaut.sc /uring.sc
   /ydieresis.sc /zacute.sc /zcaron /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_br6git.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_br6git.enc
deleted file mode 100644
index d8c1d420552..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_br6git.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_br6gitlvvekrtn7gwjarmq5rlb
-% Encoding created by otftotfm on Sat Dec 31 18:06:44 2016
-% Command line follows encoding
-/AutoEnc_br6gitlvvekrtn7gwjarmq5rlb [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /.notdef /.notdef /uni0306 /endash /emdash /.notdef
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q.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
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=dlig --feature=kern --feature=liga --feature=lnum
-% --feature=pnum --feature=swsh --include-alternates=*.swash --feature=aalt
-% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-lf-swash-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_e3q7lx.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_c4bkpi.enc
index aa76f54dd6c..195224b10c5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_e3q7lx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_c4bkpi.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_e3q7lxlbadky3jyzxcqbkjmc3e
-% Encoding created by otftotfm on Sat Dec 31 18:05:41 2016
+%%AutoEnc_c4bkpi3savowvqs5e673sjzvka
+% Encoding created by otftotfm on Wed Mar 28 19:25:04 2018
 % Command line follows encoding
-/AutoEnc_e3q7lxlbadky3jyzxcqbkjmc3e [
+/AutoEnc_c4bkpi3savowvqs5e673sjzvka [
 %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.sc /j.sc /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /.notdef /dotlessi.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /Uhungarumlaut /Uring
   /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent.sc /dcroat.sc /section
 %A0
   /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
   /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
 %B0
-  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /.notdef /uhungarumlaut.sc /uring.sc
   /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent /ij.sc /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_no5pci.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_c6u7ho.enc
index ff279f7a389..57d7568e452 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_no5pci.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_c6u7ho.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_no5pciddwsdn5wivzenj6imoyc
-% Encoding created by otftotfm on Sat Dec 31 18:06:56 2016
+%%AutoEnc_c6u7hoqrcpsp2nner7qhc3kdhf
+% Encoding created by otftotfm on Wed Mar 28 19:25:52 2018
 % Command line follows encoding
-/AutoEnc_no5pciddwsdn5wivzenj6imoyc [
+/AutoEnc_c6u7hoqrcpsp2nner7qhc3kdhf [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /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
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cipscc.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cipscc.enc
new file mode 100644
index 00000000000..50f17f89cb3
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cipscc.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_cipscccaapzswuamqjr3qamnhd
+% Encoding created by otftotfm on Wed Mar 28 19:25:37 2018
+% Command line follows encoding
+/AutoEnc_cipscccaapzswuamqjr3qamnhd [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
+%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.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.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 /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=dlig --feature=kern
+% --feature=liga --feature=onum --feature=swsh --feature=tnum
+% --include-alternates=*.swash --feature=aalt --space-factor=1.06635
+% Cochineal-Roman.otf Cochineal-Roman-tosf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l4bzf3.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dgjfkn.enc
index a004e7af06c..8a64cf9fa36 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l4bzf3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dgjfkn.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_l4bzf3n4slutjqtn4zlcxqv4nf
-% Encoding created by otftotfm on Sat Dec 31 18:06:21 2016
+%%AutoEnc_dgjfknhqalenbw2pipatvxjn5b
+% Encoding created by otftotfm on Wed Mar 28 19:25:22 2018
 % Command line follows encoding
-/AutoEnc_l4bzf3n4slutjqtn4zlcxqv4nf [
+/AutoEnc_dgjfknhqalenbw2pipatvxjn5b [
 %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.sc /j.sc /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /.notdef /dotlessi.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /Uhungarumlaut /Uring
   /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent.sc /dcroat.sc /section
 %A0
   /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
   /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
 %B0
-  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /.notdef /uhungarumlaut.sc /uring.sc
   /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dpslmo.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dpslmo.enc
new file mode 100644
index 00000000000..64cb131a58b
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dpslmo.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_dpslmojvuql3ou6lxoqbln6rka
+% Encoding created by otftotfm on Wed Mar 28 19:25:34 2018
+% Command line follows encoding
+/AutoEnc_dpslmojvuql3ou6lxoqbln6rka [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
+%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
+  /uni2080 /uni2081 /uni2082 /uni2083 /uni2084 /uni2085 /uni2086 /uni2087
+  /uni2088 /uni2089 /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --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_rgk3s5.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dx7yeo.enc
index 9f39115d482..4894b1aaf71 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rgk3s5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dx7yeo.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_rgk3s5fmsueedasw52lo57yitb
-% Encoding created by otftotfm on Sat Dec 31 18:06:30 2016
+%%AutoEnc_dx7yeogkra4k6jp5ssfpzhbdph
+% Encoding created by otftotfm on Wed Mar 28 19:25:47 2018
 % Command line follows encoding
-/AutoEnc_rgk3s5fmsueedasw52lo57yitb [
+/AutoEnc_dx7yeogkra4k6jp5ssfpzhbdph [
 %00
-  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute.sc /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
 %80
   /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,12 +54,12 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
 % --feature=lnum --feature=pnum --feature=smcp --unicoding=germandbls =:
 % SSsmall --space-factor=1.06635 Cochineal-Roman.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ecpkno.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dzpwzr.enc
index 72c3ca29926..5db6691e350 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ecpkno.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dzpwzr.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ecpkno3w2tlepxgsqbxgchltre
-% Encoding created by otftotfm on Sat Dec 31 18:06:56 2016
+%%AutoEnc_dzpwzrhpt3n5kirp2tgnu2ilgb
+% Encoding created by otftotfm on Wed Mar 28 19:25:52 2018
 % Command line follows encoding
-/AutoEnc_ecpkno3w2tlepxgsqbxgchltre [
+/AutoEnc_dzpwzrhpt3n5kirp2tgnu2ilgb [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /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
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_e3g2vu.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_e3g2vu.enc
new file mode 100644
index 00000000000..50bf01d30d0
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_e3g2vu.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_e3g2vupqmfkvq73zoliw5gbd2g
+% Encoding created by otftotfm on Wed Mar 28 19:25:05 2018
+% Command line follows encoding
+/AutoEnc_e3g2vupqmfkvq73zoliw5gbd2g [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%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.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+  /eight.prop /nine.prop /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.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 /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=dlig --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=swsh
+% --include-alternates=*.swash --feature=aalt --space-factor=1.06635
+% Cochineal-Bold.otf Cochineal-Bold-lf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3zwcy7.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eecs2o.enc
index 621e9d16622..4d1e1b574b1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3zwcy7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eecs2o.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_3zwcy7mhyx7t3a2fgwjxf23hne
-% Encoding created by otftotfm on Sat Dec 31 18:05:49 2016
+%%AutoEnc_eecs2oia4uua7j7dwgorxlswef
+% Encoding created by otftotfm on Wed Mar 28 19:25:21 2018
 % Command line follows encoding
-/AutoEnc_3zwcy7mhyx7t3a2fgwjxf23hne [
+/AutoEnc_eecs2oia4uua7j7dwgorxlswef [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /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
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,12 +54,12 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=onum --feature=tnum --space-factor=1.06635 Cochineal-Bold.otf
-% Cochineal-Bold-tosf-ot1'
+% --feature=onum --feature=tnum --space-factor=1.06635 Cochineal-Italic.otf
+% Cochineal-Italic-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t2fib6.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ehnbpv.enc
index 617ce47a2c2..a40ecd0ffb2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t2fib6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ehnbpv.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_t2fib6k5cg7nvmjhmmpatxengf
-% Encoding created by otftotfm on Sat Dec 31 18:05:49 2016
+%%AutoEnc_ehnbpvkehyccjs7svp6ot3oine
+% Encoding created by otftotfm on Wed Mar 28 19:24:51 2018
 % Command line follows encoding
-/AutoEnc_t2fib6k5cg7nvmjhmmpatxengf [
+/AutoEnc_ehnbpvkehyccjs7svp6ot3oine [
 %00
   /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=smcp --feature=tnum
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ejj76u.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ejj76u.enc
deleted file mode 100644
index 9704dabe004..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ejj76u.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_ejj76ugujlzteezxrz7o646zib
-% Encoding created by otftotfm on Sat Dec 31 18:06:47 2016
-% Command line follows encoding
-/AutoEnc_ejj76ugujlzteezxrz7o646zib [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /.notdef /.notdef /uni0306 /endash /emdash /.notdef
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /.notdef /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=kern --feature=liga --feature=onum --feature=tnum
-% --space-factor=1.06635 Cochineal-BoldItalic.otf
-% Cochineal-BoldItalic-tosf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ep5tp7.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ep5tp7.enc
deleted file mode 100644
index f807b9c5aa8..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ep5tp7.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_ep5tp773b5jpkwgsfzdipoal4b
-% Encoding created by otftotfm on Sat Dec 31 18:06:47 2016
-% Command line follows encoding
-/AutoEnc_ep5tp773b5jpkwgsfzdipoal4b [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /.notdef /.notdef /uni0306 /endash /emdash /.notdef
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /.notdef /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=kern --feature=liga --feature=lnum --feature=pnum
-% --space-factor=1.06635 Cochineal-BoldItalic.otf
-% Cochineal-BoldItalic-lf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fuig2f.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ernfwg.enc
index 95a29c8481c..36a26b06bf1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fuig2f.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ernfwg.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_fuig2f6uhg4ttwteye555gp2oe
-% Encoding created by otftotfm on Sat Dec 31 18:06:40 2016
+%%AutoEnc_ernfwgkcnnskrvyw626vfei46g
+% Encoding created by otftotfm on Wed Mar 28 19:25:37 2018
 % Command line follows encoding
-/AutoEnc_fuig2f6uhg4ttwteye555gp2oe [
+/AutoEnc_ernfwgkcnnskrvyw626vfei46g [
 %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 /uni200C
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=dlig --feature=kern --feature=liga --feature=onum --feature=swsh
 % --feature=tnum --include-alternates=*.swash --feature=aalt
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qnto7n.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eyqo5t.enc
index 518aa6888af..04649efd41b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qnto7n.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eyqo5t.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_qnto7nkx5eyqys7sth4tp3usyh
-% Encoding created by otftotfm on Sat Dec 31 18:06:57 2016
+%%AutoEnc_eyqo5tnzgt7lfehgwtz6my3ayd
+% Encoding created by otftotfm on Wed Mar 28 19:25:53 2018
 % Command line follows encoding
-/AutoEnc_qnto7nkx5eyqys7sth4tp3usyh [
+/AutoEnc_eyqo5tnzgt7lfehgwtz6my3ayd [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /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
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6lkrjm.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eyy6oe.enc
index 7825a2acc6c..cfaf99989a6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6lkrjm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_eyy6oe.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_6lkrjmdn5zysozhdjwr7hfheka
-% Encoding created by otftotfm on Sat Dec 31 18:06:02 2016
+%%AutoEnc_eyy6oetl7xvgw5z27q5rks4a5a
+% Encoding created by otftotfm on Wed Mar 28 19:25:10 2018
 % Command line follows encoding
-/AutoEnc_6lkrjmdn5zysozhdjwr7hfheka [
+/AutoEnc_eyy6oetl7xvgw5z27q5rks4a5a [
 %00
   /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /i.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=pnum --feature=smcp
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_q5rvqt.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_f6gyh3.enc
index d607eb379e8..45953987f46 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_q5rvqt.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_f6gyh3.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_q5rvqtqmmsyxfpjzbvnwxdp4gc
-% Encoding created by otftotfm on Sat Dec 31 18:05:44 2016
+%%AutoEnc_f6gyh3en4btxeafjq2sk35t2de
+% Encoding created by otftotfm on Wed Mar 28 19:24:57 2018
 % Command line follows encoding
-/AutoEnc_q5rvqtqmmsyxfpjzbvnwxdp4gc [
+/AutoEnc_f6gyh3en4btxeafjq2sk35t2de [
 %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
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --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_2igcus.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_faomqb.enc
index 1686d2288be..72a94b46ba9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2igcus.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_faomqb.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_2igcusqtvyr7eqhzuvss3fn7tg
-% Encoding created by otftotfm on Sat Dec 31 18:06:30 2016
+%%AutoEnc_faomqbtlu355bhkduaafwwngfb
+% Encoding created by otftotfm on Wed Mar 28 19:25:46 2018
 % Command line follows encoding
-/AutoEnc_2igcusqtvyr7eqhzuvss3fn7tg [
+/AutoEnc_faomqbtlu355bhkduaafwwngfb [
 %00
   /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02.sc /.notdef /uni200C /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+  /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute.sc /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --feature=smcp
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ajitlz.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fhk6mz.enc
index 239c50217af..8dbc911fbaf 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ajitlz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fhk6mz.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ajitlz75dmddi5zidm6vz32qef
-% Encoding created by otftotfm on Sat Dec 31 18:06:33 2016
+%%AutoEnc_fhk6mzqd6yu4to5ncysyg2z7re
+% Encoding created by otftotfm on Wed Mar 28 19:25:38 2018
 % Command line follows encoding
-/AutoEnc_ajitlz75dmddi5zidm6vz32qef [
+/AutoEnc_fhk6mzqd6yu4to5ncysyg2z7re [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /uni200C /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=pnum --space-factor=1.06635
 % Cochineal-Roman.otf Cochineal-Roman-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zetixv.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fiecpa.enc
index 869c3fb925b..75aeca721f1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zetixv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fiecpa.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_zetixvfltpl2veewynyuordzxe
-% Encoding created by otftotfm on Sat Dec 31 18:05:47 2016
+%%AutoEnc_fiecpaq43umhqpg7ygx2qunm5h
+% Encoding created by otftotfm on Wed Mar 28 19:24:56 2018
 % Command line follows encoding
-/AutoEnc_zetixvfltpl2veewynyuordzxe [
+/AutoEnc_fiecpaq43umhqpg7ygx2qunm5h [
 %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
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=dlig --feature=kern --feature=liga --feature=onum --feature=pnum
 % --feature=swsh --include-alternates=*.swash --feature=aalt
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lnloax.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fuez2l.enc
index a85e2382fb8..b9e70de5806 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lnloax.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_fuez2l.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_lnloax577ipanupjs5u2ywwt7a
-% Encoding created by otftotfm on Sat Dec 31 18:06:32 2016
+%%AutoEnc_fuez2loyeq3otooi5bad5do6la
+% Encoding created by otftotfm on Wed Mar 28 19:25:48 2018
 % Command line follows encoding
-/AutoEnc_lnloax577ipanupjs5u2ywwt7a [
+/AutoEnc_fuez2loyeq3otooi5bad5do6la [
 %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 /uni200C
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=dlig --feature=kern --feature=liga --feature=lnum --feature=pnum
 % --feature=swsh --include-alternates=*.swash --feature=aalt
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_apxmko.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gbdy7g.enc
index b973cc790ec..1a7466af9e2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_apxmko.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gbdy7g.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_apxmkorey7oxg4iswkfjbsza4g
-% Encoding created by otftotfm on Sat Dec 31 18:06:12 2016
+%%AutoEnc_gbdy7gnwiokzptgmeoou4ywn3a
+% Encoding created by otftotfm on Wed Mar 28 19:25:31 2018
 % Command line follows encoding
-/AutoEnc_apxmkorey7oxg4iswkfjbsza4g [
+/AutoEnc_gbdy7gnwiokzptgmeoou4ywn3a [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --space-factor=1.06635
 % Cochineal-Italic.otf Cochineal-Italic-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ah6e6o.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gcgtqo.enc
index 832a5204ec0..15c0be7e00a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ah6e6o.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gcgtqo.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ah6e6o2u4kcg6bnfmtrn35aacb
-% Encoding created by otftotfm on Sat Dec 31 18:06:26 2016
+%%AutoEnc_gcgtqoqyz6fclnkw6f4brrkasb
+% Encoding created by otftotfm on Wed Mar 28 19:25:44 2018
 % Command line follows encoding
-/AutoEnc_ah6e6o2u4kcg6bnfmtrn35aacb [
+/AutoEnc_gcgtqoqyz6fclnkw6f4brrkasb [
 %00
-  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute.sc /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
 %80
   /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,12 +54,12 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
 % --feature=lnum --feature=smcp --feature=tnum --unicoding=germandbls =:
 % SSsmall --space-factor=1.06635 Cochineal-Roman.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gff4qk.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gff4qk.enc
deleted file mode 100644
index f84f68a4ac3..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gff4qk.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_gff4qkpv26su4hzxqnmd5jp4bg
-% Encoding created by otftotfm on Sat Dec 31 18:06:43 2016
-% Command line follows encoding
-/AutoEnc_gff4qkpv26su4hzxqnmd5jp4bg [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /.notdef /.notdef /uni0306 /endash /emdash /.notdef
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=kern --feature=liga --feature=lnum --feature=tnum
-% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-tlf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_obm4y4.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gpocnf.enc
index 0a340e17144..257b1fe7314 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_obm4y4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gpocnf.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_obm4y4566yama6mc2jucg6f24h
-% Encoding created by otftotfm on Sat Dec 31 18:06:27 2016
+%%AutoEnc_gpocnfjk3xfuihw5b67t2ntt7e
+% Encoding created by otftotfm on Wed Mar 28 19:25:44 2018
 % Command line follows encoding
-/AutoEnc_obm4y4566yama6mc2jucg6f24h [
+/AutoEnc_gpocnfjk3xfuihw5b67t2ntt7e [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /uni200C /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
 % --feature=kern --feature=liga --feature=lnum --feature=swsh --feature=tnum
 % --include-alternates=*.swash --feature=aalt --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4csisi.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gujmrc.enc
index 03fb4b03dfc..9b3b4826bbe 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_4csisi.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_gujmrc.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_4csisidkuw7jk227kpk2dfjwtc
-% Encoding created by otftotfm on Sat Dec 31 18:05:53 2016
+%%AutoEnc_gujmrcyzp7e3vvbkcuesnl4gxb
+% Encoding created by otftotfm on Wed Mar 28 19:25:20 2018
 % Command line follows encoding
-/AutoEnc_4csisidkuw7jk227kpk2dfjwtc [
+/AutoEnc_gujmrcyzp7e3vvbkcuesnl4gxb [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /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
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,12 +54,12 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
 % --feature=sinf --ligkern=* {KL} * --space-factor=1.06635
-% Cochineal-Bold.otf Cochineal-Bold-inf-ot1'
+% Cochineal-Italic.otf Cochineal-Italic-inf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jykc3v.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hd573s.enc
index 2690708a581..331798c4d23 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jykc3v.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hd573s.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_jykc3vvnwsjfsh5fckn6n2b35c
-% Encoding created by otftotfm on Sat Dec 31 18:05:39 2016
+%%AutoEnc_hd573sojpnzhshqzj7xo6j25ja
+% Encoding created by otftotfm on Wed Mar 28 19:25:31 2018
 % Command line follows encoding
-/AutoEnc_jykc3vvnwsjfsh5fckn6n2b35c [
+/AutoEnc_hd573sojpnzhshqzj7xo6j25ja [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /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
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,12 +54,12 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=lnum --feature=pnum --space-factor=1.06635 Cochineal-Bold.otf
-% Cochineal-Bold-lf-ot1'
+% --feature=lnum --feature=pnum --space-factor=1.06635 Cochineal-Italic.otf
+% Cochineal-Italic-lf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_he5a7w.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_he5a7w.enc
deleted file mode 100644
index cc2301b347e..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_he5a7w.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_he5a7wezrmquhtb2a6bqmzwm4g
-% Encoding created by otftotfm on Sat Dec 31 18:06:42 2016
-% Command line follows encoding
-/AutoEnc_he5a7wezrmquhtb2a6bqmzwm4g [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /.notdef /.notdef /uni0306 /endash /emdash /.notdef
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /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
-  /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
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=kern --feature=liga --feature=onum --feature=pnum
-% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-osf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3cbpzp.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hskcu3.enc
index f70270e2a19..d2dcac1e7fb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3cbpzp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hskcu3.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_3cbpzpkjwvzgfaamszcf4q4vzc
-% Encoding created by otftotfm on Sat Dec 31 18:06:33 2016
+%%AutoEnc_hskcu3xl333t3y34htyugj4dyg
+% Encoding created by otftotfm on Wed Mar 28 19:25:41 2018
 % Command line follows encoding
-/AutoEnc_3cbpzpkjwvzgfaamszcf4q4vzc [
+/AutoEnc_hskcu3xl333t3y34htyugj4dyg [
 %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 /uni200C
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --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_i4ioss.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_i4ioss.enc
new file mode 100644
index 00000000000..3e5cb491d03
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_i4ioss.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_i4iossdmew24jyu7dmrvxalh3a
+% Encoding created by otftotfm on Wed Mar 28 19:25:35 2018
+% Command line follows encoding
+/AutoEnc_i4iossdmew24jyu7dmrvxalh3a [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
+%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.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=tnum --space-factor=1.06635 Cochineal-Roman.otf
+% Cochineal-Roman-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jxzuzf.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_iatrlr.enc
index 27bee09b5bb..af71b001575 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jxzuzf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_iatrlr.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_jxzuzfppjzmye3y3ie4ead2ygb
-% Encoding created by otftotfm on Sat Dec 31 18:06:08 2016
+%%AutoEnc_iatrlrrvj2a7g6mmbulciuxg7g
+% Encoding created by otftotfm on Wed Mar 28 19:25:27 2018
 % Command line follows encoding
-/AutoEnc_jxzuzfppjzmye3y3ie4ead2ygb [
+/AutoEnc_iatrlrrvj2a7g6mmbulciuxg7g [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dnom
 % --feature=kern --feature=liga --ligkern=* {KL} * --space-factor=1.06635
 % Cochineal-Italic.otf Cochineal-Italic-dnom-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ikqf75.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ikqf75.enc
deleted file mode 100644
index 58d59765032..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ikqf75.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_ikqf75dokqxybavgfbceon7ftg
-% Encoding created by otftotfm on Sat Dec 31 18:06:44 2016
-% Command line follows encoding
-/AutoEnc_ikqf75dokqxybavgfbceon7ftg [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /.notdef /.notdef /uni0306 /endash /emdash /.notdef
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=kern --feature=liga --feature=onum --feature=tnum
-% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-tosf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7tfxxe.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_irjahv.enc
index f40f0ad5daf..898047d3d98 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7tfxxe.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_irjahv.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_7tfxxexjsky7qvienwcjzrgprd
-% Encoding created by otftotfm on Sat Dec 31 18:05:46 2016
+%%AutoEnc_irjahvsqtr56xb5ljosnqymrfb
+% Encoding created by otftotfm on Wed Mar 28 19:24:55 2018
 % Command line follows encoding
-/AutoEnc_7tfxxexjsky7qvienwcjzrgprd [
+/AutoEnc_irjahvsqtr56xb5ljosnqymrfb [
 %00
-  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
 %80
   /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,12 +54,12 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
 % --feature=onum --feature=pnum --feature=smcp --unicoding=germandbls =:
 % SSsmall --space-factor=1.06635 Cochineal-Bold.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_axmhrg.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_irol7d.enc
index dde5df31682..8584b6dd135 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_axmhrg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_irol7d.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_axmhrgqvmfydox4fo3wti6af3g
-% Encoding created by otftotfm on Sat Dec 31 18:06:54 2016
+%%AutoEnc_irol7dr62ntqnatjfivwjkpdof
+% Encoding created by otftotfm on Wed Mar 28 19:25:51 2018
 % Command line follows encoding
-/AutoEnc_axmhrgqvmfydox4fo3wti6af3g [
+/AutoEnc_irol7dr62ntqnatjfivwjkpdof [
 %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
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam.up /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft.up /parenright.up /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown.up /questiondown.up /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uy5zmp.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_isal6u.enc
index 2e004e17ff2..fa81799923d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uy5zmp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_isal6u.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_uy5zmpnwvje7efyesevvsxsaxc
-% Encoding created by otftotfm on Sat Dec 31 18:05:42 2016
+%%AutoEnc_isal6ugo5yoko6jknukdppi4lg
+% Encoding created by otftotfm on Wed Mar 28 19:25:33 2018
 % Command line follows encoding
-/AutoEnc_uy5zmpnwvje7efyesevvsxsaxc [
+/AutoEnc_isal6ugo5yoko6jknukdppi4lg [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /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
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=dlig --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --feature=swsh
 % --include-alternates=*.swash --feature=aalt --space-factor=1.06635
-% Cochineal-Bold.otf Cochineal-Bold-lf-swash-ot1'
+% Cochineal-Italic.otf Cochineal-Italic-lf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_n3wsi3.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ixgauz.enc
index 04ba98357eb..295046f0621 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_n3wsi3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ixgauz.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_n3wsi3ha34kmooelmuck3qs3pf
-% Encoding created by otftotfm on Sat Dec 31 18:06:11 2016
+%%AutoEnc_ixgauzjoc5rxzvxhp5y75vym6e
+% Encoding created by otftotfm on Wed Mar 28 19:25:29 2018
 % Command line follows encoding
-/AutoEnc_n3wsi3ha34kmooelmuck3qs3pf [
+/AutoEnc_ixgauzjoc5rxzvxhp5y75vym6e [
 %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.sc /j.sc /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /.notdef /dotlessi.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /Uhungarumlaut /Uring
   /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent.sc /dcroat.sc /section
 %A0
   /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
   /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
 %B0
-  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /.notdef /uhungarumlaut.sc /uring.sc
   /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_j5n6tq.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_j5n6tq.enc
new file mode 100644
index 00000000000..42c23c28682
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_j5n6tq.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_j5n6tqfmfcjogmntrdb6k7zwrc
+% Encoding created by otftotfm on Wed Mar 28 19:24:58 2018
+% Command line follows encoding
+/AutoEnc_j5n6tqfmfcjogmntrdb6k7zwrc [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%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 /fraction
+%30
+  /zero.denom /one.denom /two.denom /three.denom /four.denom /five.denom /six.denom /seven.denom
+  /eight.denom /nine.denom /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=dnom --feature=kern
+% --feature=liga --ligkern=* {KL} * --space-factor=1.06635
+% Cochineal-Bold.otf Cochineal-Bold-dnom-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3rhvnk.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_j7segj.enc
index df816b735ea..8c0240d038d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3rhvnk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_j7segj.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_3rhvnkbmxuyzuc6qu3wcoygkvh
-% Encoding created by otftotfm on Sat Dec 31 18:06:38 2016
+%%AutoEnc_j7segjn7gjh4bgkgusrq3evpge
+% Encoding created by otftotfm on Wed Mar 28 19:25:36 2018
 % Command line follows encoding
-/AutoEnc_3rhvnkbmxuyzuc6qu3wcoygkvh [
+/AutoEnc_j7segjn7gjh4bgkgusrq3evpge [
 %00
-  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute.sc /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
 %80
   /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,12 +54,12 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
 % --feature=onum --feature=smcp --feature=tnum --unicoding=germandbls =:
 % SSsmall --space-factor=1.06635 Cochineal-Roman.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jax2k7.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jax2k7.enc
deleted file mode 100644
index 73deb1546a1..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jax2k7.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_jax2k7hvjzvaguvh6vlxxkdagd
-% Encoding created by otftotfm on Sat Dec 31 18:06:46 2016
-% Command line follows encoding
-/AutoEnc_jax2k7hvjzvaguvh6vlxxkdagd [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /.notdef /.notdef /uni0306 /endash /emdash /.notdef
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q.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
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /.notdef /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=dlig --feature=kern --feature=liga --feature=lnum
-% --feature=swsh --feature=tnum --include-alternates=*.swash --feature=aalt
-% --space-factor=1.06635 Cochineal-BoldItalic.otf
-% Cochineal-BoldItalic-tlf-swash-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jdlm2x.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jdlm2x.enc
deleted file mode 100644
index 9847b38e850..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jdlm2x.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_jdlm2xfychow5bfh2fsvpfkqoe
-% Encoding created by otftotfm on Sat Dec 31 18:06:51 2016
-% Command line follows encoding
-/AutoEnc_jdlm2xfychow5bfh2fsvpfkqoe [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /uni0311 /.notdef /uni0306 /endash /emdash /uni200C
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft.superior /parenright.superior /asterisk /plus /comma /hyphen /period /slash
-%30
-  /uni2070 /uni00B9 /uni00B2 /uni00B3 /uni2074 /uni2075 /uni2076 /uni2077
-  /uni2078 /uni2079 /colon /semicolon /less /equal /greater /question
-%40
-  /at /A.superior /B.superior /C.superior /D.superior /E.superior /F.superior /G.superior
-  /H.superior /I.superior /J.superior /K.superior /L.superior /M.superior /N.superior /O.superior
-%50
-  /P.superior /Q.superior /R.superior /S.superior /T.superior /U.superior /V.superior /W.superior
-  /X.superior /Y.superior /Z.superior /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /a.superior /b.superior /c.superior /d.superior /e.superior /f.superior /g.superior
-  /h.superior /i.superior /j.superior /k.superior /l.superior /m.superior /n.superior /o.superior
-%70
-  /p.superior /q.superior /r.superior /s.superior /t.superior /u.superior /v.superior /w.superior
-  /x.superior /y.superior /z.superior /braceleft /bar /braceright /asciitilde /hyphen
-%80
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=kern --feature=liga --feature=sups --ligkern=* {KL}
-% * --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-sup-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qgajns.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jfgxgm.enc
index d98ff9d7270..37b11657ef7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qgajns.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jfgxgm.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_qgajnskmhkgdcvpsc42m7scwte
-% Encoding created by otftotfm on Sat Dec 31 18:06:35 2016
+%%AutoEnc_jfgxgm56cq6ww72o3ladlxjwwa
+% Encoding created by otftotfm on Wed Mar 28 19:25:40 2018
 % Command line follows encoding
-/AutoEnc_qgajnskmhkgdcvpsc42m7scwte [
+/AutoEnc_jfgxgm56cq6ww72o3ladlxjwwa [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /uni200C /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=swsh
 % --include-alternates=*.swash --feature=aalt --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_k5ugti.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jwtej4.enc
index 4e6a6d6f01a..24f0bc3ef9e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_k5ugti.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jwtej4.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_k5ugtis3lu5gl3k2hyjhtvp56h
-% Encoding created by otftotfm on Sat Dec 31 18:05:38 2016
+%%AutoEnc_jwtej46ikg63o2bjthb2ofxtxe
+% Encoding created by otftotfm on Wed Mar 28 19:25:01 2018
 % Command line follows encoding
-/AutoEnc_k5ugtis3lu5gl3k2hyjhtvp56h [
+/AutoEnc_jwtej46ikg63o2bjthb2ofxtxe [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
 % --feature=kern --feature=liga --feature=lnum --feature=swsh --feature=tnum
 % --include-alternates=*.swash --feature=aalt --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ykcvhy.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_k3hebr.enc
index 4b87083f168..e4cdd146f10 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ykcvhy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_k3hebr.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ykcvhy4y3vowqgbw3kn47gb4ld
-% Encoding created by otftotfm on Sat Dec 31 18:06:26 2016
+%%AutoEnc_k3hebrtvx4pjtlknlwwhfg255f
+% Encoding created by otftotfm on Wed Mar 28 19:25:43 2018
 % Command line follows encoding
-/AutoEnc_ykcvhy4y3vowqgbw3kn47gb4ld [
+/AutoEnc_k3hebrtvx4pjtlknlwwhfg255f [
 %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 /uni200C
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=tnum
 % --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_say5ae.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_k4nkpy.enc
index 62f32d37607..1f487550850 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_say5ae.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_k4nkpy.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_say5aeaglsvs34krytngjo6rta
-% Encoding created by otftotfm on Sat Dec 31 18:06:58 2016
+%%AutoEnc_k4nkpypmjzxgvtblbkuytt63oh
+% Encoding created by otftotfm on Wed Mar 28 19:25:54 2018
 % Command line follows encoding
-/AutoEnc_say5aeaglsvs34krytngjo6rta [
+/AutoEnc_k4nkpypmjzxgvtblbkuytt63oh [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -35,11 +35,11 @@
   /lslash /.notdef /.notdef /quotedblleft /quotedblright /bullet /endash /emdash
   /.notdef /trademark /scaron /guilsinglright /.notdef /zcaron /asciitilde /Ydieresis
 %A0
-  /uni00A0 /exclamdown.up /cent /sterling /currency /yen /brokenbar /section
+  /.notdef /exclamdown.up /cent /sterling /currency /yen /brokenbar /section
   /.notdef /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /.notdef
 %B0
-  /degree /plusminus /uni00B2 /uni00B3 /.notdef /mu /paragraph /periodcentered
-  /.notdef /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.up
+  /degree /plusminus /.notdef /.notdef /.notdef /mu /paragraph /periodcentered
+  /.notdef /.notdef /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.up
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /.notdef /Ccedilla
   /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kbcokb.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kbcokb.enc
deleted file mode 100644
index a1a6c31c34e..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kbcokb.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_kbcokb2h26e2uiof2g4sfhmxkd
-% Encoding created by otftotfm on Sat Dec 31 18:06:54 2016
-% Command line follows encoding
-/AutoEnc_kbcokb2h26e2uiof2g4sfhmxkd [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /uni0311 /.notdef /uni0306 /endash /emdash /uni200C
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q.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
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=dlig --feature=kern --feature=liga --feature=onum
-% --feature=swsh --feature=tnum --include-alternates=*.swash --feature=aalt
-% --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-tosf-swash-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zmd4fr.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kdbvpj.enc
index ed63a60e151..5398c5702c2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zmd4fr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kdbvpj.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_zmd4frmfz3slc4iuobneoel2ib
-% Encoding created by otftotfm on Sat Dec 31 18:05:39 2016
+%%AutoEnc_kdbvpjkfbhagbkmjybnta65fib
+% Encoding created by otftotfm on Wed Mar 28 19:25:02 2018
 % Command line follows encoding
-/AutoEnc_zmd4frmfz3slc4iuobneoel2ib [
+/AutoEnc_kdbvpjkfbhagbkmjybnta65fib [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --space-factor=1.06635
 % Cochineal-Bold.otf Cochineal-Bold-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kj462m.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kj462m.enc
new file mode 100644
index 00000000000..272bc77db56
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_kj462m.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_kj462mzbm275orhz5jkw4b43kf
+% Encoding created by otftotfm on Wed Mar 28 19:24:50 2018
+% Command line follows encoding
+/AutoEnc_kj462mzbm275orhz5jkw4b43kf [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%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.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
+  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=tnum --space-factor=1.06635 Cochineal-Bold.otf
+% Cochineal-Bold-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_panfjf.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ksvfey.enc
index 51aa44a002a..a724fc80a02 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_panfjf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ksvfey.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_panfjf32g4oneiboczljtt7h7h
-% Encoding created by otftotfm on Sat Dec 31 18:06:39 2016
+%%AutoEnc_ksvfeytniyxjikxj54uvcpjp3a
+% Encoding created by otftotfm on Wed Mar 28 19:25:36 2018
 % Command line follows encoding
-/AutoEnc_panfjf32g4oneiboczljtt7h7h [
+/AutoEnc_ksvfeytniyxjikxj54uvcpjp3a [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /uni200C /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
 % --feature=kern --feature=liga --feature=onum --feature=swsh --feature=tnum
 % --include-alternates=*.swash --feature=aalt --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t24fhx.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l35a4c.enc
index 8bbee92065e..580ad83f5cf 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t24fhx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l35a4c.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_t24fhxfubcz6fj3dilmrmpezlg
-% Encoding created by otftotfm on Sat Dec 31 18:05:35 2016
+%%AutoEnc_l35a4cqz5d6bagoehhtwfmasga
+% Encoding created by otftotfm on Wed Mar 28 19:24:58 2018
 % Command line follows encoding
-/AutoEnc_t24fhxfubcz6fj3dilmrmpezlg [
+/AutoEnc_l35a4cqz5d6bagoehhtwfmasga [
 %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
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /fraction
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=dnom --feature=kern --feature=liga --ligkern=* {KL} *
 % --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-dnom-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lygafn.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l5f66w.enc
index 79fe77a1b85..094d972ef9e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lygafn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_l5f66w.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_lygafnwpsd75rpsvjjh37hbcea
-% Encoding created by otftotfm on Sat Dec 31 18:05:37 2016
+%%AutoEnc_l5f66w6zasibyyrcc7mimjdw4c
+% Encoding created by otftotfm on Wed Mar 28 19:25:00 2018
 % Command line follows encoding
-/AutoEnc_lygafnwpsd75rpsvjjh37hbcea [
+/AutoEnc_l5f66w6zasibyyrcc7mimjdw4c [
 %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.sc /j.sc /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /.notdef /dotlessi.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /Uhungarumlaut /Uring
   /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent.sc /dcroat.sc /section
 %A0
   /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
   /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
 %B0
-  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /.notdef /uhungarumlaut.sc /uring.sc
   /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent /ij.sc /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bwegky.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lbfs4w.enc
index bdc8f2d30f2..6e49cc1c47e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bwegky.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lbfs4w.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_bwegkyzh5aayrwx6txeczip42f
-% Encoding created by otftotfm on Sat Dec 31 18:05:34 2016
+%%AutoEnc_lbfs4waeh3n3wb64wvmynmaede
+% Encoding created by otftotfm on Wed Mar 28 19:25:27 2018
 % Command line follows encoding
-/AutoEnc_bwegkyzh5aayrwx6txeczip42f [
+/AutoEnc_lbfs4waeh3n3wb64wvmynmaede [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /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
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,12 +54,12 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=dnom --feature=kern
 % --feature=liga --ligkern=* {KL} * --space-factor=1.06635
-% Cochineal-Bold.otf Cochineal-Bold-dnom-ot1'
+% Cochineal-Italic.otf Cochineal-Italic-dnom-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xxmc7z.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lhezve.enc
index 85dabfb197a..7568ec44d84 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xxmc7z.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lhezve.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_xxmc7zdgvdkbaoah42taopv7wa
-% Encoding created by otftotfm on Sat Dec 31 18:06:57 2016
+%%AutoEnc_lhezvewx2s7wwsoln7ys6nlvba
+% Encoding created by otftotfm on Wed Mar 28 19:25:53 2018
 % Command line follows encoding
-/AutoEnc_xxmc7zdgvdkbaoah42taopv7wa [
+/AutoEnc_lhezvewx2s7wwsoln7ys6nlvba [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -35,11 +35,11 @@
   /lslash /.notdef /.notdef /quotedblleft /quotedblright /bullet /endash /emdash
   /.notdef /trademark /scaron /guilsinglright /.notdef /zcaron /asciitilde /Ydieresis
 %A0
-  /uni00A0 /exclamdown.up /cent /sterling /currency /yen /brokenbar /section
+  /.notdef /exclamdown.up /cent /sterling /currency /yen /brokenbar /section
   /.notdef /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /.notdef
 %B0
-  /degree /plusminus /uni00B2 /uni00B3 /.notdef /mu /paragraph /periodcentered
-  /.notdef /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.up
+  /degree /plusminus /.notdef /.notdef /.notdef /mu /paragraph /periodcentered
+  /.notdef /.notdef /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.up
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /.notdef /Ccedilla
   /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_abfldu.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lmiqva.enc
index dcd75c4977a..ec82530fa42 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_abfldu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lmiqva.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_abflduupicnaghglrrnvcdywic
-% Encoding created by otftotfm on Sat Dec 31 18:06:10 2016
+%%AutoEnc_lmiqvaclzuykdqmvvs5b32qitd
+% Encoding created by otftotfm on Wed Mar 28 19:25:29 2018
 % Command line follows encoding
-/AutoEnc_abflduupicnaghglrrnvcdywic [
+/AutoEnc_lmiqvaclzuykdqmvvs5b32qitd [
 %00
   /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=smcp --feature=tnum
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_73cr6n.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mlajwi.enc
index ea667f95ca7..56218540602 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_73cr6n.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mlajwi.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_73cr6nfshxsajruidlcooobh4b
-% Encoding created by otftotfm on Sat Dec 31 18:05:59 2016
+%%AutoEnc_mlajwisaovo3plx2ve7fuftjdg
+% Encoding created by otftotfm on Wed Mar 28 19:25:18 2018
 % Command line follows encoding
-/AutoEnc_73cr6nfshxsajruidlcooobh4b [
+/AutoEnc_mlajwisaovo3plx2ve7fuftjdg [
 %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 /i.sc /j.sc /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /.notdef /i.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /Uhungarumlaut /Uring
   /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent.sc /dcroat.sc /section
 %A0
   /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
   /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
 %B0
-  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /.notdef /uhungarumlaut.sc /uring.sc
   /ydieresis.sc /zacute.sc /zcaron /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mnx4cz.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mnx4cz.enc
deleted file mode 100644
index 345521be202..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mnx4cz.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_mnx4cz23bjzfc7hujjw727ivvb
-% Encoding created by otftotfm on Sat Dec 31 18:06:47 2016
-% Command line follows encoding
-/AutoEnc_mnx4cz23bjzfc7hujjw727ivvb [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /.notdef /.notdef /uni0306 /endash /emdash /.notdef
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q.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
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /.notdef /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=dlig --feature=kern --feature=liga --feature=onum
-% --feature=swsh --feature=tnum --include-alternates=*.swash --feature=aalt
-% --space-factor=1.06635 Cochineal-BoldItalic.otf
-% Cochineal-BoldItalic-tosf-swash-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bqgjgh.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mqh25s.enc
index 5d52878c7c5..1ddfda2d80d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bqgjgh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mqh25s.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_bqgjghgsxw3skxcshsizvbogbf
-% Encoding created by otftotfm on Sat Dec 31 18:05:40 2016
+%%AutoEnc_mqh25steqi22gkdynmjpbb3jvd
+% Encoding created by otftotfm on Wed Mar 28 19:25:03 2018
 % Command line follows encoding
-/AutoEnc_bqgjghgsxw3skxcshsizvbogbf [
+/AutoEnc_mqh25steqi22gkdynmjpbb3jvd [
 %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
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=pnum
 % --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-lf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cwrabp.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mxqklu.enc
index 8c88268c6cf..de042f508bb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cwrabp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mxqklu.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_cwrabpkqhaklukzyvif2vbl77e
-% Encoding created by otftotfm on Sat Dec 31 18:06:38 2016
+%%AutoEnc_mxqklui2cz3uivj2jkxxoouk7c
+% Encoding created by otftotfm on Wed Mar 28 19:25:35 2018
 % Command line follows encoding
-/AutoEnc_cwrabpkqhaklukzyvif2vbl77e [
+/AutoEnc_mxqklui2cz3uivj2jkxxoouk7c [
 %00
   /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02.sc /.notdef /uni200C /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+  /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute.sc /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=smcp --feature=tnum
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_n2swpv.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_n2swpv.enc
new file mode 100644
index 00000000000..24cc39e3f72
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_n2swpv.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_n2swpvb2gl2y7dzhwt7clphv2f
+% Encoding created by otftotfm on Wed Mar 28 19:25:42 2018
+% Command line follows encoding
+/AutoEnc_n2swpvb2gl2y7dzhwt7clphv2f [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
+%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 /fraction
+%30
+  /zero.denom /one.denom /two.denom /three.denom /four.denom /five.denom /six.denom /seven.denom
+  /eight.denom /nine.denom /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=dnom --feature=kern
+% --feature=liga --ligkern=* {KL} * --space-factor=1.06635
+% Cochineal-Roman.otf Cochineal-Roman-dnom-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nrtjg6.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nrtjg6.enc
deleted file mode 100644
index d7c257aa32d..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nrtjg6.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_nrtjg6zppjxxokjyvetw5fsz3g
-% Encoding created by otftotfm on Sat Dec 31 18:06:45 2016
-% Command line follows encoding
-/AutoEnc_nrtjg6zppjxxokjyvetw5fsz3g [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /.notdef /.notdef /uni0306 /endash /emdash /.notdef
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /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
-  /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
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /.notdef /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=kern --feature=liga --feature=onum --feature=pnum
-% --space-factor=1.06635 Cochineal-BoldItalic.otf
-% Cochineal-BoldItalic-osf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jc6axh.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nwjjp7.enc
index a4cd44ab3d9..318627e3051 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_jc6axh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nwjjp7.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_jc6axhf7f5vvg2nubzwemti5bd
-% Encoding created by otftotfm on Sat Dec 31 18:05:46 2016
+%%AutoEnc_nwjjp7jze6vwsjvylr6ioz4cnd
+% Encoding created by otftotfm on Wed Mar 28 19:24:55 2018
 % Command line follows encoding
-/AutoEnc_jc6axhf7f5vvg2nubzwemti5bd [
+/AutoEnc_nwjjp7jze6vwsjvylr6ioz4cnd [
 %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.sc /j.sc /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /.notdef /dotlessi.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /Uhungarumlaut /Uring
   /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent.sc /dcroat.sc /section
 %A0
   /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
   /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
 %B0
-  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /.notdef /uhungarumlaut.sc /uring.sc
   /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent /ij.sc /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ghlqiw.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nxl6ld.enc
index c62686ad4e6..4b01fc5429d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ghlqiw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nxl6ld.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ghlqiwqo3vjgcyiw3yv6oyts7g
-% Encoding created by otftotfm on Sat Dec 31 18:05:53 2016
+%%AutoEnc_nxl6ldkbrawbju6gbw2dvb23hd
+% Encoding created by otftotfm on Wed Mar 28 19:24:50 2018
 % Command line follows encoding
-/AutoEnc_ghlqiwqo3vjgcyiw3yv6oyts7g [
+/AutoEnc_nxl6ldkbrawbju6gbw2dvb23hd [
 %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
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --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_pgwq47.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nxryuq.enc
index 25b23c4793a..01aff805e97 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pgwq47.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nxryuq.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_pgwq47xazymmrhnj3lqmobfucb
-% Encoding created by otftotfm on Sat Dec 31 18:05:37 2016
+%%AutoEnc_nxryuqgiyzui7oedcyuyf2se5c
+% Encoding created by otftotfm on Wed Mar 28 19:25:00 2018
 % Command line follows encoding
-/AutoEnc_pgwq47xazymmrhnj3lqmobfucb [
+/AutoEnc_nxryuqgiyzui7oedcyuyf2se5c [
 %00
-  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
 %80
   /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,12 +54,12 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
 % --feature=lnum --feature=smcp --feature=tnum --unicoding=germandbls =:
 % SSsmall --space-factor=1.06635 Cochineal-Bold.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3644xa.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nzj7ho.enc
index 2fccc5eff29..1d222d7626c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3644xa.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_nzj7ho.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_3644xagjmfgwksc4wwpfyga2bg
-% Encoding created by otftotfm on Sat Dec 31 18:06:34 2016
+%%AutoEnc_nzj7ho6yuclyfo2xkkbajiyf3g
+% Encoding created by otftotfm on Wed Mar 28 19:25:39 2018
 % Command line follows encoding
-/AutoEnc_3644xagjmfgwksc4wwpfyga2bg [
+/AutoEnc_nzj7ho6yuclyfo2xkkbajiyf3g [
 %00
   /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02.sc /.notdef /uni200C /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+  /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute.sc /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=pnum --feature=smcp
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_o5hvxo.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_o5hvxo.enc
deleted file mode 100644
index 61308d6af02..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_o5hvxo.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_o5hvxogf35jo3jn5g2uofqn3vd
-% Encoding created by otftotfm on Sat Dec 31 18:06:45 2016
-% Command line follows encoding
-/AutoEnc_o5hvxogf35jo3jn5g2uofqn3vd [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /.notdef /.notdef /uni0306 /endash /emdash /.notdef
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /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
-  /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
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /.notdef /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=dlig --feature=kern --feature=liga --feature=onum
-% --feature=pnum --feature=swsh --include-alternates=*.swash --feature=aalt
-% --space-factor=1.06635 Cochineal-BoldItalic.otf
-% Cochineal-BoldItalic-osf-swash-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_h3bzlq.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ov2w53.enc
index 033bf10429c..703229e73ba 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_h3bzlq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ov2w53.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_h3bzlqqxszoz7luudodtl4vash
-% Encoding created by otftotfm on Sat Dec 31 18:06:55 2016
+%%AutoEnc_ov2w53nf7iaapwryvvvxgmkxmg
+% Encoding created by otftotfm on Wed Mar 28 19:25:52 2018
 % Command line follows encoding
-/AutoEnc_h3bzlqqxszoz7luudodtl4vash [
+/AutoEnc_ov2w53nf7iaapwryvvvxgmkxmg [
 %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
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam.up /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft.up /parenright.up /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown.up /questiondown.up /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_oxg6eq.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_oxg6eq.enc
new file mode 100644
index 00000000000..4b34268a010
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_oxg6eq.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_oxg6eqosr2a4bxceykpqbjm7jf
+% Encoding created by otftotfm on Wed Mar 28 19:24:49 2018
+% Command line follows encoding
+/AutoEnc_oxg6eqosr2a4bxceykpqbjm7jf [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%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
+  /uni2080 /uni2081 /uni2082 /uni2083 /uni2084 /uni2085 /uni2086 /uni2087
+  /uni2088 /uni2089 /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --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_bhg4oq.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_oz3bqn.enc
index d6b2393959c..5a685577966 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bhg4oq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_oz3bqn.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_bhg4oq7l5lgzmgg2epxjedybxe
-% Encoding created by otftotfm on Sat Dec 31 18:06:16 2016
+%%AutoEnc_oz3bqnjk6mmdxduv5yldlglrxe
+% Encoding created by otftotfm on Wed Mar 28 19:25:26 2018
 % Command line follows encoding
-/AutoEnc_bhg4oq7l5lgzmgg2epxjedybxe [
+/AutoEnc_oz3bqnjk6mmdxduv5yldlglrxe [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --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_sdimnz.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pauxlo.enc
index 4edb2c31df0..4784fa6ff85 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sdimnz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pauxlo.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_sdimnzgl2yetfq7vegpaa4viza
-% Encoding created by otftotfm on Sat Dec 31 18:05:40 2016
+%%AutoEnc_pauxlorik63pb4y4uyiln5hklg
+% Encoding created by otftotfm on Wed Mar 28 19:25:03 2018
 % Command line follows encoding
-/AutoEnc_sdimnzgl2yetfq7vegpaa4viza [
+/AutoEnc_pauxlorik63pb4y4uyiln5hklg [
 %00
   /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --feature=smcp
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aa3d23.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ptok33.enc
index 3d4e95f11f1..7fac529bcf7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aa3d23.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ptok33.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_aa3d23ox57dj32ehzmpv7jgesf
-% Encoding created by otftotfm on Sat Dec 31 18:06:20 2016
+%%AutoEnc_ptok33kbty7wonypumq2sjnmkc
+% Encoding created by otftotfm on Wed Mar 28 19:25:20 2018
 % Command line follows encoding
-/AutoEnc_aa3d23ox57dj32ehzmpv7jgesf [
+/AutoEnc_ptok33kbty7wonypumq2sjnmkc [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=tnum --space-factor=1.06635
 % Cochineal-Italic.otf Cochineal-Italic-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6ycxmb.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pyiqqv.enc
index d2e4bd418bb..c26393bb852 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6ycxmb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pyiqqv.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_6ycxmblq3v5evew3632hl5iyyg
-% Encoding created by otftotfm on Sat Dec 31 18:05:45 2016
+%%AutoEnc_pyiqqvr6zjl5tgrvwyf3ahtrlf
+% Encoding created by otftotfm on Wed Mar 28 19:25:24 2018
 % Command line follows encoding
-/AutoEnc_6ycxmblq3v5evew3632hl5iyyg [
+/AutoEnc_pyiqqvr6zjl5tgrvwyf3ahtrlf [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /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
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,12 +54,12 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
-% --feature=onum --feature=pnum --space-factor=1.06635 Cochineal-Bold.otf
-% Cochineal-Bold-osf-ot1'
+% --feature=onum --feature=pnum --space-factor=1.06635 Cochineal-Italic.otf
+% Cochineal-Italic-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_v7zunk.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pzuqaa.enc
index 6d7f2d404ed..00e4aa6ffce 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_v7zunk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_pzuqaa.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_v7zunkxoh5dmox4bzr7qncbgkb
-% Encoding created by otftotfm on Sat Dec 31 18:05:35 2016
+%%AutoEnc_pzuqaavtjtpeu6knd5tj2vapkd
+% Encoding created by otftotfm on Wed Mar 28 19:24:59 2018
 % Command line follows encoding
-/AutoEnc_v7zunkxoh5dmox4bzr7qncbgkb [
+/AutoEnc_pzuqaavtjtpeu6knd5tj2vapkd [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=tnum --space-factor=1.06635
 % Cochineal-Bold.otf Cochineal-Bold-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_z5rngk.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qb7eej.enc
index 3873fb3c86e..5fba1c417b0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_z5rngk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qb7eej.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_z5rngkduohpcalppztgr4q73ag
-% Encoding created by otftotfm on Sat Dec 31 18:06:58 2016
+%%AutoEnc_qb7eej56vddxkh3wah2d3sqj7e
+% Encoding created by otftotfm on Wed Mar 28 19:25:54 2018
 % Command line follows encoding
-/AutoEnc_z5rngkduohpcalppztgr4q73ag [
+/AutoEnc_qb7eej56vddxkh3wah2d3sqj7e [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -35,11 +35,11 @@
   /lslash /.notdef /.notdef /quotedblleft /quotedblright /bullet /endash /emdash
   /.notdef /trademark /scaron /guilsinglright /.notdef /zcaron /asciitilde /Ydieresis
 %A0
-  /uni00A0 /exclamdown.up /cent /sterling /currency /yen /brokenbar /section
+  /.notdef /exclamdown.up /cent /sterling /currency /yen /brokenbar /section
   /.notdef /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /.notdef
 %B0
-  /degree /plusminus /uni00B2 /uni00B3 /.notdef /mu /paragraph /periodcentered
-  /.notdef /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.up
+  /degree /plusminus /.notdef /.notdef /.notdef /mu /paragraph /periodcentered
+  /.notdef /.notdef /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.up
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /.notdef /Ccedilla
   /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dm4e5q.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qv7cwz.enc
index 319ac691a49..193820575e8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_dm4e5q.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qv7cwz.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_dm4e5q6t3slhmuha2izbsoq7lg
-% Encoding created by otftotfm on Sat Dec 31 18:06:32 2016
+%%AutoEnc_qv7cwznncg5q244orfktskrhhd
+% Encoding created by otftotfm on Wed Mar 28 19:25:41 2018
 % Command line follows encoding
-/AutoEnc_dm4e5q6t3slhmuha2izbsoq7lg [
+/AutoEnc_qv7cwznncg5q244orfktskrhhd [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /uni200C /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --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_huga5l.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qxsaxp.enc
index 6740206246f..b580665aa7a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_huga5l.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qxsaxp.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_huga5ltjm762zf4ndhdgvqsrsd
-% Encoding created by otftotfm on Sat Dec 31 18:05:56 2016
+%%AutoEnc_qxsaxpv7mkjqy44m7dytww4x4g
+% Encoding created by otftotfm on Wed Mar 28 19:25:15 2018
 % Command line follows encoding
-/AutoEnc_huga5ltjm762zf4ndhdgvqsrsd [
+/AutoEnc_qxsaxpv7mkjqy44m7dytww4x4g [
 %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 /i.sc /j.sc /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /.notdef /i.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /Uhungarumlaut /Uring
   /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent.sc /dcroat.sc /section
 %A0
   /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
   /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
 %B0
-  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /.notdef /uhungarumlaut.sc /uring.sc
   /ydieresis.sc /zacute.sc /zcaron /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r3xgod.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r3xgod.enc
new file mode 100644
index 00000000000..360d929cbf1
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r3xgod.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_r3xgod5t3c7ttynyndipgkbmcg
+% Encoding created by otftotfm on Wed Mar 28 19:25:41 2018
+% Command line follows encoding
+/AutoEnc_r3xgod5t3c7ttynyndipgkbmcg [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
+%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.superior /parenright.superior /asterisk /plus /comma /hyphen /period /slash
+%30
+  /uni2070 /uni00B9 /uni00B2 /uni00B3 /uni2074 /uni2075 /uni2076 /uni2077
+  /uni2078 /uni2079 /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A.superior /B.superior /C.superior /D.superior /E.superior /F.superior /G.superior
+  /H.superior /I.superior /J.superior /K.superior /L.superior /M.superior /N.superior /O.superior
+%50
+  /P.superior /Q.superior /R.superior /S.superior /T.superior /U.superior /V.superior /W.superior
+  /X.superior /Y.superior /Z.superior /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a.superior /b.superior /c.superior /d.superior /e.superior /f.superior /g.superior
+  /h.superior /i.superior /j.superior /k.superior /l.superior /m.superior /n.superior /o.superior
+%70
+  /p.superior /q.superior /r.superior /s.superior /t.superior /u.superior /v.superior /w.superior
+  /x.superior /y.superior /z.superior /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --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_h42wts.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r4azz6.enc
index bc2878fdb0d..c4f79f88704 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_h42wts.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r4azz6.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_h42wtsz6v3zpbujpoqlfv3ynhg
-% Encoding created by otftotfm on Sat Dec 31 18:06:37 2016
+%%AutoEnc_r4azz6amdntt6lspyzh3otljpe
+% Encoding created by otftotfm on Wed Mar 28 19:25:34 2018
 % Command line follows encoding
-/AutoEnc_h42wtsz6v3zpbujpoqlfv3ynhg [
+/AutoEnc_r4azz6amdntt6lspyzh3otljpe [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /uni200C /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=tnum --space-factor=1.06635
 % Cochineal-Roman.otf Cochineal-Roman-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6nfbiu.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r5kifa.enc
index ef09b0983f5..e0fda80af83 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6nfbiu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r5kifa.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_6nfbiuvrkzafzj6p67bvifwt6f
-% Encoding created by otftotfm on Sat Dec 31 18:06:25 2016
+%%AutoEnc_r5kifak6soks474jf7igfqredd
+% Encoding created by otftotfm on Wed Mar 28 19:25:42 2018
 % Command line follows encoding
-/AutoEnc_6nfbiuvrkzafzj6p67bvifwt6f [
+/AutoEnc_r5kifak6soks474jf7igfqredd [
 %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 /uni200C
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /fraction
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=dnom --feature=kern --feature=liga --ligkern=* {KL} *
 % --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-dnom-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r66ddu.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r66ddu.enc
deleted file mode 100644
index 262c8216ec4..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_r66ddu.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_r66dduxcnu23sc5vvayh2r56qd
-% Encoding created by otftotfm on Sat Dec 31 18:06:16 2016
-% Command line follows encoding
-/AutoEnc_r66dduxcnu23sc5vvayh2r56qd [
-%00
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
-%10
-  /question /bar /quotedblbase /exclamdown /questiondown /.notdef /.notdef /.notdef
-  /arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /endash /.notdef
-%20
-  /.notdef /.notdef /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
-  /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
-%30
-  /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
-  /eight.onum /nine.onum /Q /Q.alt01 /.notdef /minus /.notdef /.notdef
-%40
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%50
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni03A9
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /arrowup /arrowdown
-%60
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%70
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%80
-  /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
-  /bullet /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%90
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /trademark
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
-  /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
-  /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
-%B0
-  /degree /plusminus /.notdef /.notdef /.notdef /mu /paragraph /periodcentered
-  /.notdef /.notdef /ordmasculine /radical /onequarter /onehalf /threequarters /.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 /multiply /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
-  /.notdef /.notdef /.notdef /.notdef /l /.notdef /i /f
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
-% --feature=onum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
-% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --space-factor=1.06635 Cochineal-Italic.otf Cochineal-Italic-lf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mdoead.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_raqkat.enc
index ee37811b46c..18c4df90b7f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_mdoead.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_raqkat.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_mdoeadoadiikwyqbwafmc5rona
-% Encoding created by otftotfm on Sat Dec 31 18:06:39 2016
+%%AutoEnc_raqkati653noovxlrl4iw35cbe
+% Encoding created by otftotfm on Wed Mar 28 19:25:36 2018
 % Command line follows encoding
-/AutoEnc_mdoeadoadiikwyqbwafmc5rona [
+/AutoEnc_raqkati653noovxlrl4iw35cbe [
 %00
   /grave /acute.sc /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
 %10
   /quotedblleft /quotedblright /quotedblbase /guillemotleft.sc /guillemotright.sc /endash /emdash /uni200C
-  /.notdef /dotlessi.sc /j.sc /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /.notdef /dotlessi.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand /quoteright
   /parenleft /parenright /asterisk.sc /plus.sc /comma /hyphen.sc /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /Uhungarumlaut /Uring
   /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent.sc /dcroat.sc /section.sc
 %A0
   /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
   /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
 %B0
-  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /.notdef /uhungarumlaut.sc /uring.sc
   /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling.sc
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_in37z4.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rkk6xv.enc
index 50675e98dc0..ec4dc5cb683 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_in37z4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rkk6xv.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_in37z4mphjv75qb24ej6uuc3vd
-% Encoding created by otftotfm on Sat Dec 31 18:06:36 2016
+%%AutoEnc_rkk6xvvosilug47drzmm3ko7te
+% Encoding created by otftotfm on Wed Mar 28 19:25:40 2018
 % Command line follows encoding
-/AutoEnc_in37z4mphjv75qb24ej6uuc3vd [
+/AutoEnc_rkk6xvvosilug47drzmm3ko7te [
 %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 /uni200C
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=dlig --feature=kern --feature=liga --feature=onum --feature=pnum
 % --feature=swsh --include-alternates=*.swash --feature=aalt
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yska2a.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rqvs5r.enc
index dc8c0d9ed46..01d567e7e70 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yska2a.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rqvs5r.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_yska2anw3mg5u27vsvc4pbv4pd
-% Encoding created by otftotfm on Sat Dec 31 18:06:25 2016
+%%AutoEnc_rqvs5rem3bjendrk6xuapcmrwd
+% Encoding created by otftotfm on Wed Mar 28 19:25:42 2018
 % Command line follows encoding
-/AutoEnc_yska2anw3mg5u27vsvc4pbv4pd [
+/AutoEnc_rqvs5rem3bjendrk6xuapcmrwd [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /uni200C /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=tnum --space-factor=1.06635
 % Cochineal-Roman.otf Cochineal-Roman-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zi6j5g.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rt47uf.enc
index d4f9123303d..55a8482fdfe 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zi6j5g.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rt47uf.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_zi6j5gsslnnfxbdekbbywzvuef
-% Encoding created by otftotfm on Sat Dec 31 18:05:34 2016
+%%AutoEnc_rt47ufp67eamu2lpwwwilkt7bc
+% Encoding created by otftotfm on Wed Mar 28 19:24:58 2018
 % Command line follows encoding
-/AutoEnc_zi6j5gsslnnfxbdekbbywzvuef [
+/AutoEnc_rt47ufp67eamu2lpwwwilkt7bc [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dnom
 % --feature=kern --feature=liga --ligkern=* {KL} * --space-factor=1.06635
 % Cochineal-Bold.otf Cochineal-Bold-dnom-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sciel5.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sciel5.enc
deleted file mode 100644
index b112d5347e3..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sciel5.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_sciel5h7ghskuxne2h2dpxyxvh
-% Encoding created by otftotfm on Sat Dec 31 18:06:47 2016
-% Command line follows encoding
-/AutoEnc_sciel5h7ghskuxne2h2dpxyxvh [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /.notdef /.notdef /uni0306 /endash /emdash /.notdef
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
-  /eight.prop /nine.prop /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q.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
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /.notdef /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=dlig --feature=kern --feature=liga --feature=lnum
-% --feature=pnum --feature=swsh --include-alternates=*.swash --feature=aalt
-% --space-factor=1.06635 Cochineal-BoldItalic.otf
-% Cochineal-BoldItalic-lf-swash-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sk33hx.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sk33hx.enc
new file mode 100644
index 00000000000..5854307ce91
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sk33hx.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_sk33hx2ctkkfhfdub4kls2f6yb
+% Encoding created by otftotfm on Wed Mar 28 19:25:38 2018
+% Command line follows encoding
+/AutoEnc_sk33hx2ctkkfhfdub4kls2f6yb [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
+%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 /four.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 /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=pnum --space-factor=1.06635 Cochineal-Roman.otf
+% Cochineal-Roman-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sm5q6n.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sm5q6n.enc
deleted file mode 100644
index e2e8df6b630..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sm5q6n.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_sm5q6np5iri6hpsa3h6sh37pnc
-% Encoding created by otftotfm on Sat Dec 31 18:06:53 2016
-% Command line follows encoding
-/AutoEnc_sm5q6np5iri6hpsa3h6sh37pnc [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /uni0311 /.notdef /uni0306 /endash /emdash /uni200C
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=kern --feature=liga --feature=onum --feature=tnum
-% --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-tosf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_szq67c.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_szq67c.enc
new file mode 100644
index 00000000000..b698e7d0201
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_szq67c.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_szq67c32xasehfpojpg3rdfsug
+% Encoding created by otftotfm on Wed Mar 28 19:24:54 2018
+% Command line follows encoding
+/AutoEnc_szq67c32xasehfpojpg3rdfsug [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%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 /four.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 /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=pnum --space-factor=1.06635 Cochineal-Bold.otf
+% Cochineal-Bold-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t6bbzl.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t6bbzl.enc
new file mode 100644
index 00000000000..9b943d8fdfe
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t6bbzl.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_t6bbzldy32fumigptwyfjpktpf
+% Encoding created by otftotfm on Wed Mar 28 19:24:56 2018
+% Command line follows encoding
+/AutoEnc_t6bbzldy32fumigptwyfjpktpf [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%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 /four.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 /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=dlig --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=swsh
+% --include-alternates=*.swash --feature=aalt --space-factor=1.06635
+% Cochineal-Bold.otf Cochineal-Bold-osf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t6yhmv.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t6yhmv.enc
deleted file mode 100644
index 981bb835a65..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_t6yhmv.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_t6yhmvknuxjhek5ht3ziuwecla
-% Encoding created by otftotfm on Sat Dec 31 18:06:46 2016
-% Command line follows encoding
-/AutoEnc_t6yhmvknuxjhek5ht3ziuwecla [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /.notdef /.notdef /uni0306 /endash /emdash /.notdef
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q /R /S /T /U /V /W
-  /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /a /b /c /d /e /f /g
-  /h /i /j /k /l /m /n /o
-%70
-  /p /q /r /s /t /u /v /w
-  /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
-%80
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /.notdef /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=kern --feature=liga --feature=lnum --feature=tnum
-% --space-factor=1.06635 Cochineal-BoldItalic.otf
-% Cochineal-BoldItalic-tlf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ixjcas.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tdpwga.enc
index 034022a6425..807e65ce662 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ixjcas.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tdpwga.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ixjcasves6f4excjx4hvvehi3f
-% Encoding created by otftotfm on Sat Dec 31 18:06:27 2016
+%%AutoEnc_tdpwgaxkyu2hfkjmol3tzosnfa
+% Encoding created by otftotfm on Wed Mar 28 19:25:44 2018
 % Command line follows encoding
-/AutoEnc_ixjcasves6f4excjx4hvvehi3f [
+/AutoEnc_tdpwgaxkyu2hfkjmol3tzosnfa [
 %00
   /grave /acute.sc /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
 %10
   /quotedblleft /quotedblright /quotedblbase /guillemotleft.sc /guillemotright.sc /endash /emdash /uni200C
-  /.notdef /dotlessi.sc /j.sc /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /.notdef /dotlessi.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand /quoteright
   /parenleft /parenright /asterisk.sc /plus.sc /comma /hyphen.sc /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /Uhungarumlaut /Uring
   /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent.sc /dcroat.sc /section.sc
 %A0
   /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
   /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
 %B0
-  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /.notdef /uhungarumlaut.sc /uring.sc
   /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling.sc
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6qoxl4.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tehpoo.enc
index dc23f82b393..744579003ab 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_6qoxl4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tehpoo.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_6qoxl4bvelxam3dp5rwblz32ig
-% Encoding created by otftotfm on Sat Dec 31 18:06:35 2016
+%%AutoEnc_tehpoo5xuuvqdkjgcfcyerw5jh
+% Encoding created by otftotfm on Wed Mar 28 19:25:39 2018
 % Command line follows encoding
-/AutoEnc_6qoxl4bvelxam3dp5rwblz32ig [
+/AutoEnc_tehpoo5xuuvqdkjgcfcyerw5jh [
 %00
   /grave /acute.sc /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
 %10
   /quotedblleft /quotedblright /quotedblbase /guillemotleft.sc /guillemotright.sc /endash /emdash /uni200C
-  /.notdef /dotlessi.sc /j.sc /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /.notdef /dotlessi.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand /quoteright
   /parenleft /parenright /asterisk.sc /plus.sc /comma /hyphen.sc /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /Uhungarumlaut /Uring
   /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent.sc /dcroat.sc /section.sc
 %A0
   /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
   /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
 %B0
-  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /.notdef /uhungarumlaut.sc /uring.sc
   /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling.sc
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yqw2ok.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tgg2bw.enc
index c2bf4b9cff7..6b981ab7812 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yqw2ok.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tgg2bw.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_yqw2okwl6ds4bwy6kvudhfy7uf
-% Encoding created by otftotfm on Sat Dec 31 18:06:54 2016
+%%AutoEnc_tgg2bwhyzokb5us5n6tk7sbvsb
+% Encoding created by otftotfm on Wed Mar 28 19:25:51 2018
 % Command line follows encoding
-/AutoEnc_yqw2okwl6ds4bwy6kvudhfy7uf [
+/AutoEnc_tgg2bwhyzokb5us5n6tk7sbvsb [
 %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
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam.up /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft.up /parenright.up /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown.up /questiondown.up /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tmv2ur.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tmv2ur.enc
deleted file mode 100644
index d6d6603b218..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tmv2ur.enc
+++ /dev/null
@@ -1,64 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_tmv2urc6kxng72q7zgdbaokcxa
-% Encoding created by otftotfm on Sat Dec 31 18:06:43 2016
-% Command line follows encoding
-/AutoEnc_tmv2urc6kxng72q7zgdbaokcxa [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /.notdef /.notdef /uni0306 /endash /emdash /.notdef
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft.superior /parenright.superior /asterisk /plus /comma /hyphen /period /slash
-%30
-  /uni2070 /uni00B9 /uni00B2 /uni00B3 /uni2074 /uni2075 /uni2076 /uni2077
-  /uni2078 /uni2079 /colon /semicolon /less /equal /greater /question
-%40
-  /at /A.superior /B.superior /C.superior /D.superior /E.superior /F.superior /G.superior
-  /H.superior /I.superior /J.superior /K.superior /L.superior /M.superior /N.superior /O.superior
-%50
-  /P.superior /Q.superior /R.superior /S.superior /T.superior /U.superior /V.superior /W.superior
-  /X.superior /Y.superior /Z.superior /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /a.superior /b.superior /c.superior /d.superior /e.superior /f.superior /g.superior
-  /h.superior /i.superior /j.superior /k.superior /l.superior /m.superior /n.superior /o.superior
-%70
-  /p.superior /q.superior /r.superior /s.superior /t.superior /u.superior /v.superior /w.superior
-  /x.superior /y.superior /z.superior /braceleft /bar /braceright /asciitilde /hyphen
-%80
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /e.superior /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=kern --feature=liga --feature=sups --ligkern=* {KL}
-% * --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-sup-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xp3h6g.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tpli6v.enc
index 5cedbe134af..0c36ffeb47d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xp3h6g.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tpli6v.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_xp3h6gsaiphswxxtzkmvvmlw3f
-% Encoding created by otftotfm on Sat Dec 31 18:06:14 2016
+%%AutoEnc_tpli6v2hu6noikpswpwqhuwcog
+% Encoding created by otftotfm on Wed Mar 28 19:25:33 2018
 % Command line follows encoding
-/AutoEnc_xp3h6gsaiphswxxtzkmvvmlw3f [
+/AutoEnc_tpli6v2hu6noikpswpwqhuwcog [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=swsh
 % --include-alternates=*.swash --feature=aalt --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tt64gu.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tt64gu.enc
deleted file mode 100644
index 1e6be83b9d1..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tt64gu.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_tt64guiu2ryefkpmh6iirnocgb
-% Encoding created by otftotfm on Sat Dec 31 18:06:51 2016
-% Command line follows encoding
-/AutoEnc_tt64guiu2ryefkpmh6iirnocgb [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /uni0311 /.notdef /uni0306 /endash /emdash /uni200C
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /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
-  /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
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=dlig --feature=kern --feature=liga --feature=onum
-% --feature=pnum --feature=swsh --include-alternates=*.swash --feature=aalt
-% --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-osf-swash-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7qxkxr.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tx56ne.enc
index 979b74eb7ac..7dec1f78e07 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7qxkxr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tx56ne.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_7qxkxr3jjy4xoojbgk2zrsvc6h
-% Encoding created by otftotfm on Sat Dec 31 18:05:38 2016
+%%AutoEnc_tx56nexhp4egj56rj7sczo4kaf
+% Encoding created by otftotfm on Wed Mar 28 19:25:30 2018
 % Command line follows encoding
-/AutoEnc_7qxkxr3jjy4xoojbgk2zrsvc6h [
+/AutoEnc_tx56nexhp4egj56rj7sczo4kaf [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /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
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=dlig --feature=kern
 % --feature=liga --feature=lnum --feature=swsh --feature=tnum
 % --include-alternates=*.swash --feature=aalt --space-factor=1.06635
-% Cochineal-Bold.otf Cochineal-Bold-tlf-swash-ot1'
+% Cochineal-Italic.otf Cochineal-Italic-tlf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lhuxe4.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_u523j7.enc
index ff6d77a7dad..637353c7014 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_lhuxe4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_u523j7.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_lhuxe4n3xqx6ma7bzomizttzgg
-% Encoding created by otftotfm on Sat Dec 31 18:06:41 2016
+%%AutoEnc_u523j7ljlmakgan3zz3dmoea4g
+% Encoding created by otftotfm on Wed Mar 28 19:25:34 2018
 % Command line follows encoding
-/AutoEnc_lhuxe4n3xqx6ma7bzomizttzgg [
+/AutoEnc_u523j7ljlmakgan3zz3dmoea4g [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /uni200C /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --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_qsfb2d.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uijgeh.enc
index ed696951107..13e66c69dd2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_qsfb2d.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_uijgeh.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_qsfb2diqmu3cpvzvqotzkhxjrd
-% Encoding created by otftotfm on Sat Dec 31 18:05:49 2016
+%%AutoEnc_uijgehseingifcm6vqtlieytpg
+% Encoding created by otftotfm on Wed Mar 28 19:24:51 2018
 % Command line follows encoding
-/AutoEnc_qsfb2diqmu3cpvzvqotzkhxjrd [
+/AutoEnc_uijgehseingifcm6vqtlieytpg [
 %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
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=tnum
 % --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-tosf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_s35xpx.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ulikgo.enc
index dcef2db41e4..2cb221e1699 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_s35xpx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ulikgo.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_s35xpxh2r6a5kxkioiojo7hmih
-% Encoding created by otftotfm on Sat Dec 31 18:06:23 2016
+%%AutoEnc_ulikgonxp7foe5n72ilqcte4xa
+% Encoding created by otftotfm on Wed Mar 28 19:25:20 2018
 % Command line follows encoding
-/AutoEnc_s35xpxh2r6a5kxkioiojo7hmih [
+/AutoEnc_ulikgonxp7foe5n72ilqcte4xa [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --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_2m6jch.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ume3xs.enc
index 8b3a7db6a17..9be95748302 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_2m6jch.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ume3xs.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_2m6jch3yivzxcrfqk7jlc2k32b
-% Encoding created by otftotfm on Sat Dec 31 18:06:26 2016
+%%AutoEnc_ume3xsuukmgrmq2xd5yhj3majc
+% Encoding created by otftotfm on Wed Mar 28 19:25:43 2018
 % Command line follows encoding
-/AutoEnc_2m6jch3yivzxcrfqk7jlc2k32b [
+/AutoEnc_ume3xsuukmgrmq2xd5yhj3majc [
 %00
   /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02.sc /.notdef /uni200C /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+  /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute.sc /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=smcp --feature=tnum
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rs26ky.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_un2dh6.enc
index f512ae7566f..7f04ea77e0c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_rs26ky.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_un2dh6.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_rs26kyqblm34y7rzo5w6xppj6c
-% Encoding created by otftotfm on Sat Dec 31 18:05:41 2016
+%%AutoEnc_un2dh6jhgg6fp4xrax3n6r2hsa
+% Encoding created by otftotfm on Wed Mar 28 19:25:03 2018
 % Command line follows encoding
-/AutoEnc_rs26kyqblm34y7rzo5w6xppj6c [
+/AutoEnc_un2dh6jhgg6fp4xrax3n6r2hsa [
 %00
-  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
 %80
   /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,12 +54,12 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
 % --feature=lnum --feature=pnum --feature=smcp --unicoding=germandbls =:
 % SSsmall --space-factor=1.06635 Cochineal-Bold.otf
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_v37ibe.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_v37ibe.enc
deleted file mode 100644
index 57d4453b6e8..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_v37ibe.enc
+++ /dev/null
@@ -1,66 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_v37ibet46e7xdo6jjwaba5cfwa
-% Encoding created by otftotfm on Sat Dec 31 18:06:32 2016
-% Command line follows encoding
-/AutoEnc_v37ibet46e7xdo6jjwaba5cfwa [
-%00
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
-%10
-  /question /bar /quotedblbase /exclamdown /questiondown /.notdef /.notdef /.notdef
-  /arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /endash /.notdef
-%20
-  /.notdef /.notdef /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
-  /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
-%30
-  /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum
-  /eight.onum /nine.onum /Q /Q.alt01 /.notdef /minus /.notdef /.notdef
-%40
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%50
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /arrowup /arrowdown
-%60
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%70
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%80
-  /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
-  /bullet /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%90
-  /.notdef /.notdef /lira /.notdef /.notdef /.notdef /.notdef /trademark
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
-  /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
-  /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
-%B0
-  /degree /plusminus /.notdef /.notdef /.notdef /mu /paragraph /periodcentered
-  /.notdef /.notdef /ordmasculine /radical /onequarter /onehalf /threequarters /.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 /multiply /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
-  /.notdef /.notdef /.notdef /.notdef /l /.notdef /i /f
-] def
-% Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
-% --feature=onum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
-% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-lf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5zktny.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_v7xcot.enc
index 113e43a0649..012e9dba99b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_5zktny.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_v7xcot.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_5zktnyh27ec6a2o74zemco6sjb
-% Encoding created by otftotfm on Sat Dec 31 18:06:29 2016
+%%AutoEnc_v7xcotr4xxp5wcd7hnhhlx55vg
+% Encoding created by otftotfm on Wed Mar 28 19:25:45 2018
 % Command line follows encoding
-/AutoEnc_5zktnyh27ec6a2o74zemco6sjb [
+/AutoEnc_v7xcotr4xxp5wcd7hnhhlx55vg [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /uni200C /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /uni200C /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=lnum --feature=pnum --space-factor=1.06635
 % Cochineal-Roman.otf Cochineal-Roman-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vbr2z2.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vbr2z2.enc
new file mode 100644
index 00000000000..fa4ff36a07d
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vbr2z2.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_vbr2z2ywe5ctcbqigfobg4zzzf
+% Encoding created by otftotfm on Wed Mar 28 19:25:45 2018
+% Command line follows encoding
+/AutoEnc_vbr2z2ywe5ctcbqigfobg4zzzf [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
+%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 /one /two /three /four /five /six /seven
+  /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q.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 /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=dlig --feature=kern
+% --feature=liga --feature=lnum --feature=swsh --feature=tnum
+% --include-alternates=*.swash --feature=aalt --space-factor=1.06635
+% Cochineal-Roman.otf Cochineal-Roman-tlf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7if63h.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vrrrzn.enc
index c79bb370b4d..bba28689b57 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7if63h.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_vrrrzn.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_7if63hlqcvwnd6mkgqleo6c7lb
-% Encoding created by otftotfm on Sat Dec 31 18:06:12 2016
+%%AutoEnc_vrrrznqlwbcw5dtu6h7v66ufnh
+% Encoding created by otftotfm on Wed Mar 28 19:25:23 2018
 % Command line follows encoding
-/AutoEnc_7if63hlqcvwnd6mkgqleo6c7lb [
+/AutoEnc_vrrrznqlwbcw5dtu6h7v66ufnh [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
@@ -14,8 +14,8 @@
   /.notdef /.notdef /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
   /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
 %30
-  /zero.taboldstyle /one.taboldstyle /two.taboldstyle /three.taboldstyle /four.taboldstyle /five.taboldstyle /six.taboldstyle /seven.taboldstyle
-  /eight.taboldstyle /nine.taboldstyle /Q /Q.alt01 /.notdef /minus /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
 %40
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,13 +54,13 @@
   /.notdef /.notdef /.notdef /.notdef /l /.notdef /i /f
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1
 % --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
 % --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% --space-factor=1.06635 Cochineal-Italic.otf Cochineal-Italic-tlf-ts1'
+% --space-factor=1.06635 Cochineal-Italic.otf Cochineal-Italic-tosf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wasnq6.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wasnq6.enc
deleted file mode 100644
index 7471126625c..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wasnq6.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_wasnq6qtt7jndvxmzym7b3npna
-% Encoding created by otftotfm on Sat Dec 31 18:06:42 2016
-% Command line follows encoding
-/AutoEnc_wasnq6qtt7jndvxmzym7b3npna [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /.notdef /.notdef /uni0306 /endash /emdash /.notdef
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /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
-  /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
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=dlig --feature=kern --feature=liga --feature=onum
-% --feature=pnum --feature=swsh --include-alternates=*.swash --feature=aalt
-% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-osf-swash-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aazvtb.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wbw3s6.enc
index 004f2135ac4..fa4a7044656 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_aazvtb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wbw3s6.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_aazvtbaezg7tjjuu6wyzmhjbbg
-% Encoding created by otftotfm on Sat Dec 31 18:05:43 2016
+%%AutoEnc_wbw3s6kt7a3nulrxt3rgostbla
+% Encoding created by otftotfm on Wed Mar 28 19:25:26 2018
 % Command line follows encoding
-/AutoEnc_aazvtbaezg7tjjuu6wyzmhjbbg [
+/AutoEnc_wbw3s6kt7a3nulrxt3rgostbla [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /x.superior /y.superior /z.superior /endash /emdash /hungarumlaut /tilde /dieresis
 %80
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,12 +54,12 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ot1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
 % --feature=sups --ligkern=* {KL} * --space-factor=1.06635
-% Cochineal-Bold.otf Cochineal-Bold-sup-ot1'
+% Cochineal-Italic.otf Cochineal-Italic-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xmqc3h.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wpajbj.enc
index 800b1459481..51279e0c0f7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xmqc3h.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wpajbj.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_xmqc3hochuealwrg74kmr4p4sa
-% Encoding created by otftotfm on Sat Dec 31 18:06:58 2016
+%%AutoEnc_wpajbji3gu2bbpelldtbbtylte
+% Encoding created by otftotfm on Wed Mar 28 19:25:54 2018
 % Command line follows encoding
-/AutoEnc_xmqc3hochuealwrg74kmr4p4sa [
+/AutoEnc_wpajbji3gu2bbpelldtbbtylte [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -35,11 +35,11 @@
   /lslash /.notdef /.notdef /quotedblleft /quotedblright /bullet /endash /emdash
   /.notdef /trademark /scaron /guilsinglright /.notdef /zcaron /asciitilde /Ydieresis
 %A0
-  /uni00A0 /exclamdown.up /cent /sterling /currency /yen /brokenbar /section
+  /.notdef /exclamdown.up /cent /sterling /currency /yen /brokenbar /section
   /.notdef /copyright /ordfeminine /guillemotleft /logicalnot /.notdef /registered /.notdef
 %B0
-  /degree /plusminus /uni00B2 /uni00B3 /.notdef /mu /paragraph /periodcentered
-  /.notdef /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.up
+  /degree /plusminus /.notdef /.notdef /.notdef /mu /paragraph /periodcentered
+  /.notdef /.notdef /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.up
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /.notdef /Ccedilla
   /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wtyigc.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wtyigc.enc
new file mode 100644
index 00000000000..1dbd46c304c
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wtyigc.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_wtyigcd5mdigtin22wb6owbswh
+% Encoding created by otftotfm on Wed Mar 28 19:25:32 2018
+% Command line follows encoding
+/AutoEnc_wtyigcd5mdigtin22wb6owbswh [
+%00
+  /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+  /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
+  /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+  /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+  /zero.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+  /eight.prop /nine.prop /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+  /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+  /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+  /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /s.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --feature=smcp --unicoding=germandbls =:
+% SSsmall --space-factor=1.06635 Cochineal-Italic.otf
+% Cochineal-Italic-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ddcf5y.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wxpvz3.enc
index 1d3f175a828..71195b6419e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ddcf5y.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_wxpvz3.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ddcf5yoy6knvtqadkv7quqgs7h
-% Encoding created by otftotfm on Sat Dec 31 18:05:51 2016
+%%AutoEnc_wxpvz34f7sooyvb2qk33esqjib
+% Encoding created by otftotfm on Wed Mar 28 19:25:22 2018
 % Command line follows encoding
-/AutoEnc_ddcf5yoy6knvtqadkv7quqgs7h [
+/AutoEnc_wxpvz34f7sooyvb2qk33esqjib [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /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
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TEXT --feature=dlig --feature=kern
 % --feature=liga --feature=onum --feature=swsh --feature=tnum
 % --include-alternates=*.swash --feature=aalt --space-factor=1.06635
-% Cochineal-Bold.otf Cochineal-Bold-tosf-swash-ot1'
+% Cochineal-Italic.otf Cochineal-Italic-tosf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_x4y5r2.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_x4y5r2.enc
deleted file mode 100644
index f38d6e9bb51..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_x4y5r2.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_x4y5r2czjj24i2en45kxqzee4e
-% Encoding created by otftotfm on Sat Dec 31 18:06:52 2016
-% Command line follows encoding
-/AutoEnc_x4y5r2czjj24i2en45kxqzee4e [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /uni0311 /.notdef /uni0306 /endash /emdash /uni200C
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q.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
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=dlig --feature=kern --feature=liga --feature=lnum
-% --feature=swsh --feature=tnum --include-alternates=*.swash --feature=aalt
-% --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-tlf-swash-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_e2lzvu.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xaqz74.enc
index cae484b6269..b4b4c7d37bf 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_e2lzvu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xaqz74.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_e2lzvuqkkbu3ypv5etrgppf3jb
-% Encoding created by otftotfm on Sat Dec 31 18:05:38 2016
+%%AutoEnc_xaqz74ppfrzr3zyulmndubiqab
+% Encoding created by otftotfm on Wed Mar 28 19:25:01 2018
 % Command line follows encoding
-/AutoEnc_e2lzvuqkkbu3ypv5etrgppf3jb [
+/AutoEnc_xaqz74ppfrzr3zyulmndubiqab [
 %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
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=dlig --feature=kern --feature=liga --feature=lnum --feature=swsh
 % --feature=tnum --include-alternates=*.swash --feature=aalt
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cwqdxq.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xgopev.enc
index 410405de58e..8a103a2a854 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_cwqdxq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xgopev.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_cwqdxqnld3r22njxlusdzgupif
-% Encoding created by otftotfm on Sat Dec 31 18:06:57 2016
+%%AutoEnc_xgopeviywbdu6sxyp4puj2awke
+% Encoding created by otftotfm on Wed Mar 28 19:25:53 2018
 % Command line follows encoding
-/AutoEnc_cwqdxqnld3r22njxlusdzgupif [
+/AutoEnc_xgopeviywbdu6sxyp4puj2awke [
 %00
   /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
-  /Phi.alt /Psi.alt /uni03A9 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -30,13 +30,13 @@
   /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
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %90
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %A0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
 %B0
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hie4zd.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xx26vs.enc
index a69e45be01b..b075bae3607 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_hie4zd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_xx26vs.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_hie4zdxvpkisfj34prbtdi3wqf
-% Encoding created by otftotfm on Sat Dec 31 18:06:14 2016
+%%AutoEnc_xx26vs2xbht3ltk5dl2ifojy2e
+% Encoding created by otftotfm on Wed Mar 28 19:25:32 2018
 % Command line follows encoding
-/AutoEnc_hie4zdxvpkisfj34prbtdi3wqf [
+/AutoEnc_xx26vs2xbht3ltk5dl2ifojy2e [
 %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.sc /j.sc /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /.notdef /dotlessi.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /Uhungarumlaut /Uring
   /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent.sc /dcroat.sc /section
 %A0
   /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
   /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
 %B0
-  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /.notdef /uhungarumlaut.sc /uring.sc
   /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7xhkhe.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ye47ub.enc
index 1b65ac88cf2..c1b571008fa 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_7xhkhe.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ye47ub.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_7xhkhebliefdfwrgr3w22ovnmh
-% Encoding created by otftotfm on Sat Dec 31 18:05:48 2016
+%%AutoEnc_ye47ub6xzugrzdmict62cgq3fb
+% Encoding created by otftotfm on Wed Mar 28 19:24:50 2018
 % Command line follows encoding
-/AutoEnc_7xhkhebliefdfwrgr3w22ovnmh [
+/AutoEnc_ye47ub6xzugrzdmict62cgq3fb [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=tnum --space-factor=1.06635
 % Cochineal-Bold.otf Cochineal-Bold-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3fmvzc.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yfllcf.enc
index 35fbf4a8303..228cc4074af 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_3fmvzc.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yfllcf.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_3fmvzcbgrnzjxvdkbd62arycta
-% Encoding created by otftotfm on Sat Dec 31 18:06:05 2016
+%%AutoEnc_yfllcfgb4lhxazxknesw4gaslf
+% Encoding created by otftotfm on Wed Mar 28 19:25:07 2018
 % Command line follows encoding
-/AutoEnc_3fmvzcbgrnzjxvdkbd62arycta [
+/AutoEnc_yfllcfgb4lhxazxknesw4gaslf [
 %00
   /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /i.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=smcp --feature=tnum
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ygzcii.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ygzcii.enc
new file mode 100644
index 00000000000..ba810f870f6
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ygzcii.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ygzcii43eqiw6k2asz2ejehvjg
+% Encoding created by otftotfm on Wed Mar 28 19:25:02 2018
+% Command line follows encoding
+/AutoEnc_ygzcii43eqiw6k2asz2ejehvjg [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%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.prop /one.prop /two.prop /three.prop /four.prop /five.prop /six.prop /seven.prop
+  /eight.prop /nine.prop /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --space-factor=1.06635 Cochineal-Bold.otf
+% Cochineal-Bold-lf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_c2ovjx.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yidn7l.enc
index 1731d4a4032..c96d5e47029 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_c2ovjx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yidn7l.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_c2ovjxopexrjjtvet5pyk2hb5a
-% Encoding created by otftotfm on Sat Dec 31 18:06:30 2016
+%%AutoEnc_yidn7lfgcnx5w43k2nkmi2ukbg
+% Encoding created by otftotfm on Wed Mar 28 19:25:47 2018
 % Command line follows encoding
-/AutoEnc_c2ovjxopexrjjtvet5pyk2hb5a [
+/AutoEnc_yidn7lfgcnx5w43k2nkmi2ukbg [
 %00
   /grave /acute.sc /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
 %10
   /quotedblleft /quotedblright /quotedblbase /guillemotleft.sc /guillemotright.sc /endash /emdash /uni200C
-  /.notdef /dotlessi.sc /j.sc /uniFB00.sc /uniFB01.sc /uniFB02.sc /uniFB03.sc /uniFB04.sc
+  /.notdef /dotlessi.sc /j.sc /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl.sc /numbersign.sc /dollar.sc /percent.sc /ampersand /quoteright
   /parenleft /parenright /asterisk.sc /plus.sc /comma /hyphen.sc /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /Uhungarumlaut /Uring
   /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent.sc /dcroat.sc /section.sc
 %A0
   /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
   /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /eng.sc /ohungarumlaut.sc /racute.sc
 %B0
-  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+  /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /.notdef /uhungarumlaut.sc /uring.sc
   /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling.sc
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yrma2d.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yrma2d.enc
new file mode 100644
index 00000000000..f3376536a4d
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yrma2d.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_yrma2dtehmfob7exx2dpdhiwsa
+% Encoding created by otftotfm on Wed Mar 28 19:24:57 2018
+% Command line follows encoding
+/AutoEnc_yrma2dtehmfob7exx2dpdhiwsa [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%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.superior /parenright.superior /asterisk /plus /comma /hyphen /period /slash
+%30
+  /uni2070 /uni00B9 /uni00B2 /uni00B3 /uni2074 /uni2075 /uni2076 /uni2077
+  /uni2078 /uni2079 /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A.superior /B.superior /C.superior /D.superior /E.superior /F.superior /G.superior
+  /H.superior /I.superior /J.superior /K.superior /L.superior /M.superior /N.superior /O.superior
+%50
+  /P.superior /Q.superior /R.superior /S.superior /T.superior /U.superior /V.superior /W.superior
+  /X.superior /Y.superior /Z.superior /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a.superior /b.superior /c.superior /d.superior /e.superior /f.superior /g.superior
+  /h.superior /i.superior /j.superior /k.superior /l.superior /m.superior /n.superior /o.superior
+%70
+  /p.superior /q.superior /r.superior /s.superior /t.superior /u.superior /v.superior /w.superior
+  /x.superior /y.superior /z.superior /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --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_yz65wh.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yz65wh.enc
new file mode 100644
index 00000000000..140c46a996a
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_yz65wh.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_yz65whj6nmwootqn46uy5id3yg
+% Encoding created by otftotfm on Wed Mar 28 19:25:43 2018
+% Command line follows encoding
+/AutoEnc_yz65whj6nmwootqn46uy5id3yg [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
+%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 /one /two /three /four /five /six /seven
+  /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+  /at /A /B /C /D /E /F /G
+  /H /I /J /K /L /M /N /O
+%50
+  /P /Q /R /S /T /U /V /W
+  /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+  /quoteleft /a /b /c /d /e /f /g
+  /h /i /j /k /l /m /n /o
+%70
+  /p /q /r /s /t /u /v /w
+  /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=tnum --space-factor=1.06635 Cochineal-Roman.otf
+% Cochineal-Roman-tlf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zlykb2.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_z5w3bg.enc
index 352fdc677c9..5daf8e3f377 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zlykb2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_z5w3bg.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_zlykb2jphffsfr3yottximwogc
-% Encoding created by otftotfm on Sat Dec 31 18:05:47 2016
+%%AutoEnc_z5w3bg7nzfmfekongww5rmwfvb
+% Encoding created by otftotfm on Wed Mar 28 19:24:55 2018
 % Command line follows encoding
-/AutoEnc_zlykb2jphffsfr3yottximwogc [
+/AutoEnc_z5w3bg7nzfmfekongww5rmwfvb [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dlig
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=swsh
 % --include-alternates=*.swash --feature=aalt --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zbxipy.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zbxipy.enc
deleted file mode 100644
index 79875649682..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zbxipy.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_zbxipylmr733jcgwmdbk3cza4b
-% Encoding created by otftotfm on Sat Dec 31 18:06:43 2016
-% Command line follows encoding
-/AutoEnc_zbxipylmr733jcgwmdbk3cza4b [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /.notdef /.notdef /uni0306 /endash /emdash /.notdef
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-%30
-  /zero /one /two /three /four /five /six /seven
-  /eight /nine /colon /semicolon /less /equal /greater /question
-%40
-  /at /A /B /C /D /E /F /G
-  /H /I /J /K /L /M /N /O
-%50
-  /P /Q.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
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /uni04D9 /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=dlig --feature=kern --feature=liga --feature=lnum
-% --feature=swsh --feature=tnum --include-alternates=*.swash --feature=aalt
-% --space-factor=1.06635 Cochineal-Bold.otf Cochineal-Bold-tlf-swash-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zceo5t.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zceo5t.enc
new file mode 100644
index 00000000000..8360d7a2edc
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zceo5t.enc
@@ -0,0 +1,66 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_zceo5tfblq7iby3q6lg555vocg
+% Encoding created by otftotfm on Wed Mar 28 19:25:40 2018
+% Command line follows encoding
+/AutoEnc_zceo5tfblq7iby3q6lg555vocg [
+%00
+  /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+  /Phi /Psi /Omega /.notdef /.notdef /.notdef /.notdef /.notdef
+%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 /four.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 /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --no-updmap --coding-scheme=TEX TEXT --feature=dlig --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=swsh
+% --include-alternates=*.swash --feature=aalt --space-factor=1.06635
+% Cochineal-Roman.otf Cochineal-Roman-osf-swash-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tub2zn.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zd4idy.enc
index dd891b6a2af..36a2bf31dbc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_tub2zn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zd4idy.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_tub2znqwhvq5g62zgywqrmvsof
-% Encoding created by otftotfm on Sat Dec 31 18:06:17 2016
+%%AutoEnc_zd4idy26fkltx273purfquv3lc
+% Encoding created by otftotfm on Wed Mar 28 19:25:23 2018
 % Command line follows encoding
-/AutoEnc_tub2znqwhvq5g62zgywqrmvsof [
+/AutoEnc_zd4idy26fkltx273purfquv3lc [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=pnum --space-factor=1.06635
 % Cochineal-Italic.otf Cochineal-Italic-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bzchxc.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zi2reu.enc
index d26883b849f..b293a7a7226 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_bzchxc.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zi2reu.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_bzchxcmqow4r5jfe45ci6a74vb
-% Encoding created by otftotfm on Sat Dec 31 18:05:52 2016
+%%AutoEnc_zi2reucvqtgwgoqzrojvcpsqbe
+% Encoding created by otftotfm on Wed Mar 28 19:24:49 2018
 % Command line follows encoding
-/AutoEnc_bzchxcmqow4r5jfe45ci6a74vb [
+/AutoEnc_zi2reucvqtgwgoqzrojvcpsqbe [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02 /.notdef /.notdef /uniFB00 /uniFB01 /.notdef /uniFB03 /uniFB04
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
   /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ly1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --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_zrngc7.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zrngc7.enc
deleted file mode 100644
index 60d2ddefdb7..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zrngc7.enc
+++ /dev/null
@@ -1,65 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_zrngc7q2jfof6ehvxhknqg45qf
-% Encoding created by otftotfm on Sat Dec 31 18:06:46 2016
-% Command line follows encoding
-/AutoEnc_zrngc7q2jfof6ehvxhknqg45qf [
-%00
-  /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef
-%10
-  /quotedblleft /quotedblright /.notdef /.notdef /uni0306 /endash /emdash /.notdef
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
-%20
-  /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-  /parenleft.superior /parenright.superior /asterisk /plus /comma /hyphen /period /slash
-%30
-  /uni2070 /uni00B9 /uni00B2 /uni00B3 /uni2074 /uni2075 /uni2076 /uni2077
-  /uni2078 /uni2079 /colon /semicolon /less /equal /greater /question
-%40
-  /at /A.superior /B.superior /C.superior /D.superior /E.superior /F.superior /G.superior
-  /H.superior /I.superior /J.superior /K.superior /L.superior /M.superior /N.superior /O.superior
-%50
-  /P.superior /Q.superior /R.superior /S.superior /T.superior /U.superior /V.superior /W.superior
-  /X.superior /Y.superior /Z.superior /bracketleft /backslash /bracketright /asciicircum /underscore
-%60
-  /quoteleft /a.superior /b.superior /c.superior /d.superior /e.superior /f.superior /g.superior
-  /h.superior /i.superior /j.superior /k.superior /l.superior /m.superior /n.superior /o.superior
-%70
-  /p.superior /q.superior /r.superior /s.superior /t.superior /u.superior /v.superior /w.superior
-  /x.superior /y.superior /z.superior /braceleft /bar /braceright /asciitilde /hyphen
-%80
-  /.notdef /.notdef /uni0402 /uni040B /.notdef /.notdef /.notdef /uni0409
-  /uni0407 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0405
-%90
-  /.notdef /.notdef /uni040E /.notdef /.notdef /.notdef /uni040F /.notdef
-  /.notdef /uni0404 /.notdef /uni040A /uni0401 /uni2116 /currency /section
-%A0
-  /.notdef /.notdef /uni0452 /uni045B /.notdef /.notdef /.notdef /uni0459
-  /uni0457 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni0455
-%B0
-  /.notdef /.notdef /uni045E /.notdef /.notdef /.notdef /uni045F /.notdef
-  /.notdef /uni0454 /.notdef /uni045A /uni0451 /quotedblbase /guillemotleft /guillemotright
-%C0
-  /uni0410 /uni0411 /uni0412 /uni0413 /uni0414 /uni0415 /uni0416 /uni0417
-  /uni0418 /uni0419 /uni041A /uni041B /uni041C /uni041D /uni041E /uni041F
-%D0
-  /uni0420 /uni0421 /uni0422 /uni0423 /uni0424 /uni0425 /uni0426 /uni0427
-  /uni0428 /uni0429 /uni042A /uni042B /uni042C /uni042D /uni042E /uni042F
-%E0
-  /uni0430 /uni0431 /uni0432 /uni0433 /uni0434 /uni0435 /uni0436 /uni0437
-  /uni0438 /uni0439 /uni043A /uni043B /uni043C /uni043D /uni043E /uni043F
-%F0
-  /uni0440 /uni0441 /uni0442 /uni0443 /uni0444 /uni0445 /uni0446 /uni0447
-  /uni0448 /uni0449 /uni044A /uni044B /uni044C /uni044D /uni044E /uni044F
-] def
-% Command line: 'otftotfm --automatic --encoding=t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
-% --no-updmap --feature=kern --feature=liga --feature=sups --ligkern=* {KL}
-% * --space-factor=1.06635 Cochineal-BoldItalic.otf
-% Cochineal-BoldItalic-sup-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sdyb62.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zs6x3r.enc
index 978e51ba794..3c5a0d8842e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_sdyb62.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zs6x3r.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_sdyb62zv6jvie5v5ltsnstc2ka
-% Encoding created by otftotfm on Sat Dec 31 18:06:18 2016
+%%AutoEnc_zs6x3rg46l4kvjmvgwv2ahrevh
+% Encoding created by otftotfm on Wed Mar 28 19:25:24 2018
 % Command line follows encoding
-/AutoEnc_sdyb62zv6jvie5v5ltsnstc2ka [
+/AutoEnc_zs6x3rg46l4kvjmvgwv2ahrevh [
 %00
   /s.sc /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /uniFB02.sc /.notdef /.notdef /uniFB00.sc /uniFB01.sc /.notdef /uniFB03.sc /uniFB04.sc
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %10
   /dotlessi.sc /j.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
@@ -54,12 +54,12 @@
   /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/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
 % --feature=liga --feature=onum --feature=pnum --feature=smcp
 % --unicoding=germandbls =: SSsmall --space-factor=1.06635
diff --git a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ggrwt7.enc b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zwlvmj.enc
index 0a2163e67be..b7772563085 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_ggrwt7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cochineal/coch_zwlvmj.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ggrwt7zizhgf542ajkvf4u7oab
-% Encoding created by otftotfm on Sat Dec 31 18:06:38 2016
+%%AutoEnc_zwlvmjlsfprbhixyd7yelmczwg
+% Encoding created by otftotfm on Wed Mar 28 19:25:35 2018
 % Command line follows encoding
-/AutoEnc_ggrwt7zizhgf542ajkvf4u7oab [
+/AutoEnc_zwlvmjlsfprbhixyd7yelmczwg [
 %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 /uni200C
-  /.notdef /dotlessi /uni0237 /uniFB00 /uniFB01 /uniFB02 /uniFB03 /uniFB04
+  /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
 %20
   /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -32,13 +32,13 @@
   /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
+  /Rcaron /Sacute /Scaron /Scedilla /Tcaron /.notdef /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
+  /rcaron /sacute /scaron /scedilla /tcaron /.notdef /uhungarumlaut /uring
   /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
 %C0
   /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
@@ -54,12 +54,12 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/tfm/public/cochineal
-% --vf-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/vf/public/cochineal
-% --type1-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/type1/public/cochineal
-% --truetype-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/truetype/public/cochineal
-% --encoding-directory=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/enc/dvips/cochineal
-% --map-file=/Users/msharpe/Library/texlive/2016/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/cochineal
+% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/cochineal
+% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/cochineal
+% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/cochineal
+% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/cochineal
+% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/cochineal/Cochineal.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=tnum
 % --space-factor=1.06635 Cochineal-Roman.otf Cochineal-Roman-tosf-t1'
diff --git a/Master/texmf-dist/fonts/map/dvips/cochineal/Cochineal.map b/Master/texmf-dist/fonts/map/dvips/cochineal/Cochineal.map
index df8b25b2d93..ad734e718ec 100644
--- a/Master/texmf-dist/fonts/map/dvips/cochineal/Cochineal.map
+++ b/Master/texmf-dist/fonts/map/dvips/cochineal/Cochineal.map
@@ -1,250 +1,214 @@
 % Automatically maintained by otftotfm or other programs. Do not edit.
 
-Cochineal-Bold-dnom-ly1--base Cochineal-Bold "AutoEnc_zi6j5gsslnnfxbdekbbywzvuef ReEncodeFont" <[coch_zi6j5g.enc <Cochineal-Bold.pfb
-Cochineal-Bold-dnom-ot1 Cochineal-Bold "AutoEnc_bwegkyzh5aayrwx6txeczip42f ReEncodeFont" <[coch_bwegky.enc <Cochineal-Bold.pfb
-Cochineal-Bold-dnom-t1--base Cochineal-Bold "AutoEnc_t24fhxfubcz6fj3dilmrmpezlg ReEncodeFont" <[coch_t24fhx.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tlf-ly1--base Cochineal-Bold "AutoEnc_v7zunkxoh5dmox4bzr7qncbgkb ReEncodeFont" <[coch_v7zunk.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tlf-ot1 Cochineal-Bold "AutoEnc_r7lidjar54eq7qhj5t5tgqigbh ReEncodeFont" <[coch_r7lidj.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tlf-t1--base Cochineal-Bold "AutoEnc_hl6u4rf6httlegpibghi64a6ig ReEncodeFont" <[coch_hl6u4r.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tlf-sc-ly1--base Cochineal-Bold "AutoEnc_sxkuxxx2cywrxfhdh5bjgr3sag ReEncodeFont" <[coch_sxkuxx.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tlf-sc-ot1--base Cochineal-Bold "AutoEnc_pgwq47xazymmrhnj3lqmobfucb ReEncodeFont" <[coch_pgwq47.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tlf-sc-t1--base Cochineal-Bold "AutoEnc_lygafnwpsd75rpsvjjh37hbcea ReEncodeFont" <[coch_lygafn.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tlf-swash-ly1--base Cochineal-Bold "AutoEnc_k5ugtis3lu5gl3k2hyjhtvp56h ReEncodeFont" <[coch_k5ugti.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tlf-swash-ot1 Cochineal-Bold "AutoEnc_7qxkxr3jjy4xoojbgk2zrsvc6h ReEncodeFont" <[coch_7qxkxr.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tlf-swash-t1--base Cochineal-Bold "AutoEnc_e2lzvuqkkbu3ypv5etrgppf3jb ReEncodeFont" <[coch_e2lzvu.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tlf-ts1--base Cochineal-Bold "AutoEnc_w4afvizqtahdqakq4azlqvqyea ReEncodeFont" <[coch_w4afvi.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-ly1--base Cochineal-Bold "AutoEnc_zmd4frmfz3slc4iuobneoel2ib ReEncodeFont" <[coch_zmd4fr.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-ot1 Cochineal-Bold "AutoEnc_jykc3vvnwsjfsh5fckn6n2b35c ReEncodeFont" <[coch_jykc3v.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-t1--base Cochineal-Bold "AutoEnc_bqgjghgsxw3skxcshsizvbogbf ReEncodeFont" <[coch_bqgjgh.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-sc-ly1--base Cochineal-Bold "AutoEnc_sdimnzgl2yetfq7vegpaa4viza ReEncodeFont" <[coch_sdimnz.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-sc-ot1--base Cochineal-Bold "AutoEnc_rs26kyqblm34y7rzo5w6xppj6c ReEncodeFont" <[coch_rs26ky.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-sc-t1--base Cochineal-Bold "AutoEnc_e3q7lxlbadky3jyzxcqbkjmc3e ReEncodeFont" <[coch_e3q7lx.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-swash-ly1--base Cochineal-Bold "AutoEnc_4b5cze3zd36ml6hd5ia2lmccba ReEncodeFont" <[coch_4b5cze.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-swash-ot1 Cochineal-Bold "AutoEnc_uy5zmpnwvje7efyesevvsxsaxc ReEncodeFont" <[coch_uy5zmp.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-swash-t1--base Cochineal-Bold "AutoEnc_mzcfhrb3khstgj7fzpqcrqvdva ReEncodeFont" <[coch_mzcfhr.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-ts1--base Cochineal-Bold "AutoEnc_7h3ywquooyss4wakboi3rggmge ReEncodeFont" <[coch_7h3ywq.enc <Cochineal-Bold.pfb
-Cochineal-Bold-sup-ly1--base Cochineal-Bold "AutoEnc_ckzf3x7x5g6mtdz2tu3z4a6fyf ReEncodeFont" <[coch_ckzf3x.enc <Cochineal-Bold.pfb
-Cochineal-Bold-sup-ot1 Cochineal-Bold "AutoEnc_aazvtbaezg7tjjuu6wyzmhjbbg ReEncodeFont" <[coch_aazvtb.enc <Cochineal-Bold.pfb
-Cochineal-Bold-sup-t1--base Cochineal-Bold "AutoEnc_q5rvqtqmmsyxfpjzbvnwxdp4gc ReEncodeFont" <[coch_q5rvqt.enc <Cochineal-Bold.pfb
-Cochineal-Bold-osf-ly1--base Cochineal-Bold "AutoEnc_rmihs3s5dl47zafpdybr3a6cte ReEncodeFont" <[coch_rmihs3.enc <Cochineal-Bold.pfb
-Cochineal-Bold-osf-ot1 Cochineal-Bold "AutoEnc_6ycxmblq3v5evew3632hl5iyyg ReEncodeFont" <[coch_6ycxmb.enc <Cochineal-Bold.pfb
-Cochineal-Bold-osf-t1--base Cochineal-Bold "AutoEnc_2lyzkihyil54xogctfz3vxrbna ReEncodeFont" <[coch_2lyzki.enc <Cochineal-Bold.pfb
-Cochineal-Bold-osf-sc-ly1--base Cochineal-Bold "AutoEnc_hjbta7xnr6v7edjb7f6zgy7i7e ReEncodeFont" <[coch_hjbta7.enc <Cochineal-Bold.pfb
-Cochineal-Bold-osf-sc-ot1--base Cochineal-Bold "AutoEnc_7tfxxexjsky7qvienwcjzrgprd ReEncodeFont" <[coch_7tfxxe.enc <Cochineal-Bold.pfb
-Cochineal-Bold-osf-sc-t1--base Cochineal-Bold "AutoEnc_jc6axhf7f5vvg2nubzwemti5bd ReEncodeFont" <[coch_jc6axh.enc <Cochineal-Bold.pfb
-Cochineal-Bold-osf-swash-ly1--base Cochineal-Bold "AutoEnc_zlykb2jphffsfr3yottximwogc ReEncodeFont" <[coch_zlykb2.enc <Cochineal-Bold.pfb
-Cochineal-Bold-osf-swash-ot1 Cochineal-Bold "AutoEnc_5to7wujtnlqezunvxooho5nmne ReEncodeFont" <[coch_5to7wu.enc <Cochineal-Bold.pfb
-Cochineal-Bold-osf-swash-t1--base Cochineal-Bold "AutoEnc_zetixvfltpl2veewynyuordzxe ReEncodeFont" <[coch_zetixv.enc <Cochineal-Bold.pfb
-Cochineal-Bold-osf-ts1--base Cochineal-Bold "AutoEnc_7h3ywquooyss4wakboi3rggmge ReEncodeFont" <[coch_7h3ywq.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tosf-ly1--base Cochineal-Bold "AutoEnc_7xhkhebliefdfwrgr3w22ovnmh ReEncodeFont" <[coch_7xhkhe.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tosf-ot1 Cochineal-Bold "AutoEnc_3zwcy7mhyx7t3a2fgwjxf23hne ReEncodeFont" <[coch_3zwcy7.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tosf-t1--base Cochineal-Bold "AutoEnc_qsfb2diqmu3cpvzvqotzkhxjrd ReEncodeFont" <[coch_qsfb2d.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tosf-sc-ly1--base Cochineal-Bold "AutoEnc_t2fib6k5cg7nvmjhmmpatxengf ReEncodeFont" <[coch_t2fib6.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tosf-sc-ot1--base Cochineal-Bold "AutoEnc_lnko3pkepwotmbfzqg3ebq3l2g ReEncodeFont" <[coch_lnko3p.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tosf-sc-t1--base Cochineal-Bold "AutoEnc_oaz2vttx3vojieta57wjq2qwqh ReEncodeFont" <[coch_oaz2vt.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tosf-swash-ly1--base Cochineal-Bold "AutoEnc_gccjw3u4i5mvw5ch6nrcg2xmtd ReEncodeFont" <[coch_gccjw3.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tosf-swash-ot1 Cochineal-Bold "AutoEnc_ddcf5yoy6knvtqadkv7quqgs7h ReEncodeFont" <[coch_ddcf5y.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tosf-swash-t1--base Cochineal-Bold "AutoEnc_sechmfdn7lhihsrzmqf2munkig ReEncodeFont" <[coch_sechmf.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tosf-ts1--base Cochineal-Bold "AutoEnc_w4afvizqtahdqakq4azlqvqyea ReEncodeFont" <[coch_w4afvi.enc <Cochineal-Bold.pfb
-Cochineal-Bold-inf-ly1--base Cochineal-Bold "AutoEnc_bzchxcmqow4r5jfe45ci6a74vb ReEncodeFont" <[coch_bzchxc.enc <Cochineal-Bold.pfb
-Cochineal-Bold-inf-ot1 Cochineal-Bold "AutoEnc_4csisidkuw7jk227kpk2dfjwtc ReEncodeFont" <[coch_4csisi.enc <Cochineal-Bold.pfb
-Cochineal-Bold-inf-t1--base Cochineal-Bold "AutoEnc_ghlqiwqo3vjgcyiw3yv6oyts7g ReEncodeFont" <[coch_ghlqiw.enc <Cochineal-Bold.pfb
-Cochineal-BoldItalic-dnom-ly1--base Cochineal-BoldItalic "AutoEnc_zi6j5gsslnnfxbdekbbywzvuef ReEncodeFont" <[coch_zi6j5g.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-dnom-ot1 Cochineal-BoldItalic "AutoEnc_bwegkyzh5aayrwx6txeczip42f ReEncodeFont" <[coch_bwegky.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-dnom-t1--base Cochineal-BoldItalic "AutoEnc_t24fhxfubcz6fj3dilmrmpezlg ReEncodeFont" <[coch_t24fhx.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tlf-ly1--base Cochineal-BoldItalic "AutoEnc_v7zunkxoh5dmox4bzr7qncbgkb ReEncodeFont" <[coch_v7zunk.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tlf-ot1 Cochineal-BoldItalic "AutoEnc_r7lidjar54eq7qhj5t5tgqigbh ReEncodeFont" <[coch_r7lidj.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tlf-t1--base Cochineal-BoldItalic "AutoEnc_hl6u4rf6httlegpibghi64a6ig ReEncodeFont" <[coch_hl6u4r.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tlf-sc-ly1--base Cochineal-BoldItalic "AutoEnc_tbu25zfw5k2xgqfj3tzbpkxd2f ReEncodeFont" <[coch_tbu25z.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tlf-sc-ot1--base Cochineal-BoldItalic "AutoEnc_t2vkuk6ybhzy3qetxure6mxp6a ReEncodeFont" <[coch_t2vkuk.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tlf-sc-t1--base Cochineal-BoldItalic "AutoEnc_huga5ltjm762zf4ndhdgvqsrsd ReEncodeFont" <[coch_huga5l.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tlf-swash-ly1--base Cochineal-BoldItalic "AutoEnc_k5ugtis3lu5gl3k2hyjhtvp56h ReEncodeFont" <[coch_k5ugti.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tlf-swash-ot1 Cochineal-BoldItalic "AutoEnc_7qxkxr3jjy4xoojbgk2zrsvc6h ReEncodeFont" <[coch_7qxkxr.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tlf-swash-t1--base Cochineal-BoldItalic "AutoEnc_e2lzvuqkkbu3ypv5etrgppf3jb ReEncodeFont" <[coch_e2lzvu.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tlf-ts1--base Cochineal-BoldItalic "AutoEnc_w4afvizqtahdqakq4azlqvqyea ReEncodeFont" <[coch_w4afvi.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-ly1--base Cochineal-BoldItalic "AutoEnc_zmd4frmfz3slc4iuobneoel2ib ReEncodeFont" <[coch_zmd4fr.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-ot1 Cochineal-BoldItalic "AutoEnc_jykc3vvnwsjfsh5fckn6n2b35c ReEncodeFont" <[coch_jykc3v.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-t1--base Cochineal-BoldItalic "AutoEnc_bqgjghgsxw3skxcshsizvbogbf ReEncodeFont" <[coch_bqgjgh.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-sc-ly1--base Cochineal-BoldItalic "AutoEnc_tydrhhb4swdviw45er75ysdrih ReEncodeFont" <[coch_tydrhh.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-sc-ot1--base Cochineal-BoldItalic "AutoEnc_k3bwndupgmfjoqsfr7rfjqtjqa ReEncodeFont" <[coch_k3bwnd.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-sc-t1--base Cochineal-BoldItalic "AutoEnc_73cr6nfshxsajruidlcooobh4b ReEncodeFont" <[coch_73cr6n.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-swash-ly1--base Cochineal-BoldItalic "AutoEnc_4b5cze3zd36ml6hd5ia2lmccba ReEncodeFont" <[coch_4b5cze.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-swash-ot1 Cochineal-BoldItalic "AutoEnc_uy5zmpnwvje7efyesevvsxsaxc ReEncodeFont" <[coch_uy5zmp.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-swash-t1--base Cochineal-BoldItalic "AutoEnc_mzcfhrb3khstgj7fzpqcrqvdva ReEncodeFont" <[coch_mzcfhr.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-ts1--base Cochineal-BoldItalic "AutoEnc_7h3ywquooyss4wakboi3rggmge ReEncodeFont" <[coch_7h3ywq.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-sup-ly1--base Cochineal-BoldItalic "AutoEnc_ckzf3x7x5g6mtdz2tu3z4a6fyf ReEncodeFont" <[coch_ckzf3x.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-sup-ot1 Cochineal-BoldItalic "AutoEnc_aazvtbaezg7tjjuu6wyzmhjbbg ReEncodeFont" <[coch_aazvtb.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-sup-t1--base Cochineal-BoldItalic "AutoEnc_q5rvqtqmmsyxfpjzbvnwxdp4gc ReEncodeFont" <[coch_q5rvqt.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-osf-ly1--base Cochineal-BoldItalic "AutoEnc_rmihs3s5dl47zafpdybr3a6cte ReEncodeFont" <[coch_rmihs3.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-osf-ot1 Cochineal-BoldItalic "AutoEnc_6ycxmblq3v5evew3632hl5iyyg ReEncodeFont" <[coch_6ycxmb.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-osf-t1--base Cochineal-BoldItalic "AutoEnc_2lyzkihyil54xogctfz3vxrbna ReEncodeFont" <[coch_2lyzki.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-osf-sc-ly1--base Cochineal-BoldItalic "AutoEnc_6lkrjmdn5zysozhdjwr7hfheka ReEncodeFont" <[coch_6lkrjm.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-osf-sc-ot1--base Cochineal-BoldItalic "AutoEnc_lm7rwsyufmnkn25rj47m5lhgfb ReEncodeFont" <[coch_lm7rws.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-osf-sc-t1--base Cochineal-BoldItalic "AutoEnc_j2ekhjxon7mkbufjzuf5oaztqb ReEncodeFont" <[coch_j2ekhj.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-osf-swash-ly1--base Cochineal-BoldItalic "AutoEnc_zlykb2jphffsfr3yottximwogc ReEncodeFont" <[coch_zlykb2.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-osf-swash-ot1 Cochineal-BoldItalic "AutoEnc_5to7wujtnlqezunvxooho5nmne ReEncodeFont" <[coch_5to7wu.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-osf-swash-t1--base Cochineal-BoldItalic "AutoEnc_zetixvfltpl2veewynyuordzxe ReEncodeFont" <[coch_zetixv.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-osf-ts1--base Cochineal-BoldItalic "AutoEnc_7h3ywquooyss4wakboi3rggmge ReEncodeFont" <[coch_7h3ywq.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tosf-ly1--base Cochineal-BoldItalic "AutoEnc_7xhkhebliefdfwrgr3w22ovnmh ReEncodeFont" <[coch_7xhkhe.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tosf-ot1 Cochineal-BoldItalic "AutoEnc_3zwcy7mhyx7t3a2fgwjxf23hne ReEncodeFont" <[coch_3zwcy7.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tosf-t1--base Cochineal-BoldItalic "AutoEnc_qsfb2diqmu3cpvzvqotzkhxjrd ReEncodeFont" <[coch_qsfb2d.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tosf-sc-ly1--base Cochineal-BoldItalic "AutoEnc_3fmvzcbgrnzjxvdkbd62arycta ReEncodeFont" <[coch_3fmvzc.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tosf-sc-ot1--base Cochineal-BoldItalic "AutoEnc_qoklp4vhvvpdnurilbl6t6u4eg ReEncodeFont" <[coch_qoklp4.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tosf-sc-t1--base Cochineal-BoldItalic "AutoEnc_r4tuvpfdxha6kyaixqtehnqvue ReEncodeFont" <[coch_r4tuvp.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tosf-swash-ly1--base Cochineal-BoldItalic "AutoEnc_gccjw3u4i5mvw5ch6nrcg2xmtd ReEncodeFont" <[coch_gccjw3.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tosf-swash-ot1 Cochineal-BoldItalic "AutoEnc_ddcf5yoy6knvtqadkv7quqgs7h ReEncodeFont" <[coch_ddcf5y.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tosf-swash-t1--base Cochineal-BoldItalic "AutoEnc_sechmfdn7lhihsrzmqf2munkig ReEncodeFont" <[coch_sechmf.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tosf-ts1--base Cochineal-BoldItalic "AutoEnc_w4afvizqtahdqakq4azlqvqyea ReEncodeFont" <[coch_w4afvi.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-inf-ly1--base Cochineal-BoldItalic "AutoEnc_bzchxcmqow4r5jfe45ci6a74vb ReEncodeFont" <[coch_bzchxc.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-inf-ot1 Cochineal-BoldItalic "AutoEnc_4csisidkuw7jk227kpk2dfjwtc ReEncodeFont" <[coch_4csisi.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-inf-t1--base Cochineal-BoldItalic "AutoEnc_ghlqiwqo3vjgcyiw3yv6oyts7g ReEncodeFont" <[coch_ghlqiw.enc <Cochineal-BoldItalic.pfb
-Cochineal-Italic-dnom-ly1--base Cochineal-Italic "AutoEnc_jxzuzfppjzmye3y3ie4ead2ygb ReEncodeFont" <[coch_jxzuzf.enc <Cochineal-Italic.pfb
-Cochineal-Italic-dnom-ot1 Cochineal-Italic "AutoEnc_bwegkyzh5aayrwx6txeczip42f ReEncodeFont" <[coch_bwegky.enc <Cochineal-Italic.pfb
-Cochineal-Italic-dnom-t1--base Cochineal-Italic "AutoEnc_t24fhxfubcz6fj3dilmrmpezlg ReEncodeFont" <[coch_t24fhx.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tlf-ly1--base Cochineal-Italic "AutoEnc_swy4oa7suk7v7xrgy4psubsgkh ReEncodeFont" <[coch_swy4oa.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tlf-ot1 Cochineal-Italic "AutoEnc_r7lidjar54eq7qhj5t5tgqigbh ReEncodeFont" <[coch_r7lidj.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tlf-t1--base Cochineal-Italic "AutoEnc_hl6u4rf6httlegpibghi64a6ig ReEncodeFont" <[coch_hl6u4r.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tlf-sc-ly1--base Cochineal-Italic "AutoEnc_abflduupicnaghglrrnvcdywic ReEncodeFont" <[coch_abfldu.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tlf-sc-ot1--base Cochineal-Italic "AutoEnc_pgwq47xazymmrhnj3lqmobfucb ReEncodeFont" <[coch_pgwq47.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tlf-sc-t1--base Cochineal-Italic "AutoEnc_n3wsi3ha34kmooelmuck3qs3pf ReEncodeFont" <[coch_n3wsi3.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tlf-swash-ly1--base Cochineal-Italic "AutoEnc_sqxi2mil225mja2tuqxr67okhc ReEncodeFont" <[coch_sqxi2m.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tlf-swash-ot1 Cochineal-Italic "AutoEnc_7qxkxr3jjy4xoojbgk2zrsvc6h ReEncodeFont" <[coch_7qxkxr.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tlf-swash-t1--base Cochineal-Italic "AutoEnc_e2lzvuqkkbu3ypv5etrgppf3jb ReEncodeFont" <[coch_e2lzvu.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tlf-ts1--base Cochineal-Italic "AutoEnc_7if63hlqcvwnd6mkgqleo6c7lb ReEncodeFont" <[coch_7if63h.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-ly1--base Cochineal-Italic "AutoEnc_apxmkorey7oxg4iswkfjbsza4g ReEncodeFont" <[coch_apxmko.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-ot1 Cochineal-Italic "AutoEnc_jykc3vvnwsjfsh5fckn6n2b35c ReEncodeFont" <[coch_jykc3v.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-t1--base Cochineal-Italic "AutoEnc_bqgjghgsxw3skxcshsizvbogbf ReEncodeFont" <[coch_bqgjgh.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-sc-ly1--base Cochineal-Italic "AutoEnc_j4a4qtsu33u6qxafrapfs5trga ReEncodeFont" <[coch_j4a4qt.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-sc-ot1--base Cochineal-Italic "AutoEnc_rs26kyqblm34y7rzo5w6xppj6c ReEncodeFont" <[coch_rs26ky.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-sc-t1--base Cochineal-Italic "AutoEnc_hie4zdxvpkisfj34prbtdi3wqf ReEncodeFont" <[coch_hie4zd.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-swash-ly1--base Cochineal-Italic "AutoEnc_xp3h6gsaiphswxxtzkmvvmlw3f ReEncodeFont" <[coch_xp3h6g.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-swash-ot1 Cochineal-Italic "AutoEnc_uy5zmpnwvje7efyesevvsxsaxc ReEncodeFont" <[coch_uy5zmp.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-swash-t1--base Cochineal-Italic "AutoEnc_mzcfhrb3khstgj7fzpqcrqvdva ReEncodeFont" <[coch_mzcfhr.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-ts1--base Cochineal-Italic "AutoEnc_r66dduxcnu23sc5vvayh2r56qd ReEncodeFont" <[coch_r66ddu.enc <Cochineal-Italic.pfb
-Cochineal-Italic-sup-ly1--base Cochineal-Italic "AutoEnc_bhg4oq7l5lgzmgg2epxjedybxe ReEncodeFont" <[coch_bhg4oq.enc <Cochineal-Italic.pfb
-Cochineal-Italic-sup-ot1 Cochineal-Italic "AutoEnc_aazvtbaezg7tjjuu6wyzmhjbbg ReEncodeFont" <[coch_aazvtb.enc <Cochineal-Italic.pfb
-Cochineal-Italic-sup-t1--base Cochineal-Italic "AutoEnc_q5rvqtqmmsyxfpjzbvnwxdp4gc ReEncodeFont" <[coch_q5rvqt.enc <Cochineal-Italic.pfb
-Cochineal-Italic-osf-ly1--base Cochineal-Italic "AutoEnc_tub2znqwhvq5g62zgywqrmvsof ReEncodeFont" <[coch_tub2zn.enc <Cochineal-Italic.pfb
-Cochineal-Italic-osf-ot1 Cochineal-Italic "AutoEnc_6ycxmblq3v5evew3632hl5iyyg ReEncodeFont" <[coch_6ycxmb.enc <Cochineal-Italic.pfb
-Cochineal-Italic-osf-t1--base Cochineal-Italic "AutoEnc_2lyzkihyil54xogctfz3vxrbna ReEncodeFont" <[coch_2lyzki.enc <Cochineal-Italic.pfb
-Cochineal-Italic-osf-sc-ly1--base Cochineal-Italic "AutoEnc_sdyb62zv6jvie5v5ltsnstc2ka ReEncodeFont" <[coch_sdyb62.enc <Cochineal-Italic.pfb
-Cochineal-Italic-osf-sc-ot1--base Cochineal-Italic "AutoEnc_7tfxxexjsky7qvienwcjzrgprd ReEncodeFont" <[coch_7tfxxe.enc <Cochineal-Italic.pfb
-Cochineal-Italic-osf-sc-t1--base Cochineal-Italic "AutoEnc_l6dununypfxtstvzqlohzhqsne ReEncodeFont" <[coch_l6dunu.enc <Cochineal-Italic.pfb
-Cochineal-Italic-osf-swash-ly1--base Cochineal-Italic "AutoEnc_ofxlj765jxhraqbgssmodmf2lc ReEncodeFont" <[coch_ofxlj7.enc <Cochineal-Italic.pfb
-Cochineal-Italic-osf-swash-ot1 Cochineal-Italic "AutoEnc_5to7wujtnlqezunvxooho5nmne ReEncodeFont" <[coch_5to7wu.enc <Cochineal-Italic.pfb
-Cochineal-Italic-osf-swash-t1--base Cochineal-Italic "AutoEnc_zetixvfltpl2veewynyuordzxe ReEncodeFont" <[coch_zetixv.enc <Cochineal-Italic.pfb
-Cochineal-Italic-osf-ts1--base Cochineal-Italic "AutoEnc_r66dduxcnu23sc5vvayh2r56qd ReEncodeFont" <[coch_r66ddu.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tosf-ly1--base Cochineal-Italic "AutoEnc_aa3d23ox57dj32ehzmpv7jgesf ReEncodeFont" <[coch_aa3d23.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tosf-ot1 Cochineal-Italic "AutoEnc_3zwcy7mhyx7t3a2fgwjxf23hne ReEncodeFont" <[coch_3zwcy7.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tosf-t1--base Cochineal-Italic "AutoEnc_qsfb2diqmu3cpvzvqotzkhxjrd ReEncodeFont" <[coch_qsfb2d.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tosf-sc-ly1--base Cochineal-Italic "AutoEnc_dv3gwvehw5ow3zomdoue7uw46a ReEncodeFont" <[coch_dv3gwv.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tosf-sc-ot1--base Cochineal-Italic "AutoEnc_lnko3pkepwotmbfzqg3ebq3l2g ReEncodeFont" <[coch_lnko3p.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tosf-sc-t1--base Cochineal-Italic "AutoEnc_l4bzf3n4slutjqtn4zlcxqv4nf ReEncodeFont" <[coch_l4bzf3.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tosf-swash-ly1--base Cochineal-Italic "AutoEnc_t4kqf4bhxqmbnvgf5cwsfi3lpf ReEncodeFont" <[coch_t4kqf4.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tosf-swash-ot1 Cochineal-Italic "AutoEnc_ddcf5yoy6knvtqadkv7quqgs7h ReEncodeFont" <[coch_ddcf5y.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tosf-swash-t1--base Cochineal-Italic "AutoEnc_sechmfdn7lhihsrzmqf2munkig ReEncodeFont" <[coch_sechmf.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tosf-ts1--base Cochineal-Italic "AutoEnc_7if63hlqcvwnd6mkgqleo6c7lb ReEncodeFont" <[coch_7if63h.enc <Cochineal-Italic.pfb
-Cochineal-Italic-inf-ly1--base Cochineal-Italic "AutoEnc_s35xpxh2r6a5kxkioiojo7hmih ReEncodeFont" <[coch_s35xpx.enc <Cochineal-Italic.pfb
-Cochineal-Italic-inf-ot1 Cochineal-Italic "AutoEnc_4csisidkuw7jk227kpk2dfjwtc ReEncodeFont" <[coch_4csisi.enc <Cochineal-Italic.pfb
-Cochineal-Italic-inf-t1--base Cochineal-Italic "AutoEnc_ghlqiwqo3vjgcyiw3yv6oyts7g ReEncodeFont" <[coch_ghlqiw.enc <Cochineal-Italic.pfb
-Cochineal-Roman-dnom-ly1 Cochineal-Roman "AutoEnc_asaeuhomp6jq33jba7evcnimfa ReEncodeFont" <[coch_asaeuh.enc <Cochineal-Roman.pfb
-Cochineal-Roman-dnom-ot1 Cochineal-Roman "AutoEnc_bwegkyzh5aayrwx6txeczip42f ReEncodeFont" <[coch_bwegky.enc <Cochineal-Roman.pfb
-Cochineal-Roman-dnom-t1--base Cochineal-Roman "AutoEnc_6nfbiuvrkzafzj6p67bvifwt6f ReEncodeFont" <[coch_6nfbiu.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tlf-ly1 Cochineal-Roman "AutoEnc_yska2anw3mg5u27vsvc4pbv4pd ReEncodeFont" <[coch_yska2a.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tlf-ot1 Cochineal-Roman "AutoEnc_r7lidjar54eq7qhj5t5tgqigbh ReEncodeFont" <[coch_r7lidj.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tlf-t1--base Cochineal-Roman "AutoEnc_ykcvhy4y3vowqgbw3kn47gb4ld ReEncodeFont" <[coch_ykcvhy.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tlf-sc-ly1--base Cochineal-Roman "AutoEnc_2m6jch3yivzxcrfqk7jlc2k32b ReEncodeFont" <[coch_2m6jch.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tlf-sc-ot1--base Cochineal-Roman "AutoEnc_ah6e6o2u4kcg6bnfmtrn35aacb ReEncodeFont" <[coch_ah6e6o.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tlf-sc-t1--base Cochineal-Roman "AutoEnc_ixjcasves6f4excjx4hvvehi3f ReEncodeFont" <[coch_ixjcas.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tlf-swash-ly1 Cochineal-Roman "AutoEnc_obm4y4566yama6mc2jucg6f24h ReEncodeFont" <[coch_obm4y4.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tlf-swash-ot1 Cochineal-Roman "AutoEnc_7qxkxr3jjy4xoojbgk2zrsvc6h ReEncodeFont" <[coch_7qxkxr.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tlf-swash-t1--base Cochineal-Roman "AutoEnc_hflk7giw3nug6wro5ugos23mad ReEncodeFont" <[coch_hflk7g.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tlf-ts1--base Cochineal-Roman "AutoEnc_wpmcrvovjnxaupz4xubjd4tosd ReEncodeFont" <[coch_wpmcrv.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-ly1 Cochineal-Roman "AutoEnc_5zktnyh27ec6a2o74zemco6sjb ReEncodeFont" <[coch_5zktny.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-ot1 Cochineal-Roman "AutoEnc_jykc3vvnwsjfsh5fckn6n2b35c ReEncodeFont" <[coch_jykc3v.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-t1--base Cochineal-Roman "AutoEnc_jf7qqqhlnxyyi2yyu2323lvrid ReEncodeFont" <[coch_jf7qqq.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-sc-ly1--base Cochineal-Roman "AutoEnc_2igcusqtvyr7eqhzuvss3fn7tg ReEncodeFont" <[coch_2igcus.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-sc-ot1--base Cochineal-Roman "AutoEnc_rgk3s5fmsueedasw52lo57yitb ReEncodeFont" <[coch_rgk3s5.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-sc-t1--base Cochineal-Roman "AutoEnc_c2ovjxopexrjjtvet5pyk2hb5a ReEncodeFont" <[coch_c2ovjx.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-swash-ly1 Cochineal-Roman "AutoEnc_4n5rlhixdduffs6onqne2mkzjf ReEncodeFont" <[coch_4n5rlh.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-swash-ot1 Cochineal-Roman "AutoEnc_uy5zmpnwvje7efyesevvsxsaxc ReEncodeFont" <[coch_uy5zmp.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-swash-t1--base Cochineal-Roman "AutoEnc_lnloax577ipanupjs5u2ywwt7a ReEncodeFont" <[coch_lnloax.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-ts1--base Cochineal-Roman "AutoEnc_v37ibet46e7xdo6jjwaba5cfwa ReEncodeFont" <[coch_v37ibe.enc <Cochineal-Roman.pfb
-Cochineal-Roman-sup-ly1 Cochineal-Roman "AutoEnc_dm4e5q6t3slhmuha2izbsoq7lg ReEncodeFont" <[coch_dm4e5q.enc <Cochineal-Roman.pfb
-Cochineal-Roman-sup-ot1 Cochineal-Roman "AutoEnc_aazvtbaezg7tjjuu6wyzmhjbbg ReEncodeFont" <[coch_aazvtb.enc <Cochineal-Roman.pfb
-Cochineal-Roman-sup-t1--base Cochineal-Roman "AutoEnc_3cbpzpkjwvzgfaamszcf4q4vzc ReEncodeFont" <[coch_3cbpzp.enc <Cochineal-Roman.pfb
-Cochineal-Roman-osf-ly1 Cochineal-Roman "AutoEnc_ajitlz75dmddi5zidm6vz32qef ReEncodeFont" <[coch_ajitlz.enc <Cochineal-Roman.pfb
-Cochineal-Roman-osf-ot1 Cochineal-Roman "AutoEnc_6ycxmblq3v5evew3632hl5iyyg ReEncodeFont" <[coch_6ycxmb.enc <Cochineal-Roman.pfb
-Cochineal-Roman-osf-t1--base Cochineal-Roman "AutoEnc_eluacw2sgkvuxabk7zozyqg4zc ReEncodeFont" <[coch_eluacw.enc <Cochineal-Roman.pfb
-Cochineal-Roman-osf-sc-ly1--base Cochineal-Roman "AutoEnc_3644xagjmfgwksc4wwpfyga2bg ReEncodeFont" <[coch_3644xa.enc <Cochineal-Roman.pfb
-Cochineal-Roman-osf-sc-ot1--base Cochineal-Roman "AutoEnc_4qv7jrl4hqiavnnohtujnufwld ReEncodeFont" <[coch_4qv7jr.enc <Cochineal-Roman.pfb
-Cochineal-Roman-osf-sc-t1--base Cochineal-Roman "AutoEnc_6qoxl4bvelxam3dp5rwblz32ig ReEncodeFont" <[coch_6qoxl4.enc <Cochineal-Roman.pfb
-Cochineal-Roman-osf-swash-ly1 Cochineal-Roman "AutoEnc_qgajnskmhkgdcvpsc42m7scwte ReEncodeFont" <[coch_qgajns.enc <Cochineal-Roman.pfb
-Cochineal-Roman-osf-swash-ot1 Cochineal-Roman "AutoEnc_5to7wujtnlqezunvxooho5nmne ReEncodeFont" <[coch_5to7wu.enc <Cochineal-Roman.pfb
-Cochineal-Roman-osf-swash-t1--base Cochineal-Roman "AutoEnc_in37z4mphjv75qb24ej6uuc3vd ReEncodeFont" <[coch_in37z4.enc <Cochineal-Roman.pfb
-Cochineal-Roman-osf-ts1--base Cochineal-Roman "AutoEnc_v37ibet46e7xdo6jjwaba5cfwa ReEncodeFont" <[coch_v37ibe.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tosf-ly1 Cochineal-Roman "AutoEnc_h42wtsz6v3zpbujpoqlfv3ynhg ReEncodeFont" <[coch_h42wts.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tosf-ot1 Cochineal-Roman "AutoEnc_3zwcy7mhyx7t3a2fgwjxf23hne ReEncodeFont" <[coch_3zwcy7.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tosf-t1--base Cochineal-Roman "AutoEnc_ggrwt7zizhgf542ajkvf4u7oab ReEncodeFont" <[coch_ggrwt7.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tosf-sc-ly1--base Cochineal-Roman "AutoEnc_cwrabpkqhaklukzyvif2vbl77e ReEncodeFont" <[coch_cwrabp.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tosf-sc-ot1--base Cochineal-Roman "AutoEnc_3rhvnkbmxuyzuc6qu3wcoygkvh ReEncodeFont" <[coch_3rhvnk.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tosf-sc-t1--base Cochineal-Roman "AutoEnc_mdoeadoadiikwyqbwafmc5rona ReEncodeFont" <[coch_mdoead.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tosf-swash-ly1 Cochineal-Roman "AutoEnc_panfjf32g4oneiboczljtt7h7h ReEncodeFont" <[coch_panfjf.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tosf-swash-ot1 Cochineal-Roman "AutoEnc_ddcf5yoy6knvtqadkv7quqgs7h ReEncodeFont" <[coch_ddcf5y.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tosf-swash-t1--base Cochineal-Roman "AutoEnc_fuig2f6uhg4ttwteye555gp2oe ReEncodeFont" <[coch_fuig2f.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tosf-ts1--base Cochineal-Roman "AutoEnc_wpmcrvovjnxaupz4xubjd4tosd ReEncodeFont" <[coch_wpmcrv.enc <Cochineal-Roman.pfb
-Cochineal-Roman-inf-ly1 Cochineal-Roman "AutoEnc_lhuxe4n3xqx6ma7bzomizttzgg ReEncodeFont" <[coch_lhuxe4.enc <Cochineal-Roman.pfb
-Cochineal-Roman-inf-ot1 Cochineal-Roman "AutoEnc_4csisidkuw7jk227kpk2dfjwtc ReEncodeFont" <[coch_4csisi.enc <Cochineal-Roman.pfb
-Cochineal-Roman-inf-t1--base Cochineal-Roman "AutoEnc_nyeh65oko4x5yvacj7zwfbpnzg ReEncodeFont" <[coch_nyeh65.enc <Cochineal-Roman.pfb
-Cochineal-Bold-osf-t2a--base Cochineal-Bold "AutoEnc_he5a7wezrmquhtb2a6bqmzwm4g ReEncodeFont" <[coch_he5a7w.enc <Cochineal-Bold.pfb
-Cochineal-Bold-osf-swash-t2a--base Cochineal-Bold "AutoEnc_wasnq6qtt7jndvxmzym7b3npna ReEncodeFont" <[coch_wasnq6.enc <Cochineal-Bold.pfb
-Cochineal-Bold-sup-t2a--base Cochineal-Bold "AutoEnc_tmv2urc6kxng72q7zgdbaokcxa ReEncodeFont" <[coch_tmv2ur.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tlf-t2a--base Cochineal-Bold "AutoEnc_gff4qkpv26su4hzxqnmd5jp4bg ReEncodeFont" <[coch_gff4qk.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tlf-swash-t2a--base Cochineal-Bold "AutoEnc_zbxipylmr733jcgwmdbk3cza4b ReEncodeFont" <[coch_zbxipy.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-t2a--base Cochineal-Bold "AutoEnc_bbsuchijhqlmybug6vm5ngm3ya ReEncodeFont" <[coch_bbsuch.enc <Cochineal-Bold.pfb
-Cochineal-Bold-lf-swash-t2a--base Cochineal-Bold "AutoEnc_br6gitlvvekrtn7gwjarmq5rlb ReEncodeFont" <[coch_br6git.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tosf-t2a--base Cochineal-Bold "AutoEnc_ikqf75dokqxybavgfbceon7ftg ReEncodeFont" <[coch_ikqf75.enc <Cochineal-Bold.pfb
-Cochineal-Bold-tosf-swash-t2a--base Cochineal-Bold "AutoEnc_7bfc6o54femkrvifuhj5cqlpxa ReEncodeFont" <[coch_7bfc6o.enc <Cochineal-Bold.pfb
-Cochineal-BoldItalic-osf-t2a--base Cochineal-BoldItalic "AutoEnc_nrtjg6zppjxxokjyvetw5fsz3g ReEncodeFont" <[coch_nrtjg6.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-osf-swash-t2a--base Cochineal-BoldItalic "AutoEnc_o5hvxogf35jo3jn5g2uofqn3vd ReEncodeFont" <[coch_o5hvxo.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-sup-t2a--base Cochineal-BoldItalic "AutoEnc_zrngc7q2jfof6ehvxhknqg45qf ReEncodeFont" <[coch_zrngc7.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tlf-t2a--base Cochineal-BoldItalic "AutoEnc_t6yhmvknuxjhek5ht3ziuwecla ReEncodeFont" <[coch_t6yhmv.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tlf-swash-t2a--base Cochineal-BoldItalic "AutoEnc_jax2k7hvjzvaguvh6vlxxkdagd ReEncodeFont" <[coch_jax2k7.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-t2a--base Cochineal-BoldItalic "AutoEnc_ep5tp773b5jpkwgsfzdipoal4b ReEncodeFont" <[coch_ep5tp7.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-lf-swash-t2a--base Cochineal-BoldItalic "AutoEnc_sciel5h7ghskuxne2h2dpxyxvh ReEncodeFont" <[coch_sciel5.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tosf-t2a--base Cochineal-BoldItalic "AutoEnc_ejj76ugujlzteezxrz7o646zib ReEncodeFont" <[coch_ejj76u.enc <Cochineal-BoldItalic.pfb
-Cochineal-BoldItalic-tosf-swash-t2a--base Cochineal-BoldItalic "AutoEnc_mnx4cz23bjzfc7hujjw727ivvb ReEncodeFont" <[coch_mnx4cz.enc <Cochineal-BoldItalic.pfb
-Cochineal-Italic-osf-t2a--base Cochineal-Italic "AutoEnc_nrtjg6zppjxxokjyvetw5fsz3g ReEncodeFont" <[coch_nrtjg6.enc <Cochineal-Italic.pfb
-Cochineal-Italic-osf-swash-t2a--base Cochineal-Italic "AutoEnc_o5hvxogf35jo3jn5g2uofqn3vd ReEncodeFont" <[coch_o5hvxo.enc <Cochineal-Italic.pfb
-Cochineal-Italic-sup-t2a--base Cochineal-Italic "AutoEnc_zrngc7q2jfof6ehvxhknqg45qf ReEncodeFont" <[coch_zrngc7.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tlf-t2a--base Cochineal-Italic "AutoEnc_t6yhmvknuxjhek5ht3ziuwecla ReEncodeFont" <[coch_t6yhmv.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tlf-swash-t2a--base Cochineal-Italic "AutoEnc_jax2k7hvjzvaguvh6vlxxkdagd ReEncodeFont" <[coch_jax2k7.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-t2a--base Cochineal-Italic "AutoEnc_ep5tp773b5jpkwgsfzdipoal4b ReEncodeFont" <[coch_ep5tp7.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-swash-t2a--base Cochineal-Italic "AutoEnc_sciel5h7ghskuxne2h2dpxyxvh ReEncodeFont" <[coch_sciel5.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tosf-t2a--base Cochineal-Italic "AutoEnc_ejj76ugujlzteezxrz7o646zib ReEncodeFont" <[coch_ejj76u.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tosf-swash-t2a--base Cochineal-Italic "AutoEnc_mnx4cz23bjzfc7hujjw727ivvb ReEncodeFont" <[coch_mnx4cz.enc <Cochineal-Italic.pfb
-Cochineal-Roman-osf-t2a--base Cochineal-Roman "AutoEnc_4gkh24pw2xdzzlmsj4eomsrkjd ReEncodeFont" <[coch_4gkh24.enc <Cochineal-Roman.pfb
-Cochineal-Roman-osf-swash-t2a--base Cochineal-Roman "AutoEnc_tt64guiu2ryefkpmh6iirnocgb ReEncodeFont" <[coch_tt64gu.enc <Cochineal-Roman.pfb
-Cochineal-Roman-sup-t2a--base Cochineal-Roman "AutoEnc_jdlm2xfychow5bfh2fsvpfkqoe ReEncodeFont" <[coch_jdlm2x.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tlf-t2a--base Cochineal-Roman "AutoEnc_av27fuo7rcu6gc3vguqacjckjg ReEncodeFont" <[coch_av27fu.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tlf-swash-t2a--base Cochineal-Roman "AutoEnc_x4y5r2czjj24i2en45kxqzee4e ReEncodeFont" <[coch_x4y5r2.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-t2a--base Cochineal-Roman "AutoEnc_4u6kmtbbjenlkl22paajpudw7b ReEncodeFont" <[coch_4u6kmt.enc <Cochineal-Roman.pfb
-Cochineal-Roman-lf-swash-t2a--base Cochineal-Roman "AutoEnc_3led4x6vfdonyn5urzyszbztre ReEncodeFont" <[coch_3led4x.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tosf-t2a--base Cochineal-Roman "AutoEnc_sm5q6np5iri6hpsa3h6sh37pnc ReEncodeFont" <[coch_sm5q6n.enc <Cochineal-Roman.pfb
-Cochineal-Roman-tosf-swash-t2a--base Cochineal-Roman "AutoEnc_kbcokb2h26e2uiof2g4sfhmxkd ReEncodeFont" <[coch_kbcokb.enc <Cochineal-Roman.pfb
+Cochineal-Bold-inf-ly1--base Cochineal-Bold "AutoEnc_zi2reucvqtgwgoqzrojvcpsqbe ReEncodeFont" <[coch_zi2reu.enc <Cochineal-Bold.pfb
+Cochineal-Bold-inf-ot1 Cochineal-Bold "AutoEnc_oxg6eqosr2a4bxceykpqbjm7jf ReEncodeFont" <[coch_oxg6eq.enc <Cochineal-Bold.pfb
+Cochineal-Bold-inf-t1--base Cochineal-Bold "AutoEnc_nxl6ldkbrawbju6gbw2dvb23hd ReEncodeFont" <[coch_nxl6ld.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tosf-ly1--base Cochineal-Bold "AutoEnc_ye47ub6xzugrzdmict62cgq3fb ReEncodeFont" <[coch_ye47ub.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tosf-ot1 Cochineal-Bold "AutoEnc_kj462mzbm275orhz5jkw4b43kf ReEncodeFont" <[coch_kj462m.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tosf-t1--base Cochineal-Bold "AutoEnc_uijgehseingifcm6vqtlieytpg ReEncodeFont" <[coch_uijgeh.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tosf-sc-ly1--base Cochineal-Bold "AutoEnc_ehnbpvkehyccjs7svp6ot3oine ReEncodeFont" <[coch_ehnbpv.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tosf-sc-ot1--base Cochineal-Bold "AutoEnc_462rlsjeinugk6xjimpds2ycqa ReEncodeFont" <[coch_462rls.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tosf-sc-t1--base Cochineal-Bold "AutoEnc_6iuvswur6skc4icjipjt2tngtb ReEncodeFont" <[coch_6iuvsw.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tosf-swash-ly1--base Cochineal-Bold "AutoEnc_2bdexd3bheqplp2o6xukmhzera ReEncodeFont" <[coch_2bdexd.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tosf-swash-ot1 Cochineal-Bold "AutoEnc_alu2zhctgc6e2jtnsb2xah2s7d ReEncodeFont" <[coch_alu2zh.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tosf-swash-t1--base Cochineal-Bold "AutoEnc_7dsvymb2elp4lhhlisrdlapfng ReEncodeFont" <[coch_7dsvym.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tosf-ts1--base Cochineal-Bold "AutoEnc_6xkbmkl3zqccaqybx5dyh57ome ReEncodeFont" <[coch_6xkbmk.enc <Cochineal-Bold.pfb
+Cochineal-Bold-osf-ly1--base Cochineal-Bold "AutoEnc_7n5ozwifmjdqmta6eqqsurutme ReEncodeFont" <[coch_7n5ozw.enc <Cochineal-Bold.pfb
+Cochineal-Bold-osf-ot1 Cochineal-Bold "AutoEnc_szq67c32xasehfpojpg3rdfsug ReEncodeFont" <[coch_szq67c.enc <Cochineal-Bold.pfb
+Cochineal-Bold-osf-t1--base Cochineal-Bold "AutoEnc_aiszvioatmgagbut46lhbf6ebh ReEncodeFont" <[coch_aiszvi.enc <Cochineal-Bold.pfb
+Cochineal-Bold-osf-sc-ly1--base Cochineal-Bold "AutoEnc_7wf6546ucxuem4rfi6fq3qv6cg ReEncodeFont" <[coch_7wf654.enc <Cochineal-Bold.pfb
+Cochineal-Bold-osf-sc-ot1--base Cochineal-Bold "AutoEnc_irjahvsqtr56xb5ljosnqymrfb ReEncodeFont" <[coch_irjahv.enc <Cochineal-Bold.pfb
+Cochineal-Bold-osf-sc-t1--base Cochineal-Bold "AutoEnc_nwjjp7jze6vwsjvylr6ioz4cnd ReEncodeFont" <[coch_nwjjp7.enc <Cochineal-Bold.pfb
+Cochineal-Bold-osf-swash-ly1--base Cochineal-Bold "AutoEnc_z5w3bg7nzfmfekongww5rmwfvb ReEncodeFont" <[coch_z5w3bg.enc <Cochineal-Bold.pfb
+Cochineal-Bold-osf-swash-ot1 Cochineal-Bold "AutoEnc_t6bbzldy32fumigptwyfjpktpf ReEncodeFont" <[coch_t6bbzl.enc <Cochineal-Bold.pfb
+Cochineal-Bold-osf-swash-t1--base Cochineal-Bold "AutoEnc_fiecpaq43umhqpg7ygx2qunm5h ReEncodeFont" <[coch_fiecpa.enc <Cochineal-Bold.pfb
+Cochineal-Bold-osf-ts1--base Cochineal-Bold "AutoEnc_6xkbmkl3zqccaqybx5dyh57ome ReEncodeFont" <[coch_6xkbmk.enc <Cochineal-Bold.pfb
+Cochineal-Bold-sup-ly1--base Cochineal-Bold "AutoEnc_2lm36bljrtfzfgm3j66m43i3nd ReEncodeFont" <[coch_2lm36b.enc <Cochineal-Bold.pfb
+Cochineal-Bold-sup-ot1 Cochineal-Bold "AutoEnc_yrma2dtehmfob7exx2dpdhiwsa ReEncodeFont" <[coch_yrma2d.enc <Cochineal-Bold.pfb
+Cochineal-Bold-sup-t1--base Cochineal-Bold "AutoEnc_f6gyh3en4btxeafjq2sk35t2de ReEncodeFont" <[coch_f6gyh3.enc <Cochineal-Bold.pfb
+Cochineal-Bold-dnom-ly1--base Cochineal-Bold "AutoEnc_rt47ufp67eamu2lpwwwilkt7bc ReEncodeFont" <[coch_rt47uf.enc <Cochineal-Bold.pfb
+Cochineal-Bold-dnom-ot1 Cochineal-Bold "AutoEnc_j5n6tqfmfcjogmntrdb6k7zwrc ReEncodeFont" <[coch_j5n6tq.enc <Cochineal-Bold.pfb
+Cochineal-Bold-dnom-t1--base Cochineal-Bold "AutoEnc_l35a4cqz5d6bagoehhtwfmasga ReEncodeFont" <[coch_l35a4c.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tlf-ly1--base Cochineal-Bold "AutoEnc_pzuqaavtjtpeu6knd5tj2vapkd ReEncodeFont" <[coch_pzuqaa.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tlf-ot1 Cochineal-Bold "AutoEnc_3uwymqsd6ycnc2tcu2qfe5itkh ReEncodeFont" <[coch_3uwymq.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tlf-t1--base Cochineal-Bold "AutoEnc_5iuvneucbvorso2wvejyt7lv7b ReEncodeFont" <[coch_5iuvne.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tlf-sc-ly1--base Cochineal-Bold "AutoEnc_4w37pe64v3eq3yxyufs2ifskka ReEncodeFont" <[coch_4w37pe.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tlf-sc-ot1--base Cochineal-Bold "AutoEnc_nxryuqgiyzui7oedcyuyf2se5c ReEncodeFont" <[coch_nxryuq.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tlf-sc-t1--base Cochineal-Bold "AutoEnc_l5f66w6zasibyyrcc7mimjdw4c ReEncodeFont" <[coch_l5f66w.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tlf-swash-ly1--base Cochineal-Bold "AutoEnc_jwtej46ikg63o2bjthb2ofxtxe ReEncodeFont" <[coch_jwtej4.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tlf-swash-ot1 Cochineal-Bold "AutoEnc_2gcnb2qqzo2t7amd4qeyt2gflf ReEncodeFont" <[coch_2gcnb2.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tlf-swash-t1--base Cochineal-Bold "AutoEnc_xaqz74ppfrzr3zyulmndubiqab ReEncodeFont" <[coch_xaqz74.enc <Cochineal-Bold.pfb
+Cochineal-Bold-tlf-ts1--base Cochineal-Bold "AutoEnc_6xkbmkl3zqccaqybx5dyh57ome ReEncodeFont" <[coch_6xkbmk.enc <Cochineal-Bold.pfb
+Cochineal-Bold-lf-ly1--base Cochineal-Bold "AutoEnc_kdbvpjkfbhagbkmjybnta65fib ReEncodeFont" <[coch_kdbvpj.enc <Cochineal-Bold.pfb
+Cochineal-Bold-lf-ot1 Cochineal-Bold "AutoEnc_ygzcii43eqiw6k2asz2ejehvjg ReEncodeFont" <[coch_ygzcii.enc <Cochineal-Bold.pfb
+Cochineal-Bold-lf-t1--base Cochineal-Bold "AutoEnc_mqh25steqi22gkdynmjpbb3jvd ReEncodeFont" <[coch_mqh25s.enc <Cochineal-Bold.pfb
+Cochineal-Bold-lf-sc-ly1--base Cochineal-Bold "AutoEnc_pauxlorik63pb4y4uyiln5hklg ReEncodeFont" <[coch_pauxlo.enc <Cochineal-Bold.pfb
+Cochineal-Bold-lf-sc-ot1--base Cochineal-Bold "AutoEnc_un2dh6jhgg6fp4xrax3n6r2hsa ReEncodeFont" <[coch_un2dh6.enc <Cochineal-Bold.pfb
+Cochineal-Bold-lf-sc-t1--base Cochineal-Bold "AutoEnc_c4bkpi3savowvqs5e673sjzvka ReEncodeFont" <[coch_c4bkpi.enc <Cochineal-Bold.pfb
+Cochineal-Bold-lf-swash-ly1--base Cochineal-Bold "AutoEnc_bebzcdw5tofjbeemat4lxq42we ReEncodeFont" <[coch_bebzcd.enc <Cochineal-Bold.pfb
+Cochineal-Bold-lf-swash-ot1 Cochineal-Bold "AutoEnc_e3g2vupqmfkvq73zoliw5gbd2g ReEncodeFont" <[coch_e3g2vu.enc <Cochineal-Bold.pfb
+Cochineal-Bold-lf-swash-t1--base Cochineal-Bold "AutoEnc_aonoagx5km2dirxcekh7la3hwb ReEncodeFont" <[coch_aonoag.enc <Cochineal-Bold.pfb
+Cochineal-Bold-lf-ts1--base Cochineal-Bold "AutoEnc_6xkbmkl3zqccaqybx5dyh57ome ReEncodeFont" <[coch_6xkbmk.enc <Cochineal-Bold.pfb
+Cochineal-BoldItalic-inf-ly1--base Cochineal-BoldItalic "AutoEnc_zi2reucvqtgwgoqzrojvcpsqbe ReEncodeFont" <[coch_zi2reu.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-inf-ot1 Cochineal-BoldItalic "AutoEnc_oxg6eqosr2a4bxceykpqbjm7jf ReEncodeFont" <[coch_oxg6eq.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-inf-t1--base Cochineal-BoldItalic "AutoEnc_nxl6ldkbrawbju6gbw2dvb23hd ReEncodeFont" <[coch_nxl6ld.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tosf-ly1--base Cochineal-BoldItalic "AutoEnc_ye47ub6xzugrzdmict62cgq3fb ReEncodeFont" <[coch_ye47ub.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tosf-ot1 Cochineal-BoldItalic "AutoEnc_kj462mzbm275orhz5jkw4b43kf ReEncodeFont" <[coch_kj462m.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tosf-t1--base Cochineal-BoldItalic "AutoEnc_uijgehseingifcm6vqtlieytpg ReEncodeFont" <[coch_uijgeh.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tosf-sc-ly1--base Cochineal-BoldItalic "AutoEnc_yfllcfgb4lhxazxknesw4gaslf ReEncodeFont" <[coch_yfllcf.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tosf-sc-ot1--base Cochineal-BoldItalic "AutoEnc_7iao2dniakbyfe3c67e5nvit2h ReEncodeFont" <[coch_7iao2d.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tosf-sc-t1--base Cochineal-BoldItalic "AutoEnc_a2bs3vm2rjznnueklgt6o373sb ReEncodeFont" <[coch_a2bs3v.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tosf-swash-ly1--base Cochineal-BoldItalic "AutoEnc_2bdexd3bheqplp2o6xukmhzera ReEncodeFont" <[coch_2bdexd.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tosf-swash-ot1 Cochineal-BoldItalic "AutoEnc_alu2zhctgc6e2jtnsb2xah2s7d ReEncodeFont" <[coch_alu2zh.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tosf-swash-t1--base Cochineal-BoldItalic "AutoEnc_7dsvymb2elp4lhhlisrdlapfng ReEncodeFont" <[coch_7dsvym.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tosf-ts1--base Cochineal-BoldItalic "AutoEnc_6xkbmkl3zqccaqybx5dyh57ome ReEncodeFont" <[coch_6xkbmk.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-osf-ly1--base Cochineal-BoldItalic "AutoEnc_7n5ozwifmjdqmta6eqqsurutme ReEncodeFont" <[coch_7n5ozw.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-osf-ot1 Cochineal-BoldItalic "AutoEnc_szq67c32xasehfpojpg3rdfsug ReEncodeFont" <[coch_szq67c.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-osf-t1--base Cochineal-BoldItalic "AutoEnc_aiszvioatmgagbut46lhbf6ebh ReEncodeFont" <[coch_aiszvi.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-osf-sc-ly1--base Cochineal-BoldItalic "AutoEnc_eyy6oetl7xvgw5z27q5rks4a5a ReEncodeFont" <[coch_eyy6oe.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-osf-sc-ot1--base Cochineal-BoldItalic "AutoEnc_3ckcz6agums4m3r5kvdmiodwaa ReEncodeFont" <[coch_3ckcz6.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-osf-sc-t1--base Cochineal-BoldItalic "AutoEnc_bhawimte6yf2vqtvpcc2c27woa ReEncodeFont" <[coch_bhawim.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-osf-swash-ly1--base Cochineal-BoldItalic "AutoEnc_z5w3bg7nzfmfekongww5rmwfvb ReEncodeFont" <[coch_z5w3bg.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-osf-swash-ot1 Cochineal-BoldItalic "AutoEnc_t6bbzldy32fumigptwyfjpktpf ReEncodeFont" <[coch_t6bbzl.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-osf-swash-t1--base Cochineal-BoldItalic "AutoEnc_fiecpaq43umhqpg7ygx2qunm5h ReEncodeFont" <[coch_fiecpa.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-osf-ts1--base Cochineal-BoldItalic "AutoEnc_6xkbmkl3zqccaqybx5dyh57ome ReEncodeFont" <[coch_6xkbmk.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-sup-ly1--base Cochineal-BoldItalic "AutoEnc_2lm36bljrtfzfgm3j66m43i3nd ReEncodeFont" <[coch_2lm36b.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-sup-ot1 Cochineal-BoldItalic "AutoEnc_yrma2dtehmfob7exx2dpdhiwsa ReEncodeFont" <[coch_yrma2d.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-sup-t1--base Cochineal-BoldItalic "AutoEnc_f6gyh3en4btxeafjq2sk35t2de ReEncodeFont" <[coch_f6gyh3.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-dnom-ly1--base Cochineal-BoldItalic "AutoEnc_rt47ufp67eamu2lpwwwilkt7bc ReEncodeFont" <[coch_rt47uf.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-dnom-ot1 Cochineal-BoldItalic "AutoEnc_j5n6tqfmfcjogmntrdb6k7zwrc ReEncodeFont" <[coch_j5n6tq.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-dnom-t1--base Cochineal-BoldItalic "AutoEnc_l35a4cqz5d6bagoehhtwfmasga ReEncodeFont" <[coch_l35a4c.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tlf-ly1--base Cochineal-BoldItalic "AutoEnc_pzuqaavtjtpeu6knd5tj2vapkd ReEncodeFont" <[coch_pzuqaa.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tlf-ot1 Cochineal-BoldItalic "AutoEnc_3uwymqsd6ycnc2tcu2qfe5itkh ReEncodeFont" <[coch_3uwymq.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tlf-t1--base Cochineal-BoldItalic "AutoEnc_5iuvneucbvorso2wvejyt7lv7b ReEncodeFont" <[coch_5iuvne.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tlf-sc-ly1--base Cochineal-BoldItalic "AutoEnc_3knxwxu4r25ng4o3o7xjzxfu5e ReEncodeFont" <[coch_3knxwx.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tlf-sc-ot1--base Cochineal-BoldItalic "AutoEnc_5dxihil3gosz2b753ewpmuje6e ReEncodeFont" <[coch_5dxihi.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tlf-sc-t1--base Cochineal-BoldItalic "AutoEnc_qxsaxpv7mkjqy44m7dytww4x4g ReEncodeFont" <[coch_qxsaxp.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tlf-swash-ly1--base Cochineal-BoldItalic "AutoEnc_jwtej46ikg63o2bjthb2ofxtxe ReEncodeFont" <[coch_jwtej4.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tlf-swash-ot1 Cochineal-BoldItalic "AutoEnc_2gcnb2qqzo2t7amd4qeyt2gflf ReEncodeFont" <[coch_2gcnb2.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tlf-swash-t1--base Cochineal-BoldItalic "AutoEnc_xaqz74ppfrzr3zyulmndubiqab ReEncodeFont" <[coch_xaqz74.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-tlf-ts1--base Cochineal-BoldItalic "AutoEnc_6xkbmkl3zqccaqybx5dyh57ome ReEncodeFont" <[coch_6xkbmk.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-lf-ly1--base Cochineal-BoldItalic "AutoEnc_kdbvpjkfbhagbkmjybnta65fib ReEncodeFont" <[coch_kdbvpj.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-lf-ot1 Cochineal-BoldItalic "AutoEnc_ygzcii43eqiw6k2asz2ejehvjg ReEncodeFont" <[coch_ygzcii.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-lf-t1--base Cochineal-BoldItalic "AutoEnc_mqh25steqi22gkdynmjpbb3jvd ReEncodeFont" <[coch_mqh25s.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-lf-sc-ly1--base Cochineal-BoldItalic "AutoEnc_2hlaypvjknmdmdwlmdelewm4ph ReEncodeFont" <[coch_2hlayp.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-lf-sc-ot1--base Cochineal-BoldItalic "AutoEnc_avobnlxicnmtwub47b62mqsysd ReEncodeFont" <[coch_avobnl.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-lf-sc-t1--base Cochineal-BoldItalic "AutoEnc_mlajwisaovo3plx2ve7fuftjdg ReEncodeFont" <[coch_mlajwi.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-lf-swash-ly1--base Cochineal-BoldItalic "AutoEnc_bebzcdw5tofjbeemat4lxq42we ReEncodeFont" <[coch_bebzcd.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-lf-swash-ot1 Cochineal-BoldItalic "AutoEnc_e3g2vupqmfkvq73zoliw5gbd2g ReEncodeFont" <[coch_e3g2vu.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-lf-swash-t1--base Cochineal-BoldItalic "AutoEnc_aonoagx5km2dirxcekh7la3hwb ReEncodeFont" <[coch_aonoag.enc <Cochineal-BoldItalic.pfb
+Cochineal-BoldItalic-lf-ts1--base Cochineal-BoldItalic "AutoEnc_6xkbmkl3zqccaqybx5dyh57ome ReEncodeFont" <[coch_6xkbmk.enc <Cochineal-BoldItalic.pfb
+Cochineal-Italic-inf-ly1--base Cochineal-Italic "AutoEnc_ulikgonxp7foe5n72ilqcte4xa ReEncodeFont" <[coch_ulikgo.enc <Cochineal-Italic.pfb
+Cochineal-Italic-inf-ot1 Cochineal-Italic "AutoEnc_gujmrcyzp7e3vvbkcuesnl4gxb ReEncodeFont" <[coch_gujmrc.enc <Cochineal-Italic.pfb
+Cochineal-Italic-inf-t1--base Cochineal-Italic "AutoEnc_nxl6ldkbrawbju6gbw2dvb23hd ReEncodeFont" <[coch_nxl6ld.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tosf-ly1--base Cochineal-Italic "AutoEnc_ptok33kbty7wonypumq2sjnmkc ReEncodeFont" <[coch_ptok33.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tosf-ot1 Cochineal-Italic "AutoEnc_eecs2oia4uua7j7dwgorxlswef ReEncodeFont" <[coch_eecs2o.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tosf-t1--base Cochineal-Italic "AutoEnc_uijgehseingifcm6vqtlieytpg ReEncodeFont" <[coch_uijgeh.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tosf-sc-ly1--base Cochineal-Italic "AutoEnc_atrkq46e4ea7b6gr32p6d6wbpe ReEncodeFont" <[coch_atrkq4.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tosf-sc-ot1--base Cochineal-Italic "AutoEnc_5g7rclcrr5zkeag2ydoawrqhqa ReEncodeFont" <[coch_5g7rcl.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tosf-sc-t1--base Cochineal-Italic "AutoEnc_dgjfknhqalenbw2pipatvxjn5b ReEncodeFont" <[coch_dgjfkn.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tosf-swash-ly1--base Cochineal-Italic "AutoEnc_6n7xb4k65uam6j32wkkxchqjke ReEncodeFont" <[coch_6n7xb4.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tosf-swash-ot1 Cochineal-Italic "AutoEnc_wxpvz34f7sooyvb2qk33esqjib ReEncodeFont" <[coch_wxpvz3.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tosf-swash-t1--base Cochineal-Italic "AutoEnc_7dsvymb2elp4lhhlisrdlapfng ReEncodeFont" <[coch_7dsvym.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tosf-ts1--base Cochineal-Italic "AutoEnc_vrrrznqlwbcw5dtu6h7v66ufnh ReEncodeFont" <[coch_vrrrzn.enc <Cochineal-Italic.pfb
+Cochineal-Italic-osf-ly1--base Cochineal-Italic "AutoEnc_zd4idy26fkltx273purfquv3lc ReEncodeFont" <[coch_zd4idy.enc <Cochineal-Italic.pfb
+Cochineal-Italic-osf-ot1 Cochineal-Italic "AutoEnc_pyiqqvr6zjl5tgrvwyf3ahtrlf ReEncodeFont" <[coch_pyiqqv.enc <Cochineal-Italic.pfb
+Cochineal-Italic-osf-t1--base Cochineal-Italic "AutoEnc_aiszvioatmgagbut46lhbf6ebh ReEncodeFont" <[coch_aiszvi.enc <Cochineal-Italic.pfb
+Cochineal-Italic-osf-sc-ly1--base Cochineal-Italic "AutoEnc_zs6x3rg46l4kvjmvgwv2ahrevh ReEncodeFont" <[coch_zs6x3r.enc <Cochineal-Italic.pfb
+Cochineal-Italic-osf-sc-ot1--base Cochineal-Italic "AutoEnc_72apy2krs65x6sfwplhei5hiad ReEncodeFont" <[coch_72apy2.enc <Cochineal-Italic.pfb
+Cochineal-Italic-osf-sc-t1--base Cochineal-Italic "AutoEnc_arhfdyx6yjijj2nyyirhoswr2g ReEncodeFont" <[coch_arhfdy.enc <Cochineal-Italic.pfb
+Cochineal-Italic-osf-swash-ly1--base Cochineal-Italic "AutoEnc_ankljjoqw6lfcrqpceyasnkk5e ReEncodeFont" <[coch_ankljj.enc <Cochineal-Italic.pfb
+Cochineal-Italic-osf-swash-ot1 Cochineal-Italic "AutoEnc_7ylujtvhkdkummpgarkbptl2zf ReEncodeFont" <[coch_7ylujt.enc <Cochineal-Italic.pfb
+Cochineal-Italic-osf-swash-t1--base Cochineal-Italic "AutoEnc_fiecpaq43umhqpg7ygx2qunm5h ReEncodeFont" <[coch_fiecpa.enc <Cochineal-Italic.pfb
+Cochineal-Italic-osf-ts1--base Cochineal-Italic "AutoEnc_vrrrznqlwbcw5dtu6h7v66ufnh ReEncodeFont" <[coch_vrrrzn.enc <Cochineal-Italic.pfb
+Cochineal-Italic-sup-ly1--base Cochineal-Italic "AutoEnc_oz3bqnjk6mmdxduv5yldlglrxe ReEncodeFont" <[coch_oz3bqn.enc <Cochineal-Italic.pfb
+Cochineal-Italic-sup-ot1 Cochineal-Italic "AutoEnc_wbw3s6kt7a3nulrxt3rgostbla ReEncodeFont" <[coch_wbw3s6.enc <Cochineal-Italic.pfb
+Cochineal-Italic-sup-t1--base Cochineal-Italic "AutoEnc_f6gyh3en4btxeafjq2sk35t2de ReEncodeFont" <[coch_f6gyh3.enc <Cochineal-Italic.pfb
+Cochineal-Italic-dnom-ly1--base Cochineal-Italic "AutoEnc_iatrlrrvj2a7g6mmbulciuxg7g ReEncodeFont" <[coch_iatrlr.enc <Cochineal-Italic.pfb
+Cochineal-Italic-dnom-ot1 Cochineal-Italic "AutoEnc_lbfs4waeh3n3wb64wvmynmaede ReEncodeFont" <[coch_lbfs4w.enc <Cochineal-Italic.pfb
+Cochineal-Italic-dnom-t1--base Cochineal-Italic "AutoEnc_l35a4cqz5d6bagoehhtwfmasga ReEncodeFont" <[coch_l35a4c.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tlf-ly1--base Cochineal-Italic "AutoEnc_3pp4wv2uj6mmdoq3sg7cdfphkf ReEncodeFont" <[coch_3pp4wv.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tlf-ot1 Cochineal-Italic "AutoEnc_6samag633x7qv5delozyb3m3nd ReEncodeFont" <[coch_6samag.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tlf-t1--base Cochineal-Italic "AutoEnc_5iuvneucbvorso2wvejyt7lv7b ReEncodeFont" <[coch_5iuvne.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tlf-sc-ly1--base Cochineal-Italic "AutoEnc_lmiqvaclzuykdqmvvs5b32qitd ReEncodeFont" <[coch_lmiqva.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tlf-sc-ot1--base Cochineal-Italic "AutoEnc_auhtqrrsun2sgdw5eyoygubv5g ReEncodeFont" <[coch_auhtqr.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tlf-sc-t1--base Cochineal-Italic "AutoEnc_ixgauzjoc5rxzvxhp5y75vym6e ReEncodeFont" <[coch_ixgauz.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tlf-swash-ly1--base Cochineal-Italic "AutoEnc_ayubbyqyvxmd7caho34ukudcqf ReEncodeFont" <[coch_ayubby.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tlf-swash-ot1 Cochineal-Italic "AutoEnc_tx56nexhp4egj56rj7sczo4kaf ReEncodeFont" <[coch_tx56ne.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tlf-swash-t1--base Cochineal-Italic "AutoEnc_xaqz74ppfrzr3zyulmndubiqab ReEncodeFont" <[coch_xaqz74.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tlf-ts1--base Cochineal-Italic "AutoEnc_vrrrznqlwbcw5dtu6h7v66ufnh ReEncodeFont" <[coch_vrrrzn.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-ly1--base Cochineal-Italic "AutoEnc_gbdy7gnwiokzptgmeoou4ywn3a ReEncodeFont" <[coch_gbdy7g.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-ot1 Cochineal-Italic "AutoEnc_hd573sojpnzhshqzj7xo6j25ja ReEncodeFont" <[coch_hd573s.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-t1--base Cochineal-Italic "AutoEnc_mqh25steqi22gkdynmjpbb3jvd ReEncodeFont" <[coch_mqh25s.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-sc-ly1--base Cochineal-Italic "AutoEnc_4kirwgvpfcoydkjgxkwsln6hdb ReEncodeFont" <[coch_4kirwg.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-sc-ot1--base Cochineal-Italic "AutoEnc_wtyigcd5mdigtin22wb6owbswh ReEncodeFont" <[coch_wtyigc.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-sc-t1--base Cochineal-Italic "AutoEnc_xx26vs2xbht3ltk5dl2ifojy2e ReEncodeFont" <[coch_xx26vs.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-swash-ly1--base Cochineal-Italic "AutoEnc_tpli6v2hu6noikpswpwqhuwcog ReEncodeFont" <[coch_tpli6v.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-swash-ot1 Cochineal-Italic "AutoEnc_isal6ugo5yoko6jknukdppi4lg ReEncodeFont" <[coch_isal6u.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-swash-t1--base Cochineal-Italic "AutoEnc_aonoagx5km2dirxcekh7la3hwb ReEncodeFont" <[coch_aonoag.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-ts1--base Cochineal-Italic "AutoEnc_vrrrznqlwbcw5dtu6h7v66ufnh ReEncodeFont" <[coch_vrrrzn.enc <Cochineal-Italic.pfb
+Cochineal-Roman-inf-ly1 Cochineal-Roman "AutoEnc_u523j7ljlmakgan3zz3dmoea4g ReEncodeFont" <[coch_u523j7.enc <Cochineal-Roman.pfb
+Cochineal-Roman-inf-ot1 Cochineal-Roman "AutoEnc_dpslmojvuql3ou6lxoqbln6rka ReEncodeFont" <[coch_dpslmo.enc <Cochineal-Roman.pfb
+Cochineal-Roman-inf-t1--base Cochineal-Roman "AutoEnc_3ahcfywe37dany2hmtslgvhu6b ReEncodeFont" <[coch_3ahcfy.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tosf-ly1 Cochineal-Roman "AutoEnc_r4azz6amdntt6lspyzh3otljpe ReEncodeFont" <[coch_r4azz6.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tosf-ot1 Cochineal-Roman "AutoEnc_i4iossdmew24jyu7dmrvxalh3a ReEncodeFont" <[coch_i4ioss.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tosf-t1--base Cochineal-Roman "AutoEnc_zwlvmjlsfprbhixyd7yelmczwg ReEncodeFont" <[coch_zwlvmj.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tosf-sc-ly1--base Cochineal-Roman "AutoEnc_mxqklui2cz3uivj2jkxxoouk7c ReEncodeFont" <[coch_mxqklu.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tosf-sc-ot1--base Cochineal-Roman "AutoEnc_j7segjn7gjh4bgkgusrq3evpge ReEncodeFont" <[coch_j7segj.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tosf-sc-t1--base Cochineal-Roman "AutoEnc_raqkati653noovxlrl4iw35cbe ReEncodeFont" <[coch_raqkat.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tosf-swash-ly1 Cochineal-Roman "AutoEnc_ksvfeytniyxjikxj54uvcpjp3a ReEncodeFont" <[coch_ksvfey.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tosf-swash-ot1 Cochineal-Roman "AutoEnc_cipscccaapzswuamqjr3qamnhd ReEncodeFont" <[coch_cipscc.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tosf-swash-t1--base Cochineal-Roman "AutoEnc_ernfwgkcnnskrvyw626vfei46g ReEncodeFont" <[coch_ernfwg.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tosf-ts1--base Cochineal-Roman "AutoEnc_7uj7iokoaokbvpxwp2bnnoqsbe ReEncodeFont" <[coch_7uj7io.enc <Cochineal-Roman.pfb
+Cochineal-Roman-osf-ly1 Cochineal-Roman "AutoEnc_fhk6mzqd6yu4to5ncysyg2z7re ReEncodeFont" <[coch_fhk6mz.enc <Cochineal-Roman.pfb
+Cochineal-Roman-osf-ot1 Cochineal-Roman "AutoEnc_sk33hx2ctkkfhfdub4kls2f6yb ReEncodeFont" <[coch_sk33hx.enc <Cochineal-Roman.pfb
+Cochineal-Roman-osf-t1--base Cochineal-Roman "AutoEnc_5ye6emtshbvxfaac7ctanvfiwd ReEncodeFont" <[coch_5ye6em.enc <Cochineal-Roman.pfb
+Cochineal-Roman-osf-sc-ly1--base Cochineal-Roman "AutoEnc_nzj7ho6yuclyfo2xkkbajiyf3g ReEncodeFont" <[coch_nzj7ho.enc <Cochineal-Roman.pfb
+Cochineal-Roman-osf-sc-ot1--base Cochineal-Roman "AutoEnc_3lkmdqkeptmwde6bufkz6esege ReEncodeFont" <[coch_3lkmdq.enc <Cochineal-Roman.pfb
+Cochineal-Roman-osf-sc-t1--base Cochineal-Roman "AutoEnc_tehpoo5xuuvqdkjgcfcyerw5jh ReEncodeFont" <[coch_tehpoo.enc <Cochineal-Roman.pfb
+Cochineal-Roman-osf-swash-ly1 Cochineal-Roman "AutoEnc_jfgxgm56cq6ww72o3ladlxjwwa ReEncodeFont" <[coch_jfgxgm.enc <Cochineal-Roman.pfb
+Cochineal-Roman-osf-swash-ot1 Cochineal-Roman "AutoEnc_zceo5tfblq7iby3q6lg555vocg ReEncodeFont" <[coch_zceo5t.enc <Cochineal-Roman.pfb
+Cochineal-Roman-osf-swash-t1--base Cochineal-Roman "AutoEnc_rkk6xvvosilug47drzmm3ko7te ReEncodeFont" <[coch_rkk6xv.enc <Cochineal-Roman.pfb
+Cochineal-Roman-osf-ts1--base Cochineal-Roman "AutoEnc_7uj7iokoaokbvpxwp2bnnoqsbe ReEncodeFont" <[coch_7uj7io.enc <Cochineal-Roman.pfb
+Cochineal-Roman-sup-ly1 Cochineal-Roman "AutoEnc_qv7cwznncg5q244orfktskrhhd ReEncodeFont" <[coch_qv7cwz.enc <Cochineal-Roman.pfb
+Cochineal-Roman-sup-ot1 Cochineal-Roman "AutoEnc_r3xgod5t3c7ttynyndipgkbmcg ReEncodeFont" <[coch_r3xgod.enc <Cochineal-Roman.pfb
+Cochineal-Roman-sup-t1--base Cochineal-Roman "AutoEnc_hskcu3xl333t3y34htyugj4dyg ReEncodeFont" <[coch_hskcu3.enc <Cochineal-Roman.pfb
+Cochineal-Roman-dnom-ly1 Cochineal-Roman "AutoEnc_5v3q2ik7vctzjtjmp5wezb2t5c ReEncodeFont" <[coch_5v3q2i.enc <Cochineal-Roman.pfb
+Cochineal-Roman-dnom-ot1 Cochineal-Roman "AutoEnc_n2swpvb2gl2y7dzhwt7clphv2f ReEncodeFont" <[coch_n2swpv.enc <Cochineal-Roman.pfb
+Cochineal-Roman-dnom-t1--base Cochineal-Roman "AutoEnc_r5kifak6soks474jf7igfqredd ReEncodeFont" <[coch_r5kifa.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tlf-ly1 Cochineal-Roman "AutoEnc_rqvs5rem3bjendrk6xuapcmrwd ReEncodeFont" <[coch_rqvs5r.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tlf-ot1 Cochineal-Roman "AutoEnc_yz65whj6nmwootqn46uy5id3yg ReEncodeFont" <[coch_yz65wh.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tlf-t1--base Cochineal-Roman "AutoEnc_k3hebrtvx4pjtlknlwwhfg255f ReEncodeFont" <[coch_k3hebr.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tlf-sc-ly1--base Cochineal-Roman "AutoEnc_ume3xsuukmgrmq2xd5yhj3majc ReEncodeFont" <[coch_ume3xs.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tlf-sc-ot1--base Cochineal-Roman "AutoEnc_gcgtqoqyz6fclnkw6f4brrkasb ReEncodeFont" <[coch_gcgtqo.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tlf-sc-t1--base Cochineal-Roman "AutoEnc_tdpwgaxkyu2hfkjmol3tzosnfa ReEncodeFont" <[coch_tdpwga.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tlf-swash-ly1 Cochineal-Roman "AutoEnc_gpocnfjk3xfuihw5b67t2ntt7e ReEncodeFont" <[coch_gpocnf.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tlf-swash-ot1 Cochineal-Roman "AutoEnc_vbr2z2ywe5ctcbqigfobg4zzzf ReEncodeFont" <[coch_vbr2z2.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tlf-swash-t1--base Cochineal-Roman "AutoEnc_4pifhx7b5j5uxjxeilzq6kgx2a ReEncodeFont" <[coch_4pifhx.enc <Cochineal-Roman.pfb
+Cochineal-Roman-tlf-ts1--base Cochineal-Roman "AutoEnc_7uj7iokoaokbvpxwp2bnnoqsbe ReEncodeFont" <[coch_7uj7io.enc <Cochineal-Roman.pfb
+Cochineal-Roman-lf-ly1 Cochineal-Roman "AutoEnc_v7xcotr4xxp5wcd7hnhhlx55vg ReEncodeFont" <[coch_v7xcot.enc <Cochineal-Roman.pfb
+Cochineal-Roman-lf-ot1 Cochineal-Roman "AutoEnc_4wsvu7vr6nqqjcfnf66hpqdaga ReEncodeFont" <[coch_4wsvu7.enc <Cochineal-Roman.pfb
+Cochineal-Roman-lf-t1--base Cochineal-Roman "AutoEnc_327erotlfdchg5e3n2ycuhf4og ReEncodeFont" <[coch_327ero.enc <Cochineal-Roman.pfb
+Cochineal-Roman-lf-sc-ly1--base Cochineal-Roman "AutoEnc_faomqbtlu355bhkduaafwwngfb ReEncodeFont" <[coch_faomqb.enc <Cochineal-Roman.pfb
+Cochineal-Roman-lf-sc-ot1--base Cochineal-Roman "AutoEnc_dx7yeogkra4k6jp5ssfpzhbdph ReEncodeFont" <[coch_dx7yeo.enc <Cochineal-Roman.pfb
+Cochineal-Roman-lf-sc-t1--base Cochineal-Roman "AutoEnc_yidn7lfgcnx5w43k2nkmi2ukbg ReEncodeFont" <[coch_yidn7l.enc <Cochineal-Roman.pfb
+Cochineal-Roman-lf-swash-ly1 Cochineal-Roman "AutoEnc_3uurxv4dydpgh6ogolzuygq4ug ReEncodeFont" <[coch_3uurxv.enc <Cochineal-Roman.pfb
+Cochineal-Roman-lf-swash-ot1 Cochineal-Roman "AutoEnc_5rx6tx4apyvc3kpanj2g75rz5b ReEncodeFont" <[coch_5rx6tx.enc <Cochineal-Roman.pfb
+Cochineal-Roman-lf-swash-t1--base Cochineal-Roman "AutoEnc_fuez2loyeq3otooi5bad5do6la ReEncodeFont" <[coch_fuez2l.enc <Cochineal-Roman.pfb
+Cochineal-Roman-lf-ts1--base Cochineal-Roman "AutoEnc_7uj7iokoaokbvpxwp2bnnoqsbe ReEncodeFont" <[coch_7uj7io.enc <Cochineal-Roman.pfb
 
-Cochineal-Italic-tosf-th-t1--base Cochineal-Italic "AutoEnc_axmhrgqvmfydox4fo3wti6af3g ReEncodeFont" <[coch_axmhrg.enc <Cochineal-Italic.pfb
-Cochineal-Italic-osf-th-t1--base Cochineal-Italic "AutoEnc_yqw2okwl6ds4bwy6kvudhfy7uf ReEncodeFont" <[coch_yqw2ok.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tlf-th-t1--base Cochineal-Italic "AutoEnc_uhgdpaic32netfcty5qhzvruga ReEncodeFont" <[coch_uhgdpa.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-th-t1--base Cochineal-Italic "AutoEnc_h3bzlqqxszoz7luudodtl4vash ReEncodeFont" <[coch_h3bzlq.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tosf-th-ot1 Cochineal-Italic "AutoEnc_no5pciddwsdn5wivzenj6imoyc ReEncodeFont" <[coch_no5pci.enc <Cochineal-Italic.pfb
-Cochineal-Italic-osf-th-ot1 Cochineal-Italic "AutoEnc_ecpkno3w2tlepxgsqbxgchltre ReEncodeFont" <[coch_ecpkno.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tlf-th-ot1 Cochineal-Italic "AutoEnc_cwqdxqnld3r22njxlusdzgupif ReEncodeFont" <[coch_cwqdxq.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-th-ot1 Cochineal-Italic "AutoEnc_qnto7nkx5eyqys7sth4tp3usyh ReEncodeFont" <[coch_qnto7n.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tosf-th-ly1--base Cochineal-Italic "AutoEnc_xxmc7zdgvdkbaoah42taopv7wa ReEncodeFont" <[coch_xxmc7z.enc <Cochineal-Italic.pfb
-Cochineal-Italic-osf-th-ly1--base Cochineal-Italic "AutoEnc_z5rngkduohpcalppztgr4q73ag ReEncodeFont" <[coch_z5rngk.enc <Cochineal-Italic.pfb
-Cochineal-Italic-tlf-th-ly1--base Cochineal-Italic "AutoEnc_say5aeaglsvs34krytngjo6rta ReEncodeFont" <[coch_say5ae.enc <Cochineal-Italic.pfb
-Cochineal-Italic-lf-th-ly1--base Cochineal-Italic "AutoEnc_xmqc3hochuealwrg74kmr4p4sa ReEncodeFont" <[coch_xmqc3h.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tosf-th-t1--base Cochineal-Italic "AutoEnc_irol7dr62ntqnatjfivwjkpdof ReEncodeFont" <[coch_irol7d.enc <Cochineal-Italic.pfb
+Cochineal-Italic-osf-th-t1--base Cochineal-Italic "AutoEnc_tgg2bwhyzokb5us5n6tk7sbvsb ReEncodeFont" <[coch_tgg2bw.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tlf-th-t1--base Cochineal-Italic "AutoEnc_4se4qwhuysfzv2xl2aggteitsg ReEncodeFont" <[coch_4se4qw.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-th-t1--base Cochineal-Italic "AutoEnc_ov2w53nf7iaapwryvvvxgmkxmg ReEncodeFont" <[coch_ov2w53.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tosf-th-ot1 Cochineal-Italic "AutoEnc_c6u7hoqrcpsp2nner7qhc3kdhf ReEncodeFont" <[coch_c6u7ho.enc <Cochineal-Italic.pfb
+Cochineal-Italic-osf-th-ot1 Cochineal-Italic "AutoEnc_dzpwzrhpt3n5kirp2tgnu2ilgb ReEncodeFont" <[coch_dzpwzr.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tlf-th-ot1 Cochineal-Italic "AutoEnc_xgopeviywbdu6sxyp4puj2awke ReEncodeFont" <[coch_xgopev.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-th-ot1 Cochineal-Italic "AutoEnc_eyqo5tnzgt7lfehgwtz6my3ayd ReEncodeFont" <[coch_eyqo5t.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tosf-th-ly1--base Cochineal-Italic "AutoEnc_lhezvewx2s7wwsoln7ys6nlvba ReEncodeFont" <[coch_lhezve.enc <Cochineal-Italic.pfb
+Cochineal-Italic-osf-th-ly1--base Cochineal-Italic "AutoEnc_qb7eej56vddxkh3wah2d3sqj7e ReEncodeFont" <[coch_qb7eej.enc <Cochineal-Italic.pfb
+Cochineal-Italic-tlf-th-ly1--base Cochineal-Italic "AutoEnc_k4nkpypmjzxgvtblbkuytt63oh ReEncodeFont" <[coch_k4nkpy.enc <Cochineal-Italic.pfb
+Cochineal-Italic-lf-th-ly1--base Cochineal-Italic "AutoEnc_wpajbji3gu2bbpelldtbbtylte ReEncodeFont" <[coch_wpajbj.enc <Cochineal-Italic.pfb
 Cochineal-Bold-lf-lgr Cochineal-Bold " cochlfLGRencoding ReEncodeFont " <cochlf-lgr.enc <Cochineal-Bold.pfb
 Cochineal-Bold-lf-ot2 Cochineal-Bold " cochlfOT2encoding ReEncodeFont " <cochlf-ot2.enc <Cochineal-Bold.pfb
 Cochineal-Bold-osf-lgr Cochineal-Bold " cochosfLGRencoding ReEncodeFont " <cochosf-lgr.enc <Cochineal-Bold.pfb
@@ -255,7 +219,7 @@ Cochineal-Bold-tlf-t2a Cochineal-Bold " coch-t2aEncoding ReEncodeFont " <coch-t2
 Cochineal-Bold-tosf-lgr Cochineal-Bold " cochtosfLGRencoding ReEncodeFont " <cochtosf-lgr.enc <Cochineal-Bold.pfb
 Cochineal-Bold-tosf-ot2 Cochineal-Bold " cochtosfOT2encoding ReEncodeFont " <cochtosf-ot2.enc <Cochineal-Bold.pfb
 Cochineal-Bolditalic-tlf-lgr Cochineal-BoldItalic " coch-lgrEncoding ReEncodeFont " <cochtlf-lgr.enc <Cochineal-Bolditalic.pfb
-Cochineal-BoldItalic-tlf-t2a Cochineal-BoldItalic " coch-t2aEncoding ReEncodeFont " <coch-t2a.enc <Cochineal-BoldItalic.pfb
+Cochineal-Bolditalic-tlf-t2a Cochineal-BoldItalic " coch-t2aEncoding ReEncodeFont " <coch-t2a.enc <Cochineal-Bolditalic.pfb
 Cochineal-Bolditalic-lf-lgr Cochineal-BoldItalic " cochlfLGRencoding ReEncodeFont " <cochlf-lgr.enc <Cochineal-Bolditalic.pfb
 Cochineal-Bolditalic-lf-ot2 Cochineal-BoldItalic " cochlfOT2encoding ReEncodeFont " <cochlf-ot2.enc <Cochineal-Bolditalic.pfb
 Cochineal-Bolditalic-osf-lgr Cochineal-BoldItalic " cochosfLGRencoding ReEncodeFont " <cochosf-lgr.enc <Cochineal-Bolditalic.pfb
diff --git a/Master/texmf-dist/fonts/opentype/public/cochineal/Cochineal-Bold.otf b/Master/texmf-dist/fonts/opentype/public/cochineal/Cochineal-Bold.otf
index 494d5ae88a0..9252ab40543 100644
--- a/Master/texmf-dist/fonts/opentype/public/cochineal/Cochineal-Bold.otf
+++ b/Master/texmf-dist/fonts/opentype/public/cochineal/Cochineal-Bold.otf
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ly1--base.tfm
index e67a96371e7..ccbba26a98f 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ly1.tfm
index 9527c9eda4a..617c5348f9e 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ot1.tfm
index be48b9ac3e3..ece430a92a4 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-t1--base.tfm
index 7300cbc6619..d32341012a2 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-t1.tfm
index 1d48b7202a9..6408d53fe53 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-dnom-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ly1--base.tfm
index 9aa38acef1b..0cf35350aa8 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ly1.tfm
index a565391db24..8ee7054fe49 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ot1.tfm
index 0b9a2cfeaa2..0cf9fcaf2fb 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-t1--base.tfm
index b6a14f562e4..17dc20ceb53 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-t1.tfm
index a7fd3c11e80..043168c19d4 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-inf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ly1--base.tfm
index 3898f64f477..2a14f0d83da 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ly1.tfm
index 3fa903613cb..d0eef098f3c 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ot1.tfm
index 60b80ab71ca..2a6c4727a12 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ly1--base.tfm
index 9f46688d5be..7cd07f91eb3 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ly1.tfm
index 94ed7a49752..d83d89f0a26 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ot1--base.tfm
index f5924ea9518..7024511a89b 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ot1.tfm
index 54f2a62bb13..17770333fe6 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-t1--base.tfm
index 837dc89634e..70e8e40d6f3 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-t1.tfm
index 07cddb3404d..c654155f3bb 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ly1--base.tfm
index 22ba3f7f769..fc72fc14efa 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ly1.tfm
index ffde167d931..d295d2e16de 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ot1.tfm
index 509c8651f4c..e5cdd257c9b 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t1--base.tfm
index df19db90d90..0f5394fe2b1 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t1.tfm
index 23d36a378ea..ed2b805bb79 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t2a--base.tfm
deleted file mode 100644
index 132c8ce9ac7..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t2a.tfm
deleted file mode 100644
index 969c8392a2b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-swash-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t1--base.tfm
index 9b4ea15888c..2872bed5f57 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t1.tfm
index 8209b1e8174..6edc4587120 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t2a--base.tfm
deleted file mode 100644
index de1a8e99e01..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t2a.tfm
deleted file mode 100644
index d1f0c5d5106..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ts1--base.tfm
index 39994defd04..703ec0882fd 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ts1.tfm
index 58e3ee2c8b8..fcc63cef923 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ly1--base.tfm
index fbbe03b4728..6bc37bea2f6 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ly1.tfm
index f18b6c97fa1..86570d18f57 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ot1.tfm
index c2eee92eb6a..dd98f6bf7ec 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ly1--base.tfm
index 7ce6c11aa19..67c4a0405e5 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ly1.tfm
index 5c73141ecc3..3285c819717 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ot1--base.tfm
index a18fe60d9ba..69ec3f49a7a 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ot1.tfm
index c20a188f45e..e033da4eff6 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-t1--base.tfm
index 4e3a454ee33..bcb30402ade 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-t1.tfm
index 43c4c4fa879..da81d33b928 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ly1--base.tfm
index d2eda0c48d8..78128030082 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ly1.tfm
index 6f9fb49bb7d..eb82b4923c8 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ot1.tfm
index 1f30238a1e7..13cc6050a27 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t1--base.tfm
index b07aecfcba1..69cb75b16ac 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t1.tfm
index 2b03e500d0e..7a04b3f64fe 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t2a--base.tfm
deleted file mode 100644
index f94b0e89522..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t2a.tfm
deleted file mode 100644
index caebe22c61d..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-swash-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t1--base.tfm
index 1f28e2a0e3f..12d230e6ce7 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t1.tfm
index e8b9bddfd0a..4212272ade7 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t2a--base.tfm
deleted file mode 100644
index fd8cb5f3ba1..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t2a.tfm
deleted file mode 100644
index d9b29daa588..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ts1--base.tfm
index 39994defd04..703ec0882fd 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ts1.tfm
index 58e3ee2c8b8..fcc63cef923 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-osf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ly1--base.tfm
index ef4b2981c2f..120cd73fa60 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ly1.tfm
index ffbd6e928bc..c899269da16 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ot1.tfm
index 88d48d326ac..589004c6306 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t1--base.tfm
index 4faf26e9f2b..8f5a67e8229 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t1.tfm
index 7ea83d92635..247882da55f 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t2a--base.tfm
deleted file mode 100644
index 9de02baf3c2..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t2a.tfm
deleted file mode 100644
index f1c06c11990..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-sup-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ly1--base.tfm
index 297db94c2f2..797ec0474b6 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ly1.tfm
index a77c3df685d..91b6c449361 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ot1.tfm
index 1a730acb7bd..869376c7c78 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ly1--base.tfm
index 7ab9f348287..74db99a6e19 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ly1.tfm
index ce066f2be47..6ecd801f316 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ot1--base.tfm
index cc62b712e6a..744a0eb691e 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ot1.tfm
index 4ba33b25438..4cc05b11a8b 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-t1--base.tfm
index 27d1f784481..e87813f480d 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-t1.tfm
index ca9f62e18e7..c35fecd3105 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ly1--base.tfm
index 3c48a3ef145..17703c59aa7 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ly1.tfm
index 9164a7b043e..7366c021edb 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ot1.tfm
index bf8d9805553..d9df0cae323 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t1--base.tfm
index c8b70c5a10e..9031ab15b70 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t1.tfm
index d0f15219aed..cee52b7c37e 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t2a--base.tfm
deleted file mode 100644
index 7eb9cde23b9..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t2a.tfm
deleted file mode 100644
index 827573c72d4..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-swash-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t1--base.tfm
index cdda308546d..56eeb0279e2 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t1.tfm
index b6f766545ca..2d95dd623ca 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t2a--base.tfm
deleted file mode 100644
index 92df8ef076f..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t2a.tfm
deleted file mode 100644
index 0cb41662165..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ts1--base.tfm
index e4244963eae..703ec0882fd 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ts1.tfm
index a5c8c44d55b..fcc63cef923 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tlf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ly1--base.tfm
index c5fd1c4e55a..65e022ac4b8 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ly1.tfm
index 54cde3a7f61..d0911f114cd 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ot1.tfm
index 03279318c74..688c92e3bcd 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ly1--base.tfm
index 08809d57bf6..f7efe0d16e0 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ly1.tfm
index b24244cd471..702af98a5d0 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ot1--base.tfm
index efc5e08bed0..9d357cf231e 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ot1.tfm
index 533d8210892..b045e2c6354 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-t1--base.tfm
index 8dd55119e6c..27fe42bb985 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-t1.tfm
index 6ddc337844b..fc53cb43c6d 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ly1--base.tfm
index 028da48906b..c8d2072fee2 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ly1.tfm
index af6539f0b50..1dd1852563f 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ot1.tfm
index 0bdd46aedf4..843b32a1a6c 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t1--base.tfm
index 84da0b09adf..27dde87adc3 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t1.tfm
index 4326eb8e403..66f9cec4c48 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t2a--base.tfm
deleted file mode 100644
index 8b5ea5d7123..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t2a.tfm
deleted file mode 100644
index 4493ef635d6..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-swash-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t1--base.tfm
index a3c220e18ee..cb72c4224e9 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t1.tfm
index 2b94fe07365..17f90ba4fed 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t2a--base.tfm
deleted file mode 100644
index 2e31ecc1b78..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t2a.tfm
deleted file mode 100644
index e8a68c8a2f9..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ts1--base.tfm
index e4244963eae..703ec0882fd 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ts1.tfm
index a5c8c44d55b..fcc63cef923 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Bold-tosf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-dnom-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-dnom-ly1--base.tfm
index 0143c9d8a6f..0d6e646b87c 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-dnom-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-dnom-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-dnom-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-dnom-ly1.tfm
index fa7ad51b369..66bc6089d60 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-dnom-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-dnom-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-dnom-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-dnom-ot1.tfm
index 27c76936453..a87cc9a679a 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-dnom-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-dnom-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-dnom-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-dnom-t1--base.tfm
index 8436b8493e0..5cc750f962d 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-dnom-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-dnom-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-dnom-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-dnom-t1.tfm
index a588760c19e..b5c361b7624 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-dnom-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-dnom-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-inf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-inf-ly1--base.tfm
index aaaff527710..4880565946b 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-inf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-inf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-inf-ly1.tfm
index ac9c2f8e53b..a87e1d4c6ad 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-inf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-inf-ot1.tfm
index edeac74876b..67e03dab998 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-inf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-inf-t1--base.tfm
index f429228d6d8..809ad754c42 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-inf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-inf-t1.tfm
index e1d812115c9..ebe1ec978b9 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-inf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ly1--base.tfm
index 3eb8b68f64f..298d0664a3d 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ly1.tfm
index 5ef50a1840a..2c4bf914de4 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ot1.tfm
index 8d5e79024c1..53bd924bc0d 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-ly1--base.tfm
index 2da580122ed..b5f38ac6f0a 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-ly1.tfm
index 4852dffe56d..7eed24840d0 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-ot1--base.tfm
index 82465f596f6..e91066e0cd0 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-ot1.tfm
index a825d32f957..e85f06dc9ce 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-t1--base.tfm
index 04a19d1a1ac..3a54392eefb 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-t1.tfm
index 8bcf57d514b..6ac09a686f8 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-ly1--base.tfm
index cc9446e78ca..0a75d1a2981 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-ly1.tfm
index 624929632a6..3728f164683 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-ot1.tfm
index b91b70728e7..9a2e9bea22a 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-t1--base.tfm
index 82446e1619c..4b8ea86b413 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-t1.tfm
index 9ee5995d358..692104e12ab 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-t2a--base.tfm
deleted file mode 100644
index 8685601c09a..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-t2a.tfm
deleted file mode 100644
index 7dc6167e11d..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-swash-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-t1--base.tfm
index 98c6c98e3ec..c7365c78453 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-t1.tfm
index 35ca21a0839..b0340b2b14a 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-t2a--base.tfm
deleted file mode 100644
index 01fe636732d..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-t2a.tfm
deleted file mode 100644
index 4f0b51a4c83..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ts1--base.tfm
index 19dcb6c4da8..fdb23e7e8e9 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ts1.tfm
index 0d140c182a0..835ab7c2709 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ly1--base.tfm
index e2676a530bd..805a3e40d1e 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ly1.tfm
index f3190f134fc..7cbe316a4a5 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ot1.tfm
index 51275e5a25b..aba1cd50ea8 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-ly1--base.tfm
index ed8a229310e..47174c2edee 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-ly1.tfm
index 017b6bb077d..43e448aeb54 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-ot1--base.tfm
index 01198b9094d..2596cff4e2c 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-ot1.tfm
index bfec3e5f67c..af768e99d6b 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-t1--base.tfm
index 06fa676045f..4784e9d7ef7 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-t1.tfm
index d6099a7f8af..606c2b4b266 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-ly1--base.tfm
index 788ce8c3adf..4df44fe9874 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-ly1.tfm
index 895657edd86..101c8f3a973 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-ot1.tfm
index 70e1de3fc73..1687d421f40 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-t1--base.tfm
index bd01cdef5de..839c7f23a16 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-t1.tfm
index 14264a7b82c..4b2698c822f 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-t2a--base.tfm
deleted file mode 100644
index 23733bfcb5b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-t2a.tfm
deleted file mode 100644
index b4d989f0d0e..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-swash-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-t1--base.tfm
index 23e02765d96..02d43189e21 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-t1.tfm
index 83800b54435..65b824a929b 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-t2a--base.tfm
deleted file mode 100644
index 9644fd58a38..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-t2a.tfm
deleted file mode 100644
index 27e5e1ad088..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ts1--base.tfm
index 19dcb6c4da8..fdb23e7e8e9 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ts1.tfm
index 0d140c182a0..835ab7c2709 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-osf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-ly1--base.tfm
index 2c9836acb7f..ce181487095 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-ly1.tfm
index 508c359614a..100202c0f08 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-ot1.tfm
index 4cb64d25d5e..6387083a57c 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-t1--base.tfm
index 869caa710fd..927bef9d271 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-t1.tfm
index 4d251d12667..a9ff11855e2 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-t2a--base.tfm
deleted file mode 100644
index 40d17e982fd..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-t2a.tfm
deleted file mode 100644
index 2925e506a13..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-sup-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ly1--base.tfm
index cc6901d170a..637fe12d4d8 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ly1.tfm
index c5fbc87a73d..4846fcae84b 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ot1.tfm
index ae15043d95a..1f70f170a21 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-ly1--base.tfm
index a47ce2cb9df..225d90159de 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-ly1.tfm
index 8fba591ad5e..9bdaf99e3f5 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-ot1--base.tfm
index 9d3d2b403ad..7e171f05907 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-ot1.tfm
index da13e825366..b271514783d 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-t1--base.tfm
index 8e04208b7c7..2a7e754084c 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-t1.tfm
index 637b9de5798..c791402be77 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-ly1--base.tfm
index 15b0f39a074..046786d1c25 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-ly1.tfm
index 414a05a1664..eb64eb41323 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-ot1.tfm
index 536341111ce..8355d57edda 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-t1--base.tfm
index e3a36372c7d..5a44fa82487 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-t1.tfm
index 444c47e6100..65b47049683 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-t2a--base.tfm
deleted file mode 100644
index 91a0946065e..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-t2a.tfm
deleted file mode 100644
index 1f552d69187..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-swash-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-t1--base.tfm
index 0c53a290782..b52182ca000 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-t1.tfm
index 1b4e9911264..df849854fe0 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-t2a--base.tfm
deleted file mode 100644
index 1e8a75a8c2e..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-t2a.tfm
deleted file mode 100644
index ef28fc33a9f..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ts1--base.tfm
index 70da78ecfe3..fdb23e7e8e9 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ts1.tfm
index 98f6c9bd135..835ab7c2709 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tlf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ly1--base.tfm
index 4dbd2e40602..ed89f775f1b 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ly1.tfm
index f1382b2cb60..336bc4915dc 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ot1.tfm
index 0899b9b581e..56c58d0cd36 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-ly1--base.tfm
index c3036fcba10..3b2e299638f 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-ly1.tfm
index 7608b507b2d..f55cda2fd03 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-ot1--base.tfm
index 3b5b0ce76ec..3e147c7900e 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-ot1.tfm
index a287638646d..90afb56d00b 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-t1--base.tfm
index 743ffb3ed39..e5062c8d62f 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-t1.tfm
index 9054a34c67d..45dd5a16d49 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-ly1--base.tfm
index 14a46677968..1399bc3753b 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-ly1.tfm
index 65a3ad2b29e..012530a2300 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-ot1.tfm
index 039ffbcd550..6e47ccd7818 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-t1--base.tfm
index e162753f285..38bd4413415 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-t1.tfm
index accb06373b9..921bc51f061 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-t2a--base.tfm
deleted file mode 100644
index c0a53650054..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-t2a.tfm
deleted file mode 100644
index e21f528788d..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-swash-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-t1--base.tfm
index c18a6685161..987f07220a2 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-t1.tfm
index 7ce88f98f45..95c825b0d30 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-t2a--base.tfm
deleted file mode 100644
index 6ecd3eb67a8..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-t2a.tfm
deleted file mode 100644
index 45a1f74c335..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ts1--base.tfm
index 70da78ecfe3..fdb23e7e8e9 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ts1.tfm
index 98f6c9bd135..835ab7c2709 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-BoldItalic-tosf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-dnom-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-dnom-ly1--base.tfm
index c1add39199c..9379ff0f6b7 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-dnom-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-dnom-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-dnom-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-dnom-ly1.tfm
index 5ed16c9b99e..488967300b1 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-dnom-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-dnom-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-dnom-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-dnom-ot1.tfm
index 845b477f2be..a775ffb05e8 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-dnom-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-dnom-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-dnom-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-dnom-t1--base.tfm
index 5190d0a1649..f4ba773333c 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-dnom-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-dnom-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-dnom-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-dnom-t1.tfm
index 87cffad8a96..645cffda9bf 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-dnom-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-dnom-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-inf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-inf-ly1--base.tfm
index 6467c3c31e3..a8f32ca4dd5 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-inf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-inf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-inf-ly1.tfm
index 78915679a96..1878a5bb5d2 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-inf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-inf-ot1.tfm
index 964ab4cc57e..7a8e4220279 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-inf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-inf-t1--base.tfm
index 9a0b4f0e3d8..fecc40ec29e 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-inf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-inf-t1.tfm
index a3a140fe461..e5de74eaef9 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-inf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ly1--base.tfm
index a2126a17b5d..7b9ceaeb94d 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ly1.tfm
index 54e5c7cc2fe..dd97cad1035 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ot1.tfm
index 544cfdc06f9..5ff5c904696 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-ly1--base.tfm
index d7426a0437c..8bb119cb2c5 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-ly1.tfm
index bdd8a5e6d11..cc67a6f9445 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-ot1--base.tfm
index 5db7ff0814a..eaf2a11efcb 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-ot1.tfm
index 0d2b05b8e45..7624dd84732 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-t1--base.tfm
index 0399a340bf0..29a413ba2d9 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-t1.tfm
index b808efb51a0..3ec99a478e3 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-ly1--base.tfm
index 0d1cd27ff3c..fe5466ec735 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-ly1.tfm
index efb0bf9fd9d..dd36c1fca1f 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-ot1.tfm
index 8f30c6b2608..8e7bcab200c 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-t1--base.tfm
index 9b911c71da1..12a2ff5bfe9 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-t1.tfm
index 7120b7704a0..8cd78ba0185 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-t2a--base.tfm
deleted file mode 100644
index eddf0666965..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-t2a.tfm
deleted file mode 100644
index 405d7a829ab..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-swash-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-t1--base.tfm
index 3993c132d93..0242ba9595d 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-t1.tfm
index f72d67af9d4..d808c3a97b1 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-t2a--base.tfm
deleted file mode 100644
index 0404399c910..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-t2a.tfm
deleted file mode 100644
index 2888d14f90f..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-ly1--base.tfm
index cc3dc2da5de..e91894941d2 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-ly1.tfm
index 1951195c08d..f86ec81eab5 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-ot1.tfm
index 3b8bdb65cd8..f48c16b2fb8 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-t1--base.tfm
index a8da151344a..d8b36ede440 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-t1.tfm
index 58c48591b40..d4e58651ab8 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-th-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ts1--base.tfm
index dae34f4122e..85f5450281a 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ts1.tfm
index d62bd3f3618..98b62125c2a 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ly1--base.tfm
index 3cc515f5c5e..1c12ff05163 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ly1.tfm
index 81e3a899585..f5d2910f009 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ot1.tfm
index 605741e7bcf..33d28485a29 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-ly1--base.tfm
index 912137d7d05..8ffc2890e8b 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-ly1.tfm
index 55fd6725972..f6cbd13a3b6 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-ot1--base.tfm
index 4bc935b13b3..de9ae28f5a9 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-ot1.tfm
index c4fe189060a..09b926e9e39 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-t1--base.tfm
index 38c3aa87cd3..eb3908d1800 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-t1.tfm
index 8e1bee8752c..41572b293a6 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-ly1--base.tfm
index d3cdb6dbe9f..2f0c39b9909 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-ly1.tfm
index 47f867db3bc..a555eec0c2f 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-ot1.tfm
index 5472fb72884..5c2cba4586f 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-t1--base.tfm
index e0e38600267..7abc3df5924 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-t1.tfm
index 5e216b061f4..4e5fdd3bc9e 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-t2a--base.tfm
deleted file mode 100644
index 0873c7a30f4..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-t2a.tfm
deleted file mode 100644
index e167bbd52b4..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-swash-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-t1--base.tfm
index 9dfa51dd6e0..d6dc2da7fed 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-t1.tfm
index 0a5fbfb9912..27069dea2fe 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-t2a--base.tfm
deleted file mode 100644
index 9ed5982994b..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-t2a.tfm
deleted file mode 100644
index 727222ae7db..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-ly1--base.tfm
index 9f5987874d0..d45191ec1fa 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-ly1.tfm
index 50b5e019275..a30df29a9c6 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-ot1.tfm
index 40e7d902235..b5f74382300 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-t1--base.tfm
index 57556807a19..e0a13d0fe1d 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-t1.tfm
index 174059b5039..323a62e1a7e 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-th-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ts1--base.tfm
index dae34f4122e..85f5450281a 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ts1.tfm
index d62bd3f3618..98b62125c2a 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-osf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-ly1--base.tfm
index 09829a21733..bc06f65b1c4 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-ly1.tfm
index 8906f3309ef..fba89adc8db 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-ot1.tfm
index 58eaee28b11..93d01aaf80a 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-t1--base.tfm
index c73b20b10f9..3d019438cda 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-t1.tfm
index 807e007d466..0574eca6920 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-t2a--base.tfm
deleted file mode 100644
index 2b06d133725..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-t2a.tfm
deleted file mode 100644
index fd4b26937d7..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-sup-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ly1--base.tfm
index 45620222eb6..c1d34172bc3 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ly1.tfm
index 3dae8eca16b..d471a7d87ab 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ot1.tfm
index 5ac68180713..e2f44af08a4 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-ly1--base.tfm
index e7d9078a3af..e31bfa11d2b 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-ly1.tfm
index 242b92877ce..f16fc0462ce 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-ot1--base.tfm
index 412ff2a7ab3..3372db53ebe 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-ot1.tfm
index 35b970dfc62..ce717513b0c 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-t1--base.tfm
index 5d74f22de53..c4f3464bf26 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-t1.tfm
index 26caee9f355..3ea153885bc 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-ly1--base.tfm
index 21d6d4968ab..5b4ccefd062 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-ly1.tfm
index c450c25db02..f1faa4a26b0 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-ot1.tfm
index e3d5b539494..6aabfc562cc 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-t1--base.tfm
index 60d04a8231c..86bcd7d4486 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-t1.tfm
index f8d21e2b277..f62c68c542f 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-t2a--base.tfm
deleted file mode 100644
index 275c30bfc97..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-t2a.tfm
deleted file mode 100644
index d8626852a99..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-swash-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-t1--base.tfm
index 106ee465add..e6f87915172 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-t1.tfm
index 9f904a31344..420b1379d48 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-t2a--base.tfm
deleted file mode 100644
index 7c90ad9ba0e..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-t2a.tfm
deleted file mode 100644
index ba2e632b7fc..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-ly1--base.tfm
index 583ffeaf71e..b9d0de1c452 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-ly1.tfm
index 104016374e8..81a0822cbe8 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-ot1.tfm
index 90db1eff40a..4ef0bc5759d 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-t1--base.tfm
index 03787c34f1e..0ff17db9fa7 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-t1.tfm
index bc48acdc883..84231fc6de1 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-th-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ts1--base.tfm
index e07e76e6013..85f5450281a 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ts1.tfm
index 1367c8f034e..98b62125c2a 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tlf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ly1--base.tfm
index cc7367625f9..fadcc4da897 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ly1.tfm
index b5411f9552f..d0544a85430 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ot1.tfm
index 8109119d65c..3d53b1bbcc8 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-ly1--base.tfm
index 8b00ede4738..173dc1b6e04 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-ly1.tfm
index b49e8c867aa..9e96a7f74cb 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-ot1--base.tfm
index d07537b1fe6..e7ed76086c2 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-ot1.tfm
index 79d01c06a75..f043be0bac7 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-t1--base.tfm
index 9da15d84456..9b196277fe4 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-t1.tfm
index 8abf1b2163e..3e57c897540 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-ly1--base.tfm
index 7a691b67ae7..76375ee8b5d 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-ly1.tfm
index a8987e8fa20..a2596580a48 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-ot1.tfm
index 4c448c7d70b..d90dbab9768 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-t1--base.tfm
index 6e21c47c588..ee6cca4f3ab 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-t1.tfm
index ab0c6377a1c..07e9677b7a6 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-t2a--base.tfm
deleted file mode 100644
index 903a548b3d3..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-t2a.tfm
deleted file mode 100644
index 09164f7a04f..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-swash-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-t1--base.tfm
index c344cc3f071..4a6a4045cbd 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-t1.tfm
index 67e0e080add..1f15d3a49ed 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-t2a--base.tfm
deleted file mode 100644
index 227de45ab47..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-t2a.tfm
deleted file mode 100644
index 92a8c6400c5..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-ly1--base.tfm
index 3397d0051b1..fbd6ce21944 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-ly1.tfm
index 91dd683db57..375557981b3 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-ot1.tfm
index 3766f17aac7..4c112bd5b82 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-t1--base.tfm
index cc9d82f3a1f..f6e377436e0 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-t1.tfm
index 27e22eb4d84..5b9d0a1f146 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-th-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ts1--base.tfm
index e07e76e6013..85f5450281a 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ts1.tfm
index 1367c8f034e..98b62125c2a 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Italic-tosf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-dnom-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-dnom-ly1.tfm
index 01bee86d198..90041446d2a 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-dnom-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-dnom-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-dnom-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-dnom-ot1.tfm
index 212385e5da3..bbc07acae3d 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-dnom-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-dnom-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-dnom-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-dnom-t1--base.tfm
index 43232501d50..888d455895a 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-dnom-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-dnom-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-dnom-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-dnom-t1.tfm
index 71935290980..0925e804d54 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-dnom-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-dnom-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-inf-ly1.tfm
index cc855bec9bb..b6fa58663a8 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-inf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-inf-ot1.tfm
index cac5366e2af..b0d83177574 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-inf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-inf-t1--base.tfm
index 0c1ea154ce9..79921ac9afb 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-inf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-inf-t1.tfm
index ccda2b64cde..e6facd9726e 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-inf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ly1.tfm
index 24bb49e2283..0f8c10abbda 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ot1.tfm
index 5655310132d..19790308f2b 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-ly1--base.tfm
index cba0bc12dd1..979e1a1cc1f 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-ly1.tfm
index 8bc5228cf9d..5bf8e4ed7c6 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-ot1--base.tfm
index 1f61d5e1181..b21893eb2db 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-ot1.tfm
index e7e1024e6fd..fe484f5dca7 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-t1--base.tfm
index 86f8b93d9c1..48bfa8d55e0 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-t1.tfm
index 868b89550be..3aa576b9a8b 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-ly1.tfm
index 3aded9a0999..0fc3d6ab3ca 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-ot1.tfm
index c3d89b127ce..22e0d8fbc36 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-t1--base.tfm
index 1bcd7ceedce..48f72b52369 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-t1.tfm
index e5d0cc0a2fd..93d36e0f563 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-t2a--base.tfm
deleted file mode 100644
index 26fd5bd37e2..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-t2a.tfm
deleted file mode 100644
index 76536d21082..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-swash-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-t1--base.tfm
index d1b87603307..7b92b4a9f4c 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-t1.tfm
index 76b04115c70..ae718a5972e 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-t2a--base.tfm
deleted file mode 100644
index e561043f3ef..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-t2a.tfm
deleted file mode 100644
index 7bf6aed5104..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ts1--base.tfm
index ebc11f7163a..53b756c331d 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ts1.tfm
index 4fc019d4215..bdfd55549f1 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ly1.tfm
index 39f1ed2d492..4b539b9632a 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ot1.tfm
index 488b4eed0d3..be9fbdb2834 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-ly1--base.tfm
index bf1c861da29..90e827ef6b3 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-ly1.tfm
index ba1f1ae6896..90f688df3db 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-ot1--base.tfm
index 75c89717cf4..484c0ceedde 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-ot1.tfm
index d14b05e12d7..390a9c1281e 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-t1--base.tfm
index f3415fbce7f..63857537fea 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-t1.tfm
index fa6ef8b7d02..41a585841e4 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-ly1.tfm
index 23ecd41f1ac..e80f09112eb 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-ot1.tfm
index 5ef45340e91..1c4028b0d80 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-t1--base.tfm
index f29cc324996..a2a8c40d582 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-t1.tfm
index ce5006e7550..bd98aca3687 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-t2a--base.tfm
deleted file mode 100644
index f9d4a89a01c..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-t2a.tfm
deleted file mode 100644
index cce01a6f1a0..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-swash-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-t1--base.tfm
index 00ee12bd423..d53c5591015 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-t1.tfm
index 2ff63783ec5..7b3dec51cd2 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-t2a--base.tfm
deleted file mode 100644
index 3dba2674494..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-t2a.tfm
deleted file mode 100644
index 62a78634920..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ts1--base.tfm
index ebc11f7163a..53b756c331d 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ts1.tfm
index 4fc019d4215..bdfd55549f1 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-osf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-ly1.tfm
index d9e0446f025..3d020f5c625 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-ot1.tfm
index cc1f0f8d3d5..1681f4a6a29 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-t1--base.tfm
index 031e10270d7..ee3acaa5cbf 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-t1.tfm
index bfa8cd069be..a3fce0150ba 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-t2a--base.tfm
deleted file mode 100644
index e9c23fc17a6..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-t2a.tfm
deleted file mode 100644
index 6061b1db2a6..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-sup-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ly1.tfm
index 261035cbb9c..24b7c2a2a75 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ot1.tfm
index 2aed9b0d084..e89ef101eb0 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-ly1--base.tfm
index 92a99e356df..3fa3a471b56 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-ly1.tfm
index addf56c71c9..f32551246c1 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-ot1--base.tfm
index 050b580062a..2190aa8a170 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-ot1.tfm
index e369f7c8115..83ad743794a 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-t1--base.tfm
index 6d77f744ee9..4e114bf4132 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-t1.tfm
index 5012ce5de98..e2fbb38ad8c 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-ly1.tfm
index b957ce3e8f8..9e9e322fabf 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-ot1.tfm
index 8bf0ded5a4a..a0c59c9b4c4 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-t1--base.tfm
index e3d27501fbd..2eb6f7281f0 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-t1.tfm
index c9821598abc..91263977632 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-t2a--base.tfm
deleted file mode 100644
index 889277de75e..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-t2a.tfm
deleted file mode 100644
index 16198fa65d4..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-swash-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-t1--base.tfm
index 7476bab8cdb..246dd1f89a6 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-t1.tfm
index 48fa7a0181c..1d5740530ff 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-t2a--base.tfm
deleted file mode 100644
index 25352178383..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-t2a.tfm
deleted file mode 100644
index 46113b70235..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ts1--base.tfm
index dcabc3b0366..53b756c331d 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ts1.tfm
index 4474c35b858..bdfd55549f1 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tlf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ly1.tfm
index 4712be18004..46eb4530fd7 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ot1.tfm
index b589adc2b56..5ed8ae9f562 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-ly1--base.tfm
index af47546b6e8..c0aa530e7d2 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-ly1.tfm
index 211fab95a94..b17aa071fcc 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-ot1--base.tfm
index fd95d907e0b..e5c4216ebce 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-ot1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-ot1.tfm
index 96fdb79ff38..a20fa539b02 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-t1--base.tfm
index 2fc076fead0..8cf6aa53c46 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-t1.tfm
index e3a677c6db6..5e698c1cb33 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-sc-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-ly1.tfm
index d32558ce089..4bd2031f1eb 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-ot1.tfm
index 516a7deb8a1..4c73da7c246 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-t1--base.tfm
index ce8e50fe7df..410bf24c8e0 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-t1.tfm
index 904cf121249..4ff7b7f8b31 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-t2a--base.tfm
deleted file mode 100644
index 359d9fa2387..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-t2a.tfm
deleted file mode 100644
index 5e3a5909a4d..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-swash-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-t1--base.tfm
index 9bbeaedc63c..578bef417ad 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-t1.tfm
index 261dbe7732f..e3bd2a38dd0 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-t2a--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-t2a--base.tfm
deleted file mode 100644
index 3eae49f930e..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-t2a--base.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-t2a.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-t2a.tfm
deleted file mode 100644
index 220b85fb991..00000000000
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-t2a.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ts1--base.tfm
index dcabc3b0366..53b756c331d 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ts1.tfm
index 4474c35b858..bdfd55549f1 100644
--- a/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/cochineal/Cochineal-Roman-tosf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/type1/public/cochineal/Cochineal-Bold.pfb b/Master/texmf-dist/fonts/type1/public/cochineal/Cochineal-Bold.pfb
index 8aff5590ef6..170837c27ed 100644
--- a/Master/texmf-dist/fonts/type1/public/cochineal/Cochineal-Bold.pfb
+++ b/Master/texmf-dist/fonts/type1/public/cochineal/Cochineal-Bold.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/cochineal/Cochineal-BoldItalic.pfb b/Master/texmf-dist/fonts/type1/public/cochineal/Cochineal-BoldItalic.pfb
index 81380c60ce4..03a14c3cb81 100644
--- a/Master/texmf-dist/fonts/type1/public/cochineal/Cochineal-BoldItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/cochineal/Cochineal-BoldItalic.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/cochineal/Cochineal-Italic.pfb b/Master/texmf-dist/fonts/type1/public/cochineal/Cochineal-Italic.pfb
index c4fe0d0ac65..83a3587ef40 100644
--- a/Master/texmf-dist/fonts/type1/public/cochineal/Cochineal-Italic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/cochineal/Cochineal-Italic.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/cochineal/Cochineal-Roman.pfb b/Master/texmf-dist/fonts/type1/public/cochineal/Cochineal-Roman.pfb
index f71c273c178..c5459a048d8 100644
--- a/Master/texmf-dist/fonts/type1/public/cochineal/Cochineal-Roman.pfb
+++ b/Master/texmf-dist/fonts/type1/public/cochineal/Cochineal-Roman.pfb
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-dnom-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-dnom-ly1.vf
index 59900cc62b2..7b9ebf2adfb 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-dnom-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-dnom-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-dnom-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-dnom-t1.vf
index 35f31beaad5..7b08fd072ab 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-dnom-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-dnom-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-inf-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-inf-ly1.vf
index 5f48533c324..45658541a91 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-inf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-inf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-inf-t1.vf
index e39c1e868b9..0404d0a3eb5 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-inf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-ly1.vf
index a846d79e015..62409d184f9 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-ly1.vf
index 27fb90c8e7d..888bca314e5 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-ot1.vf
index 8fa0bb2b474..29ba84a7902 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-t1.vf
index d2316c06f7b..c3231654d91 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-swash-ly1.vf
index 0b77aaad68f..997bf13e5f8 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-swash-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-swash-t1.vf
index 4ae93346b47..51266aed90a 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-swash-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-swash-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-swash-t2a.vf
deleted file mode 100644
index a939f6eac0e..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-swash-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-t1.vf
index 6123be62ee0..48d154eea11 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-t2a.vf
deleted file mode 100644
index 4603f5c19d0..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-ts1.vf
index 2fc497fba7e..4c21451b751 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-lf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-ly1.vf
index 9d4d91984ee..b3e531177a1 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-ly1.vf
index 43185491ff4..f62b85bca2a 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-ot1.vf
index 66fd45f1c4d..27a87c3f299 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-t1.vf
index 192e245fa8c..c493d290689 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-swash-ly1.vf
index 611a15e13c2..de8a59afca3 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-swash-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-swash-t1.vf
index feed556247e..199d13551af 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-swash-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-swash-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-swash-t2a.vf
deleted file mode 100644
index 44f72b78cf1..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-swash-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-t1.vf
index 092af665970..fcfd4a3a0bf 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-t2a.vf
deleted file mode 100644
index 3cc42428f78..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-ts1.vf
index 913d619f2e1..82629defca2 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-osf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-sup-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-sup-ly1.vf
index f9ff46ca3e3..f4f23e1db79 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-sup-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-sup-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-sup-t1.vf
index 5d193551700..47252820b38 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-sup-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-sup-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-sup-t2a.vf
deleted file mode 100644
index 45d204d39af..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-sup-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-ly1.vf
index c495dd2ff95..883342b004e 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-ly1.vf
index 79413887994..cc5af9acec1 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-ot1.vf
index 4da1eae42f8..fac828fb411 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-t1.vf
index e0965428c05..760fe39c7d4 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-swash-ly1.vf
index 4edee16f94a..ef77481cda6 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-swash-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-swash-t1.vf
index 5b373cb78b3..7228a6d84b4 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-swash-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-swash-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-swash-t2a.vf
deleted file mode 100644
index fcd0051fead..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-swash-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-t1.vf
index 37627cc2718..7b4d9bbae83 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-t2a.vf
deleted file mode 100644
index d8a76e358fd..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-ts1.vf
index e524dd70a95..1781e6948e2 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tlf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-ly1.vf
index 9cabdb4a624..e5e7d1df948 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-ly1.vf
index 22b6e2c49e9..7d896b20104 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-ot1.vf
index f22a08a97e8..adf55535aa0 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-t1.vf
index 5c36ba19c31..604243010bf 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-swash-ly1.vf
index 6d41244f7d9..f5b53db4633 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-swash-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-swash-t1.vf
index c36cc307b0a..2b09d4548ba 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-swash-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-swash-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-swash-t2a.vf
deleted file mode 100644
index c6263ffa9dc..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-swash-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-t1.vf
index 93bec3ede00..d77a3810a41 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-t2a.vf
deleted file mode 100644
index f98340b5f65..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-ts1.vf
index de86fadc37b..a2a917d3aa0 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Bold-tosf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-dnom-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-dnom-ly1.vf
index 4f7ac908999..66f79330dfb 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-dnom-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-dnom-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-dnom-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-dnom-t1.vf
index 2e3cf020573..e79184cd4a4 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-dnom-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-dnom-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-inf-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-inf-ly1.vf
index 123ccacca8b..58ecef48672 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-inf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-inf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-inf-t1.vf
index 3fad1cfc08f..cc55f164773 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-inf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-ly1.vf
index 2aaaaa43c5c..50c63b43c33 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-sc-ly1.vf
index 78b6350bf5e..8a2ecc56a14 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-sc-ot1.vf
index 5fa94ac57f6..90e5f9b8ece 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-sc-t1.vf
index 7966b4fa882..cdbf4c77251 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-swash-ly1.vf
index 5421e4de6bf..a5be513016f 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-swash-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-swash-t1.vf
index b1a3379d82d..d18ff2a9d04 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-swash-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-swash-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-swash-t2a.vf
deleted file mode 100644
index 2db6f8fb7b7..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-swash-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-t1.vf
index a9d1485da4c..1b94424e86f 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-t2a.vf
deleted file mode 100644
index 54272d00152..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-ts1.vf
index f8ea71d947e..34da620c013 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-lf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-ly1.vf
index 60cb9f92f7a..415c192e4a2 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-sc-ly1.vf
index c6d0617ac79..f09f2cec468 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-sc-ot1.vf
index 2a0151dafe5..8ad11c538ee 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-sc-t1.vf
index 289058a3670..ae2fa296b20 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-swash-ly1.vf
index 79b40da2b09..08591e128d0 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-swash-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-swash-t1.vf
index 09c381540ac..d62b90a0de2 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-swash-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-swash-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-swash-t2a.vf
deleted file mode 100644
index 449b5f2855f..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-swash-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-t1.vf
index e51dfb135db..d2afe2158e8 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-t2a.vf
deleted file mode 100644
index fb470ea3b54..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-ts1.vf
index 301a7edcad5..f9c6e845256 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-osf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-sup-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-sup-ly1.vf
index ffb0cfafa02..cc34dd021c0 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-sup-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-sup-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-sup-t1.vf
index 5aa65949cc0..3f02e86a1bc 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-sup-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-sup-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-sup-t2a.vf
deleted file mode 100644
index 40dfcdd544a..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-sup-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-ly1.vf
index dac2718ebc5..e88067321f7 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-sc-ly1.vf
index fc7284d8f2c..a5ee2da7ce1 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-sc-ot1.vf
index 767bbcc2093..2a7f718f81a 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-sc-t1.vf
index b3e641379ef..4dced72a132 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-swash-ly1.vf
index ea623af508d..4f7dacd6b34 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-swash-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-swash-t1.vf
index 6b0a8f005f5..f0a1adc240b 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-swash-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-swash-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-swash-t2a.vf
deleted file mode 100644
index 4658ad20a45..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-swash-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-t1.vf
index 6a03c28635b..792c9dc1060 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-t2a.vf
deleted file mode 100644
index 6953bcfb37d..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-ts1.vf
index d73fc3c153a..64b7689d8a6 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tlf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-ly1.vf
index 3656c3473cf..46fa5e401ed 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-sc-ly1.vf
index 3aa5adb50b0..860bf4ff655 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-sc-ot1.vf
index 034c1429d0b..01fe9767e35 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-sc-t1.vf
index e30b6b91ac4..c260d21e509 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-swash-ly1.vf
index 3e0815fdb1b..0ba98dd9d10 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-swash-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-swash-t1.vf
index cadde98ab47..d541845989e 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-swash-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-swash-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-swash-t2a.vf
deleted file mode 100644
index 2adb82ba878..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-swash-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-t1.vf
index 8fc0388a084..a165ce524df 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-t2a.vf
deleted file mode 100644
index 5d8560b5668..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-ts1.vf
index f215b09e413..82c1419277f 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-BoldItalic-tosf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-dnom-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-dnom-ly1.vf
index b8a4a578c69..f96c8f2c531 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-dnom-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-dnom-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-dnom-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-dnom-t1.vf
index 1a8fc29fb87..b9ab577d356 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-dnom-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-dnom-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-inf-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-inf-ly1.vf
index 9ce1886d6ed..5f7ba6c49fc 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-inf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-inf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-inf-t1.vf
index a39a0c0916d..f8c5f4efcda 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-inf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-ly1.vf
index 7bfda28a8be..fefeec126d8 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-sc-ly1.vf
index 437b8e3bab5..5fae0b3a9c4 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-sc-ot1.vf
index 5b9f7e2078d..efb72ca8203 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-sc-t1.vf
index da7bf0bfcd8..cda339d6829 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-swash-ly1.vf
index 3ea64b32799..2e535eaf8f7 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-swash-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-swash-t1.vf
index 565fb431365..0f587fce0f1 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-swash-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-swash-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-swash-t2a.vf
deleted file mode 100644
index c3734d77815..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-swash-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-t1.vf
index 88ad2868d67..9ddc58f8c9a 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-t2a.vf
deleted file mode 100644
index 265aac41faf..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-th-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-th-ly1.vf
index f2dcc778d87..ca69566ca31 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-th-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-th-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-th-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-th-t1.vf
index 0403c265bd7..ec2d9d05683 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-th-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-th-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-ts1.vf
index b203dc18bb4..f9f5dc96f08 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-lf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-ly1.vf
index 08f3f35b470..57497784172 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-sc-ly1.vf
index fc2e08c3f73..466a0f5ab1c 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-sc-ot1.vf
index 17fd2706452..3558cf77771 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-sc-t1.vf
index 9b628d70da7..c31857665f1 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-swash-ly1.vf
index a8e6eea2639..3fbc45a9a65 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-swash-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-swash-t1.vf
index f99826d99ae..c0e1d2bba5f 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-swash-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-swash-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-swash-t2a.vf
deleted file mode 100644
index 05aa34e75a1..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-swash-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-t1.vf
index 469ee7553ef..0228c2c19d9 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-t2a.vf
deleted file mode 100644
index 9d1e36d92cb..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-th-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-th-ly1.vf
index dddd0b04364..f75776c4359 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-th-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-th-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-th-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-th-t1.vf
index cc93af343df..4437aa71c63 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-th-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-th-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-ts1.vf
index 3f161352c14..7db8846c603 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-osf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-sup-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-sup-ly1.vf
index 0773eb9b283..c4efdbd757b 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-sup-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-sup-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-sup-t1.vf
index da3bd0b9d0c..19c10b72513 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-sup-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-sup-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-sup-t2a.vf
deleted file mode 100644
index 6cdf4837507..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-sup-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-ly1.vf
index 9623e8ed81e..ff4a9624886 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-sc-ly1.vf
index 7fddf4b9948..dc2e60bf137 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-sc-ot1.vf
index fdfa353570a..5ee5ad3d2a1 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-sc-t1.vf
index 639e110bd62..2d6b1e41c63 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-swash-ly1.vf
index f5cd4d49275..26e890cbf5e 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-swash-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-swash-t1.vf
index f76dd6da78b..d43e6c03b0a 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-swash-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-swash-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-swash-t2a.vf
deleted file mode 100644
index 5d4399fdea6..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-swash-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-t1.vf
index 785977f6158..5cf01dc2875 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-t2a.vf
deleted file mode 100644
index d442fd72ba6..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-th-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-th-ly1.vf
index 84cabda16d9..bab6b1c581e 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-th-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-th-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-th-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-th-t1.vf
index be956c75ffe..14cf0628905 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-th-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-th-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-ts1.vf
index ae9c2998727..8cc0e83e639 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tlf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-ly1.vf
index 5833f8df8c8..d952accb9b7 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-sc-ly1.vf
index 70ff0bb0e9e..3bfc0f8c78d 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-sc-ot1.vf
index e0c8750a9e3..a64288ac1bc 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-sc-t1.vf
index 336708f2142..7f3b74eb3b8 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-swash-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-swash-ly1.vf
index d1784a38608..16fe8246238 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-swash-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-swash-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-swash-t1.vf
index 57fc75a8326..24e0491778d 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-swash-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-swash-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-swash-t2a.vf
deleted file mode 100644
index 880197a384d..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-swash-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-t1.vf
index 31fbd6e62a7..c407cf7f055 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-t2a.vf
deleted file mode 100644
index 7ca45db1228..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-th-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-th-ly1.vf
index bf284ea0520..0792877b7e5 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-th-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-th-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-th-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-th-t1.vf
index 3330b5d7511..d48adcf6e68 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-th-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-th-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-ts1.vf
index d92e598e3df..925ce62e390 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Italic-tosf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-dnom-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-dnom-t1.vf
index dc6b2111ecd..d406fade108 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-dnom-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-dnom-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-inf-t1.vf
index 60b35e0fadc..0539f8c1cef 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-inf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-sc-ly1.vf
index a925d18b67b..9675df471f7 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-sc-ot1.vf
index 6377cad95c8..16f65b10f7f 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-sc-t1.vf
index 88ed9a2677e..2984eecd55e 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-swash-t1.vf
index 4507bececd1..39d9a67bd9e 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-swash-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-swash-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-swash-t2a.vf
deleted file mode 100644
index e01c266db6d..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-swash-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-t1.vf
index 479e810ffe6..7624c7947e7 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-t2a.vf
deleted file mode 100644
index 887b07512e6..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-ts1.vf
index 242667e611e..6762a944881 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-lf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-sc-ly1.vf
index 0021af2d267..81ef5a2df50 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-sc-ot1.vf
index 98d3ef46af2..88614ea3220 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-sc-t1.vf
index 08efd704e1e..0e287505fa0 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-swash-t1.vf
index 1e52ad9fcb3..fdeccd33669 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-swash-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-swash-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-swash-t2a.vf
deleted file mode 100644
index 83c60ec0d29..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-swash-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-t1.vf
index 0af0e909b4a..51767149ec9 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-t2a.vf
deleted file mode 100644
index b9b6a172f3e..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-ts1.vf
index 40ca2056292..bbb1e027d73 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-osf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-sup-t1.vf
index c8af30f8728..b7095b02b6c 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-sup-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-sup-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-sup-t2a.vf
deleted file mode 100644
index 0b411578a7a..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-sup-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-sc-ly1.vf
index e652ebf23b8..acebc7efdd5 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-sc-ot1.vf
index 9d330917e14..d3f3539e015 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-sc-t1.vf
index bfc2ed5edea..e1f7914def2 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-swash-t1.vf
index 2c5d08de17b..e00ff4945a2 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-swash-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-swash-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-swash-t2a.vf
deleted file mode 100644
index 538c9a68143..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-swash-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-t1.vf
index d2e5bee77e9..2539fa7fe8c 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-t2a.vf
deleted file mode 100644
index 4c0a2798a09..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-ts1.vf
index 036ba26add0..799dd73d3b3 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tlf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-sc-ly1.vf
index 4dc44bb3a2e..9a123002722 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-sc-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-sc-ot1.vf
index 1978408862b..05cfc0a8bc3 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-sc-ot1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-sc-t1.vf
index 3e66f5e98c0..377da58c2e1 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-sc-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-swash-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-swash-t1.vf
index 3870d709901..beb5f15008c 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-swash-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-swash-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-swash-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-swash-t2a.vf
deleted file mode 100644
index 37f729eaae6..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-swash-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-t1.vf
index 8968937ec54..3d2e6cdc5ee 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-t2a.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-t2a.vf
deleted file mode 100644
index 8c7132cb235..00000000000
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-t2a.vf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-ts1.vf b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-ts1.vf
index a73e8f35eda..98ef797062c 100644
--- a/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/public/cochineal/Cochineal-Roman-tosf-ts1.vf