cochineal (29mar18)

git-svn-id: svn://tug.org/texlive/trunk@47173 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2018-03-29 21:37:48 +0000
committer: Karl Berry <karl@freefriends.org> 2018-03-29 21:37:48 +0000
commit: d768c1f28241c2f0ae7a55fed408e2172ea515cb (patch)
tree: 3bccc889c4d646c789e548a41329695ade49a084 /Master/texmf-dist/fonts/enc/dvips/cochineal
parent: 457acac539a4632be76c65e905d2b3e099470628 (diff)
181 files changed, 3059 insertions, 3304 deletions
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'
author	Karl Berry <karl@freefriends.org>	2018-03-29 21:37:48 +0000
committer	Karl Berry <karl@freefriends.org>	2018-03-29 21:37:48 +0000
commit	d768c1f28241c2f0ae7a55fed408e2172ea515cb (patch)
tree	3bccc889c4d646c789e548a41329695ade49a084 /Master/texmf-dist/fonts/enc/dvips/cochineal
parent	457acac539a4632be76c65e905d2b3e099470628 (diff)