144 files changed, 1788 insertions, 1780 deletions
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_o24g5u.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2h4ezz.enc
index 4c869d4f2d8..160040c1454 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_o24g5u.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2h4ezz.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_o24g5ulfm5inouvr32lgyphaec
-% Encoding created by otftotfm on Sun Jan 13 15:37:12 2019
+%%AutoEnc_2h4ezzalccduudak3ke2exlawb
+% Encoding created by otftotfm on Mon May  4 13:30:44 2020
 % Command line follows encoding
-/AutoEnc_o24g5ulfm5inouvr32lgyphaec [
+/AutoEnc_2h4ezzalccduudak3ke2exlawb [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Regular.otf
-% Erewhon-Regular-tlf-sc-t2b'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Regular.otf Erewhon-Regular-tlf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_amjics.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2kgcbe.enc
index 2e7e7533c76..f04492ed096 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_amjics.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2kgcbe.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_amjicsj3u4bgao6esbrhmeruyb
-% Encoding created by otftotfm on Sun Jan 13 15:36:08 2019
+%%AutoEnc_2kgcbefbp3mclphoys5pqwrs5g
+% Encoding created by otftotfm on Mon May  4 13:29:48 2020
 % Command line follows encoding
-/AutoEnc_amjicsj3u4bgao6esbrhmeruyb [
+/AutoEnc_2kgcbefbp3mclphoys5pqwrs5g [
 %00
   /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %10
   /I.sc /J.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /AE.sc /OE.sc /Oslash.sc /AE /OE /Oslash
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-BoldItalic.otf
-% Erewhon-BoldItalic-osf-sc-ly1'
+% --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-BoldItalic.otf Erewhon-BoldItalic-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lxr6iw.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2px4pm.enc
index 032ac7543b8..f5c9afac923 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lxr6iw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2px4pm.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_lxr6iwqh4znsuzauzbqumyaoxb
-% Encoding created by otftotfm on Sun Jan 13 15:36:04 2019
+%%AutoEnc_2px4pm5fx5xqd6bs64zvpitmqa
+% Encoding created by otftotfm on Mon May  4 13:29:50 2020
 % Command line follows encoding
-/AutoEnc_lxr6iwqh4znsuzauzbqumyaoxb [
+/AutoEnc_2px4pm5fx5xqd6bs64zvpitmqa [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=numr --ligkern=* {KL} * Erewhon-BoldItalic.otf
-% Erewhon-BoldItalic-numr-ly1'
+% --feature=liga --feature=numr --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --ligkern=* {KL} * Erewhon-BoldItalic.otf Erewhon-BoldItalic-numr-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_o4jtlp.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2vfnrz.enc
index 42d3e15bd5b..800c291c33d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_o4jtlp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2vfnrz.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_o4jtlpdoieczf5g4yrkdrvcveg
-% Encoding created by otftotfm on Sun Jan 13 15:35:57 2019
+%%AutoEnc_2vfnrzlifcliddaunxrrwl5gba
+% Encoding created by otftotfm on Mon May  4 13:29:44 2020
 % Command line follows encoding
-/AutoEnc_o4jtlpdoieczf5g4yrkdrvcveg [
+/AutoEnc_2vfnrzlifcliddaunxrrwl5gba [
 %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 /afii61664
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.numerator /hyphen /period.numerator /slash
@@ -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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=numr --ligkern=* {KL} *
-% Erewhon-Bold.otf Erewhon-Bold-numr-t1'
+% --feature=kern --feature=liga --feature=numr --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-numr-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_b4bj4o.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2zzglv.enc
index 5b4a84d1198..8c9af7de3b8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_b4bj4o.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2zzglv.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_b4bj4o6wgjbs3bkydgzwbixjre
-% Encoding created by otftotfm on Sun Jan 13 15:36:42 2019
+%%AutoEnc_2zzglv6ljfkikhjchsv5ljubrg
+% Encoding created by otftotfm on Mon May  4 13:30:19 2020
 % Command line follows encoding
-/AutoEnc_b4bj4o6wgjbs3bkydgzwbixjre [
+/AutoEnc_2zzglv6ljfkikhjchsv5ljubrg [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,12 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf Erewhon-Bold-lf-sc-t2a'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Bold.otf Erewhon-Bold-lf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_comway.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3b4drr.enc
index 7757e6dc11a..fcf74955a43 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_comway.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3b4drr.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_comwayb4aawhxhay54suqkjdhc
-% Encoding created by otftotfm on Sun Jan 13 15:36:50 2019
+%%AutoEnc_3b4drrm56eb45lwxbwibobpckc
+% Encoding created by otftotfm on Mon May  4 13:30:24 2020
 % Command line follows encoding
-/AutoEnc_comwayb4aawhxhay54suqkjdhc [
+/AutoEnc_3b4drrm56eb45lwxbwibobpckc [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
-% Erewhon-Italic-osf-sc-t2a'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Italic.otf Erewhon-Italic-osf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xaebaa.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3elzbu.enc
index d1e88495110..be5325faec3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xaebaa.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3elzbu.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_xaebaab4trzvfivi7yd2pqw2ya
-% Encoding created by otftotfm on Sun Jan 13 15:36:59 2019
+%%AutoEnc_3elzbu2a5lcim3sxbvyymxfude
+% Encoding created by otftotfm on Mon May  4 13:30:32 2020
 % Command line follows encoding
-/AutoEnc_xaebaab4trzvfivi7yd2pqw2ya [
+/AutoEnc_3elzbu2a5lcim3sxbvyymxfude [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.denominator /hyphen /period.denominator /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
-% --feature=dnom --feature=kern --feature=liga --ligkern=* {KL} *
-% Erewhon-Bold.otf Erewhon-Bold-dnom-t2b'
+% --feature=dnom --feature=kern --feature=liga --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-dnom-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_saz6x5.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3nkbzs.enc
index 12e12a3784b..1214f0967b0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_saz6x5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3nkbzs.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_saz6x5qdoubugg7m77xevbuvlb
-% Encoding created by otftotfm on Sun Jan 13 15:36:43 2019
+%%AutoEnc_3nkbzstn2a4eo7l6cbm7rtiseg
+% Encoding created by otftotfm on Mon May  4 13:30:18 2020
 % Command line follows encoding
-/AutoEnc_saz6x5qdoubugg7m77xevbuvlb [
+/AutoEnc_3nkbzstn2a4eo7l6cbm7rtiseg [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf
-% Erewhon-Bold-tosf-sc-t2a'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Bold.otf Erewhon-Bold-tosf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ytbyxh.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3om7o5.enc
index ac87b89879e..fcb3641c0ec 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ytbyxh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3om7o5.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ytbyxhewremjr5edjmg6fevnqc
-% Encoding created by otftotfm on Sun Jan 13 15:36:55 2019
+%%AutoEnc_3om7o5bsc7kes7csipbdbvovyh
+% Encoding created by otftotfm on Mon May  4 13:30:28 2020
 % Command line follows encoding
-/AutoEnc_ytbyxhewremjr5edjmg6fevnqc [
+/AutoEnc_3om7o5bsc7kes7csipbdbvovyh [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Regular.otf
-% Erewhon-Regular-tlf-sc-t2a'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Regular.otf Erewhon-Regular-tlf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_bsmecw.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_43wmo6.enc
index 0b72135a56d..bde7efb9104 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_bsmecw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_43wmo6.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_bsmecwnpdrgzv5wcffbawoatkb
-% Encoding created by otftotfm on Sun Jan 13 15:36:42 2019
+%%AutoEnc_43wmo6zbx547ihcyyk236b6g6b
+% Encoding created by otftotfm on Mon May  4 13:30:17 2020
 % Command line follows encoding
-/AutoEnc_bsmecwnpdrgzv5wcffbawoatkb [
+/AutoEnc_43wmo6zbx547ihcyyk236b6g6b [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
 %10
-  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /fi
-  /perthousandzero /dotlessi /uni0237 /ffi /ff /fl /ffl /T_h
+  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=onum --feature=tnum
-% Erewhon-Bold.otf Erewhon-Bold-tosf-t2a'
+% --feature=kern --feature=liga --feature=onum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-tosf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5sc5zm.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_44vtia.enc
index 78f1f0fc076..44e49195aaf 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5sc5zm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_44vtia.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_5sc5zmlm26fxhlipzzibrehe5g
-% Encoding created by otftotfm on Sun Jan 13 15:36:27 2019
+%%AutoEnc_44vtiarfy3umi7th6ikkcdnyla
+% Encoding created by otftotfm on Mon May  4 13:30:10 2020
 % Command line follows encoding
-/AutoEnc_5sc5zmlm26fxhlipzzibrehe5g [
+/AutoEnc_44vtiarfy3umi7th6ikkcdnyla [
 %00
   /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /FI.sc /FL.sc /ffi /ffl
 %10
   /dotlessi /uni0237 /grave.sc /acute.sc /caron.sc /breve.sc /macron.sc /ring
   /cedilla /.notdef /AE.sc /oe.sc /Oslash.sc /AE /OE /Oslash
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Regular.otf
-% Erewhon-Regular-tosf-sc-ly1'
+% --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Regular.otf Erewhon-Regular-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dq4c7f.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_45lvyq.enc
index 1e985ba8d77..c4f78e220ac 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dq4c7f.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_45lvyq.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_dq4c7fmfe7jtll7q2mn43racdh
-% Encoding created by otftotfm on Sun Jan 13 15:36:00 2019
+%%AutoEnc_45lvyqiuboididyyy3t3ek5eyf
+% Encoding created by otftotfm on Mon May  4 13:29:44 2020
 % Command line follows encoding
-/AutoEnc_dq4c7fmfe7jtll7q2mn43racdh [
+/AutoEnc_45lvyqiuboididyyy3t3ek5eyf [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=sups --ligkern=* {KL} * Erewhon-Bold.otf
-% Erewhon-Bold-sup-ly1'
+% --feature=liga --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_53cvlj.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5oigqs.enc
index 5714f53a0eb..857bc04613e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_53cvlj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5oigqs.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_53cvljhcszxkzgio3okufjnlce
-% Encoding created by otftotfm on Sun Jan 13 15:35:58 2019
+%%AutoEnc_5oigqs3lg3xshsb6wm4prskwoh
+% Encoding created by otftotfm on Mon May  4 13:29:41 2020
 % Command line follows encoding
-/AutoEnc_53cvljhcszxkzgio3okufjnlce [
+/AutoEnc_5oigqs3lg3xshsb6wm4prskwoh [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
@@ -11,16 +11,16 @@
   /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
 %20
-  /uni2423 /zero.denominator /zero.numerator /endash /dollar /.notdef /.notdef /quotesingle
+  /uni2423 /endash /zero.denominator /zero.numerator /dollar /.notdef /.notdef /quotesingle
   /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
 %30
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
 %40
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /uni2127 /.notdef /.notdef
 %50
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %60
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,13 +54,12 @@
   /ffl /ffi /ff /fl /l /fi /i /f
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.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
-% Erewhon-Bold.otf Erewhon-Bold-tosf-ts1'
+% Erewhon-Bold.otf Erewhon-Bold-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lkesvg.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5rdrfx.enc
index f0199b52e54..88972e53d41 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lkesvg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5rdrfx.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_lkesvgfxnbxapxbzo62pgbjkte
-% Encoding created by otftotfm on Sun Jan 13 15:36:00 2019
+%%AutoEnc_5rdrfxlrvtaao34imywuja2skb
+% Encoding created by otftotfm on Mon May  4 13:29:44 2020
 % Command line follows encoding
-/AutoEnc_lkesvgfxnbxapxbzo62pgbjkte [
+/AutoEnc_5rdrfxlrvtaao34imywuja2skb [
 %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 /afii61664
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.superior /hyphen /period.superior /slash
@@ -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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=sups --ligkern=* {KL} *
-% Erewhon-Bold.otf Erewhon-Bold-sup-t1'
+% --feature=kern --feature=liga --feature=sups --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_pkjbl3.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5zxumb.enc
index 1f0c9ea5c17..a527612b449 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_pkjbl3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5zxumb.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_pkjbl36ol4gtcpumrhjpfjamhh
-% Encoding created by otftotfm on Sun Jan 13 15:37:29 2019
+%%AutoEnc_5zxumbnvlcfirmjgrrhpo4qgmd
+% Encoding created by otftotfm on Mon May  4 13:30:59 2020
 % Command line follows encoding
-/AutoEnc_pkjbl36ol4gtcpumrhjpfjamhh [
+/AutoEnc_5zxumbnvlcfirmjgrrhpo4qgmd [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Regular.otf
-% Erewhon-Regular-tlf-sc-t2c'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Regular.otf Erewhon-Regular-tlf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5dcbdr.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_6ffpzw.enc
index 296207a7482..c7e1b50c6b0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5dcbdr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_6ffpzw.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_5dcbdrvpvcf3qj6fuovp6kwkgb
-% Encoding created by otftotfm on Sun Jan 13 15:36:07 2019
+%%AutoEnc_6ffpzwftxfd3cogsf27j65ddkb
+% Encoding created by otftotfm on Mon May  4 13:29:50 2020
 % Command line follows encoding
-/AutoEnc_5dcbdrvpvcf3qj6fuovp6kwkgb [
+/AutoEnc_6ffpzwftxfd3cogsf27j65ddkb [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=sups --ligkern=* {KL} * Erewhon-BoldItalic.otf
-% Erewhon-BoldItalic-sup-ly1'
+% --feature=liga --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --ligkern=* {KL} * Erewhon-BoldItalic.otf Erewhon-BoldItalic-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_t4eroa.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_6uafpb.enc
index dae75dab228..ed2fa72bd8d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_t4eroa.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_6uafpb.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_t4eroa6njeeutvxw6qvi6lb25d
-% Encoding created by otftotfm on Sun Jan 13 15:37:31 2019
+%%AutoEnc_6uafpbuulz26flcptjqtjocp6h
+% Encoding created by otftotfm on Mon May  4 13:31:00 2020
 % Command line follows encoding
-/AutoEnc_t4eroa6njeeutvxw6qvi6lb25d [
+/AutoEnc_6uafpbuulz26flcptjqtjocp6h [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-RegularSlanted.otf
-% Erewhon-RegularSlanted-lf-sc-t2c'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-RegularSlanted.otf Erewhon-RegularSlanted-lf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2jm7ak.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7qbp4f.enc
index 52b18eef8a1..07aacfc5e87 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2jm7ak.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7qbp4f.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_2jm7akoxbhq35mgddnmixceknh
-% Encoding created by otftotfm on Sun Jan 13 15:37:14 2019
+%%AutoEnc_7qbp4fql4ip3ypmabozm3qr3nh
+% Encoding created by otftotfm on Mon May  4 13:30:45 2020
 % Command line follows encoding
-/AutoEnc_2jm7akoxbhq35mgddnmixceknh [
+/AutoEnc_7qbp4fql4ip3ypmabozm3qr3nh [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-RegularSlanted.otf
-% Erewhon-RegularSlanted-tosf-sc-t2b'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-RegularSlanted.otf Erewhon-RegularSlanted-tosf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_b2jol2.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_a2ijma.enc
index 2a1e85e80cb..8d235d2d2f9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_b2jol2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_a2ijma.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_b2jol2ei5u7s653pdh3autpzag
-% Encoding created by otftotfm on Sun Jan 13 15:36:59 2019
+%%AutoEnc_a2ijmaxiqjzpfnjf3oy4pq773a
+% Encoding created by otftotfm on Mon May  4 13:30:33 2020
 % Command line follows encoding
-/AutoEnc_b2jol2ei5u7s653pdh3autpzag [
+/AutoEnc_a2ijmaxiqjzpfnjf3oy4pq773a [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.numerator /hyphen /period.numerator /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
-% --feature=kern --feature=liga --feature=numr --ligkern=* {KL} *
-% Erewhon-Bold.otf Erewhon-Bold-numr-t2b'
+% --feature=kern --feature=liga --feature=numr --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-numr-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_u6hvbn.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_alti6e.enc
index a598c1fedca..83dfbabb565 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_u6hvbn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_alti6e.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_u6hvbnigt2ykug34eq4wuhl7ob
-% Encoding created by otftotfm on Sun Jan 13 15:36:41 2019
+%%AutoEnc_alti6exx7n3perfea4ocq6prmf
+% Encoding created by otftotfm on Mon May  4 13:30:18 2020
 % Command line follows encoding
-/AutoEnc_u6hvbnigt2ykug34eq4wuhl7ob [
+/AutoEnc_alti6exx7n3perfea4ocq6prmf [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=sinf --ligkern=* {KL} *
-% Erewhon-Bold.otf Erewhon-Bold-inf-t2a'
+% --feature=kern --feature=liga --feature=sinf --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-inf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5zii66.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ap3btm.enc
index ce8d131189b..50c3e634793 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5zii66.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ap3btm.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_5zii66fvhh6rtxb3gnb4xghjed
-% Encoding created by otftotfm on Sun Jan 13 15:36:57 2019
+%%AutoEnc_ap3btmoep2ikhrm3mibvmrwdmh
+% Encoding created by otftotfm on Mon May  4 13:30:30 2020
 % Command line follows encoding
-/AutoEnc_5zii66fvhh6rtxb3gnb4xghjed [
+/AutoEnc_ap3btmoep2ikhrm3mibvmrwdmh [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-RegularSlanted.otf
-% Erewhon-RegularSlanted-tosf-sc-t2a'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-RegularSlanted.otf Erewhon-RegularSlanted-tosf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5ebsy3.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_arprdz.enc
index 2cdd3563ca1..523c97d3f84 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5ebsy3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_arprdz.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_5ebsy32dckdsxxgjgxyyv3uzdh
-% Encoding created by otftotfm on Sun Jan 13 15:36:41 2019
+%%AutoEnc_arprdz74ocb4enwmna2noek6ig
+% Encoding created by otftotfm on Mon May  4 13:30:16 2020
 % Command line follows encoding
-/AutoEnc_5ebsy32dckdsxxgjgxyyv3uzdh [
+/AutoEnc_arprdz74ocb4enwmna2noek6ig [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.numerator /hyphen /period.numerator /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=numr --ligkern=* {KL} *
-% Erewhon-Bold.otf Erewhon-Bold-numr-t2a'
+% --feature=kern --feature=liga --feature=numr --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-numr-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_d2bm6z.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_auc4ej.enc
index 0ac6ec96ec5..a23d129c5c3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_d2bm6z.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_auc4ej.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_d2bm6zwwrjzi6pj3tyrpdsoskg
-% Encoding created by otftotfm on Sun Jan 13 15:36:05 2019
+%%AutoEnc_auc4eja352kwuq2pxr4q4inrna
+% Encoding created by otftotfm on Mon May  4 13:29:47 2020
 % Command line follows encoding
-/AutoEnc_d2bm6zwwrjzi6pj3tyrpdsoskg [
+/AutoEnc_auc4eja352kwuq2pxr4q4inrna [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
@@ -11,16 +11,16 @@
   /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
 %20
-  /uni2423 /zero.denominator /zero.numerator /endash /dollar /.notdef /.notdef /quotesingle
+  /uni2423 /endash /zero.denominator /zero.numerator /dollar /.notdef /.notdef /quotesingle
   /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
 %30
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
 %40
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /uni2127 /.notdef /.notdef
 %50
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %60
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,13 +54,12 @@
   /ffl /ffi /ff /fl /l /fi /i /f
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.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
-% Erewhon-BoldItalic.otf Erewhon-BoldItalic-tosf-ts1'
+% Erewhon-BoldItalic.otf Erewhon-BoldItalic-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_muv2lr.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_auximm.enc
index 45f182152e7..26871229f3b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_muv2lr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_auximm.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_muv2lrzzatcrvzherzjkf36l7c
-% Encoding created by otftotfm on Sun Jan 13 15:37:10 2019
+%%AutoEnc_auximm4wrfjtxg3m2vbwwlyb7b
+% Encoding created by otftotfm on Mon May  4 13:30:43 2020
 % Command line follows encoding
-/AutoEnc_muv2lrzzatcrvzherzjkf36l7c [
+/AutoEnc_auximm4wrfjtxg3m2vbwwlyb7b [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus /comma.superior /hyphen /period.superior /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
-% --feature=kern --feature=liga --feature=sups --ligkern=* {KL} *
-% Erewhon-Regular.otf Erewhon-Regular-sup-t2b'
+% --feature=kern --feature=liga --feature=sups --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-Regular.otf Erewhon-Regular-sup-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mxraii.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_avxsqu.enc
index f04f0c06bcd..d79a961800c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mxraii.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_avxsqu.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_mxraiimvx2ybqwkmweplashmif
-% Encoding created by otftotfm on Sun Jan 13 15:36:41 2019
+%%AutoEnc_avxsquxo374zeij2m4rrrgmmsd
+% Encoding created by otftotfm on Mon May  4 13:30:17 2020
 % Command line follows encoding
-/AutoEnc_mxraiimvx2ybqwkmweplashmif [
+/AutoEnc_avxsquxo374zeij2m4rrrgmmsd [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf
-% Erewhon-Bold-osf-sc-t2a'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Bold.otf Erewhon-Bold-osf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_azqpxw.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_bgu3lr.enc
index 23dc3efe5bb..b3a82dc31c7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_azqpxw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_bgu3lr.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_azqpxwwsy6pa4cpvo43aa63rmh
-% Encoding created by otftotfm on Sun Jan 13 15:36:30 2019
+%%AutoEnc_bgu3lr5cgpgu5tvhtlmg25wz5b
+% Encoding created by otftotfm on Mon May  4 13:30:08 2020
 % Command line follows encoding
-/AutoEnc_azqpxwwsy6pa4cpvo43aa63rmh [
+/AutoEnc_bgu3lr5cgpgu5tvhtlmg25wz5b [
 %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 /afii61664
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus /comma.superior /hyphen /period.superior /slash
@@ -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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=sups --ligkern=* {KL} *
-% Erewhon-Regular.otf Erewhon-Regular-sup-t1'
+% --feature=kern --feature=liga --feature=sups --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-Regular.otf Erewhon-Regular-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_oe3m4u.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cnetzv.enc
index b0998b0e6cd..6ea66a283ac 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_oe3m4u.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cnetzv.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_oe3m4u2miekwcszwzkiggwkgih
-% Encoding created by otftotfm on Sun Jan 13 15:36:07 2019
+%%AutoEnc_cnetzvtkjh5rh4rawswtdj24ah
+% Encoding created by otftotfm on Mon May  4 13:29:50 2020
 % Command line follows encoding
-/AutoEnc_oe3m4u2miekwcszwzkiggwkgih [
+/AutoEnc_cnetzvtkjh5rh4rawswtdj24ah [
 %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 /afii61664
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -54,12 +54,13 @@
   /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t1
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=sups --ligkern=* {KL} *
-% Erewhon-BoldItalic.otf Erewhon-BoldItalic-sup-t1'
+% --feature=kern --feature=liga --feature=sups --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-BoldItalic.otf
+% Erewhon-BoldItalic-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3wlt4n.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cqlwfi.enc
index ab402e207c5..c559bfb2e92 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3wlt4n.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cqlwfi.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_3wlt4nsr52zlhe44sbv6hqenlg
-% Encoding created by otftotfm on Sun Jan 13 15:37:17 2019
+%%AutoEnc_cqlwfiursfrjui3lckxr7jiwze
+% Encoding created by otftotfm on Mon May  4 13:30:48 2020
 % Command line follows encoding
-/AutoEnc_3wlt4nsr52zlhe44sbv6hqenlg [
+/AutoEnc_cqlwfiursfrjui3lckxr7jiwze [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,12 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf Erewhon-Bold-lf-sc-t2c'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Bold.otf Erewhon-Bold-lf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lms5gf.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cwbecz.enc
index c8401ee23c3..ee840f80d85 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lms5gf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cwbecz.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_lms5gfujlhagphfpkkqkeit4xc
-% Encoding created by otftotfm on Sun Jan 13 15:37:09 2019
+%%AutoEnc_cwbecztg4ljvntrtfc3d6popvd
+% Encoding created by otftotfm on Mon May  4 13:30:41 2020
 % Command line follows encoding
-/AutoEnc_lms5gfujlhagphfpkkqkeit4xc [
+/AutoEnc_cwbecztg4ljvntrtfc3d6popvd [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
-% Erewhon-Italic-tlf-sc-t2b'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Italic.otf Erewhon-Italic-tlf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ygtjzk.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cwyvmt.enc
index f281eed1dfd..51c05e5f642 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ygtjzk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cwyvmt.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ygtjzkptxm7ezh36w43a5z2kff
-% Encoding created by otftotfm on Sun Jan 13 15:37:17 2019
+%%AutoEnc_cwyvmtet3dtwiqkzfxopce6mrf
+% Encoding created by otftotfm on Mon May  4 13:30:48 2020
 % Command line follows encoding
-/AutoEnc_ygtjzkptxm7ezh36w43a5z2kff [
+/AutoEnc_cwyvmtet3dtwiqkzfxopce6mrf [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.numerator /hyphen /period.numerator /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
-% --feature=kern --feature=liga --feature=numr --ligkern=* {KL} *
-% Erewhon-Bold.otf Erewhon-Bold-numr-t2c'
+% --feature=kern --feature=liga --feature=numr --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-numr-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wrs2qn.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_d6faof.enc
index 20ba5286657..28ad2dcf063 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wrs2qn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_d6faof.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_wrs2qnynpd47dtk2ulvf4thrta
-% Encoding created by otftotfm on Sun Jan 13 15:36:29 2019
+%%AutoEnc_d6faofbzq5wua3q6f5ctw2jwsb
+% Encoding created by otftotfm on Mon May  4 13:30:07 2020
 % Command line follows encoding
-/AutoEnc_wrs2qnynpd47dtk2ulvf4thrta [
+/AutoEnc_d6faofbzq5wua3q6f5ctw2jwsb [
 %00
   /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /FI.sc /FL.sc /ffi /ffl
 %10
   /dotlessi /uni0237 /grave.sc /acute.sc /caron.sc /breve.sc /macron.sc /ring
   /cedilla /.notdef /AE.sc /oe.sc /Oslash.sc /AE /OE /Oslash
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Regular.otf
-% Erewhon-Regular-lf-sc-ly1'
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Regular.otf Erewhon-Regular-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qcaspe.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_difcna.enc
index d81a6c3e345..354496528c3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qcaspe.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_difcna.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_qcaspehrhn732alqh6ry5eugna
-% Encoding created by otftotfm on Sun Jan 13 15:36:51 2019
+%%AutoEnc_difcnamdlb3hsgevr4rs3f33mh
+% Encoding created by otftotfm on Mon May  4 13:30:25 2020
 % Command line follows encoding
-/AutoEnc_qcaspehrhn732alqh6ry5eugna [
+/AutoEnc_difcnamdlb3hsgevr4rs3f33mh [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
-% Erewhon-Italic-tosf-sc-t2a'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Italic.otf Erewhon-Italic-tosf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hl634h.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_diyaes.enc
index d22365a4647..7d20ad5d453 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hl634h.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_diyaes.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_hl634hz77uxvfzzkfj7zczaeug
-% Encoding created by otftotfm on Sun Jan 13 15:36:30 2019
+%%AutoEnc_diyaesm2dtjpnnttcmzquopwqb
+% Encoding created by otftotfm on Mon May  4 13:30:08 2020
 % Command line follows encoding
-/AutoEnc_hl634hz77uxvfzzkfj7zczaeug [
+/AutoEnc_diyaesm2dtjpnnttcmzquopwqb [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=sups --ligkern=* {KL} * Erewhon-Regular.otf
-% Erewhon-Regular-sup-ly1'
+% --feature=liga --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --ligkern=* {KL} * Erewhon-Regular.otf Erewhon-Regular-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nwll5a.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dn3zcw.enc
index d1ac079f4f9..0a45b6b7631 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nwll5a.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dn3zcw.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_nwll5a43vvjxwec4h3etohsp6a
-% Encoding created by otftotfm on Sun Jan 13 15:36:01 2019
+%%AutoEnc_dn3zcwkgft5natye6xae5zaije
+% Encoding created by otftotfm on Mon May  4 13:29:42 2020
 % Command line follows encoding
-/AutoEnc_nwll5a43vvjxwec4h3etohsp6a [
+/AutoEnc_dn3zcwkgft5natye6xae5zaije [
 %00
   /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %10
   /I.sc /J.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /AE.sc /OE.sc /Oslash.sc /AE /OE /Oslash
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf
+% --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall Erewhon-Bold.otf
 % Erewhon-Bold-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ybkoku.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dnhvn3.enc
index c238d8baf4b..5d55a4fee84 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ybkoku.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dnhvn3.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ybkokumvup5gik2s3mjumqadxh
-% Encoding created by otftotfm on Sun Jan 13 15:36:06 2019
+%%AutoEnc_dnhvn3eke7zu5sjjabbi6bzhoa
+% Encoding created by otftotfm on Mon May  4 13:29:49 2020
 % Command line follows encoding
-/AutoEnc_ybkokumvup5gik2s3mjumqadxh [
+/AutoEnc_dnhvn3eke7zu5sjjabbi6bzhoa [
 %00
-  /fi /Euro /ffi /ff /fraction /dotaccent /hungarumlaut /ogonek
-  /fl /ffl /afii61664 /f_b /f_h /f_j /f_k /T_h
+  /f_b /Euro /f_h /f_j /fraction /dotaccent /hungarumlaut /ogonek
+  /f_k /T_h /afii61664 /ff /fi /fl /ffi /ffl
 %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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=pnum Erewhon-BoldItalic.otf
-% Erewhon-BoldItalic-lf-ly1'
+% --feature=liga --feature=lnum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Erewhon-BoldItalic.otf Erewhon-BoldItalic-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nmevy6.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dv3mk6.enc
index 5802d26235c..ca3e0440917 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nmevy6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dv3mk6.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_nmevy6itjhbxdhu2afvetdjene
-% Encoding created by otftotfm on Sun Jan 13 15:35:56 2019
+%%AutoEnc_dv3mk6qutbgevbxeknyhnmetyg
+% Encoding created by otftotfm on Mon May  4 13:29:39 2020
 % Command line follows encoding
-/AutoEnc_nmevy6itjhbxdhu2afvetdjene [
+/AutoEnc_dv3mk6qutbgevbxeknyhnmetyg [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=sinf --ligkern=* {KL} * Erewhon-Bold.otf
-% Erewhon-Bold-inf-ly1'
+% --feature=liga --feature=sinf --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-inf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_bkk6kl.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_e77ndl.enc
index 34a42d503cc..f98fa959e13 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_bkk6kl.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_e77ndl.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_bkk6kljuq42xwtyursc5v7xjkh
-% Encoding created by otftotfm on Sun Jan 13 15:36:45 2019
+%%AutoEnc_e77ndl3ip6fruz6acexq4ojata
+% Encoding created by otftotfm on Mon May  4 13:30:20 2020
 % Command line follows encoding
-/AutoEnc_bkk6kljuq42xwtyursc5v7xjkh [
+/AutoEnc_e77ndl3ip6fruz6acexq4ojata [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -54,12 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=sups --ligkern=* {KL} *
-% Erewhon-BoldItalic.otf Erewhon-BoldItalic-sup-t2a'
+% --feature=kern --feature=liga --feature=sups --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-BoldItalic.otf
+% Erewhon-BoldItalic-sup-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ib3abc.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_e77qtc.enc
index 503ba6a9d59..e5b237e6e51 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ib3abc.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_e77qtc.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ib3abc6bap7g3rudd3o762krbc
-% Encoding created by otftotfm on Sun Jan 13 15:37:11 2019
+%%AutoEnc_e77qtcktnd7r5sqzih4pxwsksg
+% Encoding created by otftotfm on Mon May  4 13:30:43 2020
 % Command line follows encoding
-/AutoEnc_ib3abc6bap7g3rudd3o762krbc [
+/AutoEnc_e77qtcktnd7r5sqzih4pxwsksg [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Regular.otf
-% Erewhon-Regular-tosf-sc-t2b'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Regular.otf Erewhon-Regular-tosf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_46ywhf.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ejltpg.enc
index 57074bbe680..72900d75956 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_46ywhf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ejltpg.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_46ywhfr7pzpw5cdfgs2q5hy3ka
-% Encoding created by otftotfm on Sun Jan 13 15:36:39 2019
+%%AutoEnc_ejltpgr2e2ye6frntnbdidv56h
+% Encoding created by otftotfm on Mon May  4 13:30:11 2020
 % Command line follows encoding
-/AutoEnc_46ywhfr7pzpw5cdfgs2q5hy3ka [
+/AutoEnc_ejltpgr2e2ye6frntnbdidv56h [
 %00
   /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %10
   /I.sc /J.sc /grave.sc /acute.sc /caron.sc /breve.sc /macron.sc /ring
   /cedilla /.notdef /AE.sc /OE.sc /Oslash.sc /AE /OE /Oslash
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-RegularSlanted.otf
-% Erewhon-RegularSlanted-tlf-sc-ly1'
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-RegularSlanted.otf Erewhon-RegularSlanted-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_r5cqnt.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ekq2fx.enc
index 81cb7269119..4ad55d71797 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_r5cqnt.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ekq2fx.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_r5cqnte4zzpdp7wlwdkujzbngb
-% Encoding created by otftotfm on Sun Jan 13 15:37:14 2019
+%%AutoEnc_ekq2fxftfud4bp4jpk273yp35b
+% Encoding created by otftotfm on Mon May  4 13:30:44 2020
 % Command line follows encoding
-/AutoEnc_r5cqnte4zzpdp7wlwdkujzbngb [
+/AutoEnc_ekq2fxftfud4bp4jpk273yp35b [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-RegularSlanted.otf
-% Erewhon-RegularSlanted-osf-sc-t2b'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-RegularSlanted.otf Erewhon-RegularSlanted-osf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3pm7ws.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_eu4f6g.enc
index a1bae664f65..bc259c75ffc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3pm7ws.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_eu4f6g.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_3pm7wshrw25wj5s6nnla7nh47e
-% Encoding created by otftotfm on Sun Jan 13 15:36:54 2019
+%%AutoEnc_eu4f6guvlotd5agjis4dkqch2f
+% Encoding created by otftotfm on Mon May  4 13:30:29 2020
 % Command line follows encoding
-/AutoEnc_3pm7wshrw25wj5s6nnla7nh47e [
+/AutoEnc_eu4f6guvlotd5agjis4dkqch2f [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Regular.otf
-% Erewhon-Regular-lf-sc-t2a'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Regular.otf Erewhon-Regular-lf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7wmsrn.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_eulyhg.enc
index 8eb6beffc97..cf1db033978 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7wmsrn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_eulyhg.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_7wmsrng3ephnpjvbyft6ioffac
-% Encoding created by otftotfm on Sun Jan 13 15:37:15 2019
+%%AutoEnc_eulyhgf37rnvapvnym2werh5da
+% Encoding created by otftotfm on Mon May  4 13:30:46 2020
 % Command line follows encoding
-/AutoEnc_7wmsrng3ephnpjvbyft6ioffac [
+/AutoEnc_eulyhgf37rnvapvnym2werh5da [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-RegularSlanted.otf
-% Erewhon-RegularSlanted-tlf-sc-t2b'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-RegularSlanted.otf Erewhon-RegularSlanted-tlf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qokyam.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_f3qrga.enc
index abd37ea7e93..027948502db 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qokyam.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_f3qrga.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_qokyamx7hhtc3kwweipdqpgbre
-% Encoding created by otftotfm on Sun Jan 13 15:37:16 2019
+%%AutoEnc_f3qrga4ngejd5faaxcrao6e2ph
+% Encoding created by otftotfm on Mon May  4 13:30:47 2020
 % Command line follows encoding
-/AutoEnc_qokyamx7hhtc3kwweipdqpgbre [
+/AutoEnc_f3qrga4ngejd5faaxcrao6e2ph [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
 %10
-  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /fi
-  /perthousandzero /dotlessi /uni0237 /ffi /ff /fl /ffl /T_h
+  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
-% --feature=kern --feature=liga --feature=onum --feature=tnum
-% Erewhon-Bold.otf Erewhon-Bold-tosf-t2c'
+% --feature=kern --feature=liga --feature=onum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-tosf-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mivgv5.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fhck2l.enc
index 10196a8add3..3db600955a2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mivgv5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fhck2l.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_mivgv5e74gc6rlyl4chlt3zzfh
-% Encoding created by otftotfm on Sun Jan 13 15:37:00 2019
+%%AutoEnc_fhck2lwwjcefeyghoqi53ch4ih
+% Encoding created by otftotfm on Mon May  4 13:30:33 2020
 % Command line follows encoding
-/AutoEnc_mivgv5e74gc6rlyl4chlt3zzfh [
+/AutoEnc_fhck2lwwjcefeyghoqi53ch4ih [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf
-% Erewhon-Bold-tosf-sc-t2b'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Bold.otf Erewhon-Bold-tosf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ftudgd.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_flawok.enc
index 93ef401306d..5f3bc9ce2cb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ftudgd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_flawok.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ftudgdoqqbpbapa37an63sfxpa
-% Encoding created by otftotfm on Sun Jan 13 15:37:08 2019
+%%AutoEnc_flawokpqzvakggamqlszrohzge
+% Encoding created by otftotfm on Mon May  4 13:30:40 2020
 % Command line follows encoding
-/AutoEnc_ftudgdoqqbpbapa37an63sfxpa [
+/AutoEnc_flawokpqzvakggamqlszrohzge [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
-% Erewhon-Italic-tosf-sc-t2b'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Italic.otf Erewhon-Italic-tosf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_znmclt.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fmm3ij.enc
index c47b5115788..20f54cbb8ae 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_znmclt.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fmm3ij.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_znmcltw4eiatfui2z7r3hftfge
-% Encoding created by otftotfm on Sun Jan 13 15:37:30 2019
+%%AutoEnc_fmm3ijj6eijjcrt3hjjzmfrg6g
+% Encoding created by otftotfm on Mon May  4 13:31:00 2020
 % Command line follows encoding
-/AutoEnc_znmcltw4eiatfui2z7r3hftfge [
+/AutoEnc_fmm3ijj6eijjcrt3hjjzmfrg6g [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-RegularSlanted.otf
-% Erewhon-RegularSlanted-tosf-sc-t2c'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-RegularSlanted.otf Erewhon-RegularSlanted-tosf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_y63e5u.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_g5zjdm.enc
index fa8b879f849..3aaaca1828a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_y63e5u.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_g5zjdm.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_y63e5utdo5yzpykfgplbb3rhkc
-% Encoding created by otftotfm on Sun Jan 13 15:37:18 2019
+%%AutoEnc_g5zjdmvl5cr6rdh64ea6adsllh
+% Encoding created by otftotfm on Mon May  4 13:30:48 2020
 % Command line follows encoding
-/AutoEnc_y63e5utdo5yzpykfgplbb3rhkc [
+/AutoEnc_g5zjdmvl5cr6rdh64ea6adsllh [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.denominator /hyphen /period.denominator /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
-% --feature=dnom --feature=kern --feature=liga --ligkern=* {KL} *
-% Erewhon-Bold.otf Erewhon-Bold-dnom-t2c'
+% --feature=dnom --feature=kern --feature=liga --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-dnom-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uevisq.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_g7cqph.enc
index 3a707a84b24..5d9e965908e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uevisq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_g7cqph.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_uevisqn2q6wov4hac4rcpmvwmd
-% Encoding created by otftotfm on Sun Jan 13 15:37:24 2019
+%%AutoEnc_g7cqphvdzab2tpapakrbyzvf3d
+% Encoding created by otftotfm on Mon May  4 13:30:54 2020
 % Command line follows encoding
-/AutoEnc_uevisqn2q6wov4hac4rcpmvwmd [
+/AutoEnc_g7cqphvdzab2tpapakrbyzvf3d [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
-% Erewhon-Italic-osf-sc-t2c'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Italic.otf Erewhon-Italic-osf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_pkw5wi.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gc72xz.enc
index 5e3518677bb..c046446c6af 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_pkw5wi.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gc72xz.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_pkw5wivoyluprdcsgyngvdtteg
-% Encoding created by otftotfm on Sun Jan 13 15:36:23 2019
+%%AutoEnc_gc72xzdhe2duith3ljywljeafd
+% Encoding created by otftotfm on Mon May  4 13:30:00 2020
 % Command line follows encoding
-/AutoEnc_pkw5wivoyluprdcsgyngvdtteg [
+/AutoEnc_gc72xzdhe2duith3ljywljeafd [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
 %10
   /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /afii61664
-  /perthousandzero /I.sc /J.sc /S.sc /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -33,7 +33,7 @@
   /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
 %90
   /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /dcroat /section
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /S.sc /Idotaccent /dcroat /section
 %A0
   /Abreve.sc /aogonek /cacute /Ccaron.sc /Dcaron.sc /Ecaron.sc /eogonek /gbreve
   /Lacute.sc /Lcaron.sc /lslash /Nacute.sc /Ncaron.sc /eng /ohungarumlaut /Racute.sc
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
-% Erewhon-Italic-osf-sc-t1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Italic.otf Erewhon-Italic-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vj6erk.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gohf2a.enc
index 84b1104d501..8dabb36ba59 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vj6erk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gohf2a.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_vj6erk7kewbrotktiixuvwu5ee
-% Encoding created by otftotfm on Sun Jan 13 15:36:38 2019
+%%AutoEnc_gohf2aa4eszacdcvgcxy3hc4he
+% Encoding created by otftotfm on Mon May  4 13:30:12 2020
 % Command line follows encoding
-/AutoEnc_vj6erk7kewbrotktiixuvwu5ee [
+/AutoEnc_gohf2aa4eszacdcvgcxy3hc4he [
 %00
   /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %10
   /I.sc /J.sc /grave.sc /acute.sc /caron.sc /breve.sc /macron.sc /ring
   /cedilla /.notdef /AE.sc /OE.sc /Oslash.sc /AE /OE /Oslash
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-RegularSlanted.otf
-% Erewhon-RegularSlanted-osf-sc-ly1'
+% --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-RegularSlanted.otf Erewhon-RegularSlanted-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_psdthf.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gom6la.enc
index 991feb88d74..59a67343e8b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_psdthf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gom6la.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_psdthftm3up3an2b27mgkryaeh
-% Encoding created by otftotfm on Sun Jan 13 15:35:58 2019
+%%AutoEnc_gom6lauq7timnqkv5frvr2vwug
+% Encoding created by otftotfm on Mon May  4 13:29:45 2020
 % Command line follows encoding
-/AutoEnc_psdthftm3up3an2b27mgkryaeh [
+/AutoEnc_gom6lauq7timnqkv5frvr2vwug [
 %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 /afii61664
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf
-% Erewhon-Bold-tosf-sc-t1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Bold.otf Erewhon-Bold-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5cobnr.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gqji7z.enc
index a483a62794d..09f388ff40c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5cobnr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gqji7z.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_5cobnrnnxa63xahbg4mbqhpgwa
-% Encoding created by otftotfm on Sun Jan 13 15:35:58 2019
+%%AutoEnc_gqji7zklr4wvmpgemzivkzh4ta
+% Encoding created by otftotfm on Mon May  4 13:29:45 2020
 % Command line follows encoding
-/AutoEnc_5cobnrnnxa63xahbg4mbqhpgwa [
+/AutoEnc_gqji7zklr4wvmpgemzivkzh4ta [
 %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 /afii61664
-  /perthousandzero /dotlessi /uni0237 /fi /ffi /ff /fl /ffl
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=onum --feature=tnum
-% Erewhon-Bold.otf Erewhon-Bold-tosf-t1'
+% --feature=kern --feature=liga --feature=onum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-tosf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gbmzbk.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gsknjr.enc
index aa3e6f2aefa..44ed2703e66 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gbmzbk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gsknjr.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_gbmzbkb423ptardxwohoh6wryd
-% Encoding created by otftotfm on Sun Jan 13 15:35:56 2019
+%%AutoEnc_gsknjrrvuc4ih37w37ozycg2cg
+% Encoding created by otftotfm on Mon May  4 13:29:40 2020
 % Command line follows encoding
-/AutoEnc_gbmzbkb423ptardxwohoh6wryd [
+/AutoEnc_gsknjrrvuc4ih37w37ozycg2cg [
 %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 /afii61664
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=sinf --ligkern=* {KL} *
-% Erewhon-Bold.otf Erewhon-Bold-inf-t1'
+% --feature=kern --feature=liga --feature=sinf --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-inf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zvdim6.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_guyry6.enc
index 0b883cdc448..9fa43d69726 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zvdim6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_guyry6.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_zvdim6rht7x2dx7lahicidnkqd
-% Encoding created by otftotfm on Sun Jan 13 15:37:30 2019
+%%AutoEnc_guyry6nvwmo6dliton2abuyukd
+% Encoding created by otftotfm on Mon May  4 13:30:59 2020
 % Command line follows encoding
-/AutoEnc_zvdim6rht7x2dx7lahicidnkqd [
+/AutoEnc_guyry6nvwmo6dliton2abuyukd [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-RegularSlanted.otf
-% Erewhon-RegularSlanted-osf-sc-t2c'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-RegularSlanted.otf Erewhon-RegularSlanted-osf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_g6cvhs.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hbj2kj.enc
index 8eded567cd3..463faee0585 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_g6cvhs.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hbj2kj.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_g6cvhs23fpcdstfhmcqj3ezqxa
-% Encoding created by otftotfm on Sun Jan 13 15:37:25 2019
+%%AutoEnc_hbj2kjra6gxdz7to7epcapdxua
+% Encoding created by otftotfm on Mon May  4 13:30:55 2020
 % Command line follows encoding
-/AutoEnc_g6cvhs23fpcdstfhmcqj3ezqxa [
+/AutoEnc_hbj2kjra6gxdz7to7epcapdxua [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
-% Erewhon-Italic-tosf-sc-t2c'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Italic.otf Erewhon-Italic-tosf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ibrkbm.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hljml5.enc
index 8bdd8318d7c..31baf30c50e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ibrkbm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hljml5.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ibrkbmlwh5efmnwqcqnbumuqle
-% Encoding created by otftotfm on Sun Jan 13 15:36:35 2019
+%%AutoEnc_hljml5d7bx7xiynopqospzwhtg
+% Encoding created by otftotfm on Mon May  4 13:30:16 2020
 % Command line follows encoding
-/AutoEnc_ibrkbmlwh5efmnwqcqnbumuqle [
+/AutoEnc_hljml5d7bx7xiynopqospzwhtg [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
 %10
   /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /afii61664
-  /perthousandzero /I.sc /J.sc /S.sc /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -33,7 +33,7 @@
   /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
 %90
   /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /Dcroat.sc /section
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /S.sc /Idotaccent /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 /ohungarumlaut /Racute.sc
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-RegularSlanted.otf
-% Erewhon-RegularSlanted-tosf-sc-t1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-RegularSlanted.otf Erewhon-RegularSlanted-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rl73zu.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_i4xinu.enc
index a4410255267..dec5cd538ca 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rl73zu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_i4xinu.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_rl73zu5zbostbuzbzuh27fe6qh
-% Encoding created by otftotfm on Sun Jan 13 15:36:58 2019
+%%AutoEnc_i4xinub27rl3ybo2mrh5us26ea
+% Encoding created by otftotfm on Mon May  4 13:30:30 2020
 % Command line follows encoding
-/AutoEnc_rl73zu5zbostbuzbzuh27fe6qh [
+/AutoEnc_i4xinub27rl3ybo2mrh5us26ea [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-RegularSlanted.otf
-% Erewhon-RegularSlanted-tlf-sc-t2a'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-RegularSlanted.otf Erewhon-RegularSlanted-tlf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qwlkvu.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ibngfe.enc
index 5ffdf312e55..b5fd04f2992 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qwlkvu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ibngfe.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_qwlkvu2yabxix2zztkhe3oclqb
-% Encoding created by otftotfm on Sun Jan 13 15:37:01 2019
+%%AutoEnc_ibngfejtkzmp3s2nmusssxzjdc
+% Encoding created by otftotfm on Mon May  4 13:30:34 2020
 % Command line follows encoding
-/AutoEnc_qwlkvu2yabxix2zztkhe3oclqb [
+/AutoEnc_ibngfejtkzmp3s2nmusssxzjdc [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf
-% Erewhon-Bold-tlf-sc-t2b'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Bold.otf Erewhon-Bold-tlf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kykvl2.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_iih2z6.enc
index 31fcffc24cd..e250f6617aa 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kykvl2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_iih2z6.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_kykvl2hhdoa6ym2jeld6xjsaka
-% Encoding created by otftotfm on Sun Jan 13 15:36:36 2019
+%%AutoEnc_iih2z6jpjr3iwjfli7wau7i7bf
+% Encoding created by otftotfm on Mon May  4 13:30:13 2020
 % Command line follows encoding
-/AutoEnc_kykvl2hhdoa6ym2jeld6xjsaka [
+/AutoEnc_iih2z6jpjr3iwjfli7wau7i7bf [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
 %10
   /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /afii61664
-  /perthousandzero /I.sc /J.sc /S.sc /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -33,7 +33,7 @@
   /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
 %90
   /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /Dcroat.sc /section
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /S.sc /Idotaccent /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 /ohungarumlaut /Racute.sc
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-RegularSlanted.otf
-% Erewhon-RegularSlanted-lf-sc-t1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-RegularSlanted.otf Erewhon-RegularSlanted-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2d6v2a.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_iioipf.enc
index 75574909913..821b1afaaa1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2d6v2a.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_iioipf.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_2d6v2atplfl7iksogm76urokod
-% Encoding created by otftotfm on Sun Jan 13 15:36:31 2019
+%%AutoEnc_iioipfjae7ff2h3mjvaneskpdh
+% Encoding created by otftotfm on Mon May  4 13:30:06 2020
 % Command line follows encoding
-/AutoEnc_2d6v2atplfl7iksogm76urokod [
+/AutoEnc_iioipfjae7ff2h3mjvaneskpdh [
 %00
   /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /FI.sc /FL.sc /ffi /ffl
 %10
   /dotlessi /uni0237 /grave.sc /acute.sc /caron.sc /breve.sc /macron.sc /ring
   /cedilla /.notdef /AE.sc /oe.sc /Oslash.sc /AE /OE /Oslash
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Regular.otf
-% Erewhon-Regular-osf-sc-ly1'
+% --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Regular.otf Erewhon-Regular-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_czcdxc.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ixswvx.enc
index e779322a646..e218ce732f2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_czcdxc.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ixswvx.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_czcdxci7wf6q647m27qfeexuoc
-% Encoding created by otftotfm on Sun Jan 13 15:36:20 2019
+%%AutoEnc_ixswvxsfv6hj7pnejtey343wwa
+% Encoding created by otftotfm on Mon May  4 13:30:04 2020
 % Command line follows encoding
-/AutoEnc_czcdxci7wf6q647m27qfeexuoc [
+/AutoEnc_ixswvxsfv6hj7pnejtey343wwa [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
 %10
   /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /afii61664
-  /perthousandzero /I.sc /J.sc /S.sc /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -33,7 +33,7 @@
   /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
 %90
   /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /dcroat /section
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /S.sc /Idotaccent /dcroat /section
 %A0
   /Abreve.sc /aogonek /cacute /Ccaron.sc /Dcaron.sc /Ecaron.sc /eogonek /gbreve
   /Lacute.sc /Lcaron.sc /lslash /Nacute.sc /Ncaron.sc /eng /ohungarumlaut /Racute.sc
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
-% Erewhon-Italic-tosf-sc-t1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Italic.otf Erewhon-Italic-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_pux3en.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_j6pqeu.enc
index 5d2be84c900..c4984b46dde 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_pux3en.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_j6pqeu.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_pux3enil4qwqeoxornk7ygxcme
-% Encoding created by otftotfm on Sun Jan 13 15:35:56 2019
+%%AutoEnc_j6pqeu7752kbwdqdrqvpnkaijb
+% Encoding created by otftotfm on Mon May  4 13:29:43 2020
 % Command line follows encoding
-/AutoEnc_pux3enil4qwqeoxornk7ygxcme [
+/AutoEnc_j6pqeu7752kbwdqdrqvpnkaijb [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dnom
-% --feature=kern --feature=liga --ligkern=* {KL} * Erewhon-Bold.otf
-% Erewhon-Bold-dnom-ly1'
+% --feature=kern --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-dnom-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_q6ndkk.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jjyu3n.enc
index b43136364be..062a9649cac 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_q6ndkk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jjyu3n.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_q6ndkkq3qyxtu345nk3ttwkfth
-% Encoding created by otftotfm on Sun Jan 13 15:36:25 2019
+%%AutoEnc_jjyu3nmo4pmudb6mdopbzrq6ke
+% Encoding created by otftotfm on Mon May  4 13:29:59 2020
 % Command line follows encoding
-/AutoEnc_q6ndkkq3qyxtu345nk3ttwkfth [
+/AutoEnc_jjyu3nmo4pmudb6mdopbzrq6ke [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
 %10
   /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /afii61664
-  /perthousandzero /I.sc /J.sc /S.sc /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -33,7 +33,7 @@
   /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
 %90
   /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /dcroat /section
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /S.sc /Idotaccent /dcroat /section
 %A0
   /Abreve.sc /aogonek /cacute /Ccaron.sc /Dcaron.sc /Ecaron.sc /eogonek /gbreve
   /Lacute.sc /Lcaron.sc /lslash /Nacute.sc /Ncaron.sc /eng /ohungarumlaut /Racute.sc
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
-% Erewhon-Italic-tlf-sc-t1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Italic.otf Erewhon-Italic-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zj2fwx.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jsdebf.enc
index 6899fb535cb..415c24497a5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zj2fwx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jsdebf.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_zj2fwxyll4rmt472sxb7bj6wrh
-% Encoding created by otftotfm on Sun Jan 13 15:36:08 2019
+%%AutoEnc_jsdebf3asiai42yux4rwsffwga
+% Encoding created by otftotfm on Mon May  4 13:29:47 2020
 % Command line follows encoding
-/AutoEnc_zj2fwxyll4rmt472sxb7bj6wrh [
+/AutoEnc_jsdebf3asiai42yux4rwsffwga [
 %00
-  /fi /Euro /ffi /ff /fraction /dotaccent /hungarumlaut /ogonek
-  /fl /ffl /afii61664 /f_b /f_h /f_j /f_k /T_h
+  /f_b /Euro /f_h /f_j /fraction /dotaccent /hungarumlaut /ogonek
+  /f_k /T_h /afii61664 /ff /fi /fl /ffi /ffl
 %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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=pnum Erewhon-BoldItalic.otf
-% Erewhon-BoldItalic-osf-ly1'
+% --feature=liga --feature=onum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Erewhon-BoldItalic.otf Erewhon-BoldItalic-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lql6bl.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_k3wfh7.enc
index 70c0734858e..de77b2595a7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lql6bl.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_k3wfh7.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_lql6blcqbncxoymkhhwmwgtz4a
-% Encoding created by otftotfm on Sun Jan 13 15:36:05 2019
+%%AutoEnc_k3wfh7hpgk5dgchbdceflzjwtf
+% Encoding created by otftotfm on Mon May  4 13:29:51 2020
 % Command line follows encoding
-/AutoEnc_lql6blcqbncxoymkhhwmwgtz4a [
+/AutoEnc_k3wfh7hpgk5dgchbdceflzjwtf [
 %00
   /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %10
   /I.sc /J.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /AE.sc /OE.sc /Oslash.sc /AE /OE /Oslash
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-BoldItalic.otf
-% Erewhon-BoldItalic-tosf-sc-ly1'
+% --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-BoldItalic.otf Erewhon-BoldItalic-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jklbl2.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_k5naq7.enc
index 3ffcb0925a9..07cb7e27866 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jklbl2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_k5naq7.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_jklbl2wo2aud6qmanebjfvdaub
-% Encoding created by otftotfm on Sun Jan 13 15:36:58 2019
+%%AutoEnc_k5naq7aeqe7voqd6zlw2adigib
+% Encoding created by otftotfm on Mon May  4 13:30:33 2020
 % Command line follows encoding
-/AutoEnc_jklbl2wo2aud6qmanebjfvdaub [
+/AutoEnc_k5naq7aeqe7voqd6zlw2adigib [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
-% --feature=kern --feature=liga --feature=sinf --ligkern=* {KL} *
-% Erewhon-Bold.otf Erewhon-Bold-inf-t2b'
+% --feature=kern --feature=liga --feature=sinf --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-inf-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_iq2n4h.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kaj6yp.enc
index b15546a91c4..787ebf5c0f3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_iq2n4h.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kaj6yp.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_iq2n4hfyqe222kuqove5znerpf
-% Encoding created by otftotfm on Sun Jan 13 15:37:12 2019
+%%AutoEnc_kaj6ypdqrlvh526atrbsdd3nsc
+% Encoding created by otftotfm on Mon May  4 13:30:42 2020
 % Command line follows encoding
-/AutoEnc_iq2n4hfyqe222kuqove5znerpf [
+/AutoEnc_kaj6ypdqrlvh526atrbsdd3nsc [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Regular.otf
-% Erewhon-Regular-osf-sc-t2b'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Regular.otf Erewhon-Regular-osf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dmsp3x.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kfacq2.enc
index c3a3e597dc3..e61dc6625c6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_dmsp3x.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kfacq2.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_dmsp3xpadz5sxsewyywlmfzofb
-% Encoding created by otftotfm on Sun Jan 13 15:36:36 2019
+%%AutoEnc_kfacq2es3ekovcdvyzwtrimb4g
+% Encoding created by otftotfm on Mon May  4 13:30:13 2020
 % Command line follows encoding
-/AutoEnc_dmsp3xpadz5sxsewyywlmfzofb [
+/AutoEnc_kfacq2es3ekovcdvyzwtrimb4g [
 %00
   /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %10
   /I.sc /J.sc /grave.sc /acute.sc /caron.sc /breve.sc /macron.sc /ring
   /cedilla /.notdef /AE.sc /OE.sc /Oslash.sc /AE /OE /Oslash
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-RegularSlanted.otf
-% Erewhon-RegularSlanted-lf-sc-ly1'
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-RegularSlanted.otf Erewhon-RegularSlanted-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_f3py2q.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kgxk7e.enc
index c1baa61dd6d..2a7f2e4412d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_f3py2q.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kgxk7e.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_f3py2qe46xq2tfpbdeyfykmcaa
-% Encoding created by otftotfm on Sun Jan 13 15:36:55 2019
+%%AutoEnc_kgxk7euoy3xmmvfnkleasvmhbc
+% Encoding created by otftotfm on Mon May  4 13:30:29 2020
 % Command line follows encoding
-/AutoEnc_f3py2qe46xq2tfpbdeyfykmcaa [
+/AutoEnc_kgxk7euoy3xmmvfnkleasvmhbc [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-RegularSlanted.otf
-% Erewhon-RegularSlanted-osf-sc-t2a'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-RegularSlanted.otf Erewhon-RegularSlanted-osf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vf2rzj.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kpjvx5.enc
index 804ff6dbb5f..10805654fc9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vf2rzj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kpjvx5.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_vf2rzjql3z4yvmrvilni3sjueh
-% Encoding created by otftotfm on Sun Jan 13 15:36:09 2019
+%%AutoEnc_kpjvx5hiwdtye2rbz7rdizlc5g
+% Encoding created by otftotfm on Mon May  4 13:29:46 2020
 % Command line follows encoding
-/AutoEnc_vf2rzjql3z4yvmrvilni3sjueh [
+/AutoEnc_kpjvx5hiwdtye2rbz7rdizlc5g [
 %00
-  /fi /Euro /ffi /ff /fraction /dotaccent /hungarumlaut /ogonek
-  /fl /ffl /afii61664 /f_b /f_h /f_j /f_k /T_h
+  /f_b /Euro /f_h /f_j /fraction /dotaccent /hungarumlaut /ogonek
+  /f_k /T_h /afii61664 /ff /fi /fl /ffi /ffl
 %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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=tnum Erewhon-BoldItalic.otf
-% Erewhon-BoldItalic-tlf-ly1'
+% --feature=liga --feature=lnum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Erewhon-BoldItalic.otf Erewhon-BoldItalic-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7gbjzw.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kqpq7i.enc
index 65602d9040c..c98bfeeeaef 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7gbjzw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kqpq7i.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_7gbjzwusas37mrwctbfr4oo47f
-% Encoding created by otftotfm on Sun Jan 13 15:36:43 2019
+%%AutoEnc_kqpq7ibhetpu2u3qviztp4s4lh
+% Encoding created by otftotfm on Mon May  4 13:30:18 2020
 % Command line follows encoding
-/AutoEnc_7gbjzwusas37mrwctbfr4oo47f [
+/AutoEnc_kqpq7ibhetpu2u3qviztp4s4lh [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf
-% Erewhon-Bold-tlf-sc-t2a'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Bold.otf Erewhon-Bold-tlf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_de446i.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kr7owi.enc
index be332d2d289..f887941be91 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_de446i.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kr7owi.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_de446ibfiv65k2hc6jyym2ysoc
-% Encoding created by otftotfm on Sun Jan 13 15:37:00 2019
+%%AutoEnc_kr7owilafqhmccsbc2hql6jr5g
+% Encoding created by otftotfm on Mon May  4 13:30:32 2020
 % Command line follows encoding
-/AutoEnc_de446ibfiv65k2hc6jyym2ysoc [
+/AutoEnc_kr7owilafqhmccsbc2hql6jr5g [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf
-% Erewhon-Bold-osf-sc-t2b'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Bold.otf Erewhon-Bold-osf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_sbgf5j.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kusb63.enc
index 530986383f7..e0aadc1cd66 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_sbgf5j.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kusb63.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_sbgf5jp3xfg7a6epgap5tukdeg
-% Encoding created by otftotfm on Sun Jan 13 15:36:52 2019
+%%AutoEnc_kusb634srdkflviy3rzsv6pqeb
+% Encoding created by otftotfm on Mon May  4 13:30:27 2020
 % Command line follows encoding
-/AutoEnc_sbgf5jp3xfg7a6epgap5tukdeg [
+/AutoEnc_kusb634srdkflviy3rzsv6pqeb [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Regular.otf
-% Erewhon-Regular-osf-sc-t2a'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Regular.otf Erewhon-Regular-osf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zqebf7.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kyhdzd.enc
index 490af3e3ade..43d9e5670e4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zqebf7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kyhdzd.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_zqebf7vzmluphg4y4scofupkeg
-% Encoding created by otftotfm on Sun Jan 13 15:37:28 2019
+%%AutoEnc_kyhdzdis6w7h6uctzywbsadndg
+% Encoding created by otftotfm on Mon May  4 13:30:59 2020
 % Command line follows encoding
-/AutoEnc_zqebf7vzmluphg4y4scofupkeg [
+/AutoEnc_kyhdzdis6w7h6uctzywbsadndg [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus /comma.superior /hyphen /period.superior /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
-% --feature=kern --feature=liga --feature=sups --ligkern=* {KL} *
-% Erewhon-Regular.otf Erewhon-Regular-sup-t2c'
+% --feature=kern --feature=liga --feature=sups --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-Regular.otf Erewhon-Regular-sup-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_tzgz6e.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_l2txil.enc
index 9271e6bf2fc..1823befdb56 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_tzgz6e.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_l2txil.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_tzgz6edygcbbaua5eontwwbuwd
-% Encoding created by otftotfm on Sun Jan 13 15:36:02 2019
+%%AutoEnc_l2txil633hishz7h5sd4mc5cme
+% Encoding created by otftotfm on Mon May  4 13:29:41 2020
 % Command line follows encoding
-/AutoEnc_tzgz6edygcbbaua5eontwwbuwd [
+/AutoEnc_l2txil633hishz7h5sd4mc5cme [
 %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 /afii61664
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,12 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf Erewhon-Bold-tlf-sc-t1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Bold.otf Erewhon-Bold-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_eaccqu.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ldfvvz.enc
index 8377e13203a..0dc23421c53 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_eaccqu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ldfvvz.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_eaccquysxwdtdgwbnyjs2irg4c
-% Encoding created by otftotfm on Sun Jan 13 15:36:21 2019
+%%AutoEnc_ldfvvzpdz5ktxj4xzvhzi7v4qa
+% Encoding created by otftotfm on Mon May  4 13:30:01 2020
 % Command line follows encoding
-/AutoEnc_eaccquysxwdtdgwbnyjs2irg4c [
+/AutoEnc_ldfvvzpdz5ktxj4xzvhzi7v4qa [
 %00
   /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %10
   /I.sc /J.sc /grave.sc /acute.sc /caron.sc /breve.sc /macron.sc /ring
   /cedilla /.notdef /AE.sc /oe /Oslash.sc /AE /OE /Oslash
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
 % Erewhon-Italic-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ebczeo.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lfc333.enc
index ac21aa6e5fc..fca5b8e239a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ebczeo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lfc333.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ebczeotrynw5qpbgwvyw24zibh
-% Encoding created by otftotfm on Sun Jan 13 15:37:16 2019
+%%AutoEnc_lfc333speqqmibdwtxmsrrltia
+% Encoding created by otftotfm on Mon May  4 13:30:47 2020
 % Command line follows encoding
-/AutoEnc_ebczeotrynw5qpbgwvyw24zibh [
+/AutoEnc_lfc333speqqmibdwtxmsrrltia [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf
-% Erewhon-Bold-tosf-sc-t2c'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Bold.otf Erewhon-Bold-tosf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_tybypw.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lku3zs.enc
index 1fa8a6e9831..6acfab50887 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_tybypw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lku3zs.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_tybypwczb7wumjruchruwihvaa
-% Encoding created by otftotfm on Sun Jan 13 15:36:51 2019
+%%AutoEnc_lku3zs7uaiqxz662bkfwiocslb
+% Encoding created by otftotfm on Mon May  4 13:30:26 2020
 % Command line follows encoding
-/AutoEnc_tybypwczb7wumjruchruwihvaa [
+/AutoEnc_lku3zs7uaiqxz662bkfwiocslb [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
-% Erewhon-Italic-lf-sc-t2a'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Italic.otf Erewhon-Italic-lf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vy5tka.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lzgimh.enc
index e5d7f5f844f..ad65e561b40 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vy5tka.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lzgimh.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_vy5tkag3ktr6rg63gifvj4my4f
-% Encoding created by otftotfm on Sun Jan 13 15:36:35 2019
+%%AutoEnc_lzgimh5gh7ty7agdice5waya5f
+% Encoding created by otftotfm on Mon May  4 13:30:15 2020
 % Command line follows encoding
-/AutoEnc_vy5tkag3ktr6rg63gifvj4my4f [
+/AutoEnc_lzgimh5gh7ty7agdice5waya5f [
 %00
   /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %10
   /I.sc /J.sc /grave.sc /acute.sc /caron.sc /breve.sc /macron.sc /ring
   /cedilla /.notdef /AE.sc /OE.sc /Oslash.sc /AE /OE /Oslash
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-RegularSlanted.otf
-% Erewhon-RegularSlanted-tosf-sc-ly1'
+% --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-RegularSlanted.otf Erewhon-RegularSlanted-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_olitnw.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lzr7pz.enc
index dc38d44b538..fbf4c25557c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_olitnw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lzr7pz.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_olitnwwguwo6onfwaplcjjicjc
-% Encoding created by otftotfm on Sun Jan 13 15:36:31 2019
+%%AutoEnc_lzr7pznksf6jm262thopm2goma
+% Encoding created by otftotfm on Mon May  4 13:30:06 2020
 % Command line follows encoding
-/AutoEnc_olitnwwguwo6onfwaplcjjicjc [
+/AutoEnc_lzr7pznksf6jm262thopm2goma [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
 %10
   /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /afii61664
-  /perthousandzero /dotlessi /uni0237 /S.sc /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
@@ -33,7 +33,7 @@
   /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
 %90
   /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /Dcroat.sc /section
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /S.sc /Idotaccent /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 /ohungarumlaut /Racute.sc
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Regular.otf
-% Erewhon-Regular-osf-sc-t1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Regular.otf Erewhon-Regular-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cm3ukg.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_m37h6o.enc
index 8143b49fed9..6c54beac669 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cm3ukg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_m37h6o.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_cm3ukg5d7c36pwssek6a4xrkmg
-% Encoding created by otftotfm on Sun Jan 13 15:36:20 2019
+%%AutoEnc_m37h6oflr6uu3tk3mcx7jit4pa
+% Encoding created by otftotfm on Mon May  4 13:30:04 2020
 % Command line follows encoding
-/AutoEnc_cm3ukg5d7c36pwssek6a4xrkmg [
+/AutoEnc_m37h6oflr6uu3tk3mcx7jit4pa [
 %00
   /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %10
   /I.sc /J.sc /grave.sc /acute.sc /caron.sc /breve.sc /macron.sc /ring
   /cedilla /.notdef /AE.sc /oe /Oslash.sc /AE /OE /Oslash
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
+% --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
 % Erewhon-Italic-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7vuaps.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mhy7h5.enc
index f3303388ec8..bcbae05875c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7vuaps.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mhy7h5.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_7vuapsgny3oqvom2ddsftg77ld
-% Encoding created by otftotfm on Sun Jan 13 15:37:17 2019
+%%AutoEnc_mhy7h55xehbaflqvked7eh4dja
+% Encoding created by otftotfm on Mon May  4 13:30:48 2020
 % Command line follows encoding
-/AutoEnc_7vuapsgny3oqvom2ddsftg77ld [
+/AutoEnc_mhy7h55xehbaflqvked7eh4dja [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
-% --feature=kern --feature=liga --feature=sinf --ligkern=* {KL} *
-% Erewhon-Bold.otf Erewhon-Bold-inf-t2c'
+% --feature=kern --feature=liga --feature=sinf --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-inf-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_e4eugf.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mkqhoa.enc
index 3a365de0b28..4e5037a5b20 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_e4eugf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mkqhoa.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_e4eugfigg5fexgycaabfhfsbrg
-% Encoding created by otftotfm on Sun Jan 13 15:36:00 2019
+%%AutoEnc_mkqhoamwqzt3pogdzsqovdmide
+% Encoding created by otftotfm on Mon May  4 13:29:41 2020
 % Command line follows encoding
-/AutoEnc_e4eugfigg5fexgycaabfhfsbrg [
+/AutoEnc_mkqhoamwqzt3pogdzsqovdmide [
 %00
-  /fi /Euro /ffi /ff /fraction /dotaccent /hungarumlaut /ogonek
-  /fl /ffl /afii61664 /f_b /f_h /f_j /f_k /T_h
+  /f_b /Euro /f_h /f_j /fraction /dotaccent /hungarumlaut /ogonek
+  /f_k /T_h /afii61664 /ff /fi /fl /ffi /ffl
 %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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=pnum Erewhon-Bold.otf
-% Erewhon-Bold-osf-ly1'
+% --feature=liga --feature=onum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Erewhon-Bold.otf Erewhon-Bold-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gjhrxo.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_n6sb7c.enc
index ddcdd94ca34..975dc44279b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_gjhrxo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_n6sb7c.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_gjhrxovver2ztbasbbcqhsqmkc
-% Encoding created by otftotfm on Sun Jan 13 15:37:00 2019
+%%AutoEnc_n6sb7ccqce626igrc36zip6bxe
+% Encoding created by otftotfm on Mon May  4 13:30:32 2020
 % Command line follows encoding
-/AutoEnc_gjhrxovver2ztbasbbcqhsqmkc [
+/AutoEnc_n6sb7ccqce626igrc36zip6bxe [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,12 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf Erewhon-Bold-lf-sc-t2b'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Bold.otf Erewhon-Bold-lf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_pxkzb5.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nosd3d.enc
index 46bdc084908..d9cb2070651 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_pxkzb5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nosd3d.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_pxkzb5aeajnoaf3g6gszm3feqe
-% Encoding created by otftotfm on Sun Jan 13 15:36:57 2019
+%%AutoEnc_nosd3drhwdvciwa56e7aeipkdc
+% Encoding created by otftotfm on Mon May  4 13:30:31 2020
 % Command line follows encoding
-/AutoEnc_pxkzb5aeajnoaf3g6gszm3feqe [
+/AutoEnc_nosd3drhwdvciwa56e7aeipkdc [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-RegularSlanted.otf
-% Erewhon-RegularSlanted-lf-sc-t2a'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-RegularSlanted.otf Erewhon-RegularSlanted-lf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_e4qrg7.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ntfore.enc
index 4e50626ffde..370513d70e0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_e4qrg7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ntfore.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_e4qrg7oegtryokp323stfqd43h
-% Encoding created by otftotfm on Sun Jan 13 15:36:09 2019
+%%AutoEnc_ntforeruoum3fsn3uud5i4wx2d
+% Encoding created by otftotfm on Mon May  4 13:29:47 2020
 % Command line follows encoding
-/AutoEnc_e4qrg7oegtryokp323stfqd43h [
+/AutoEnc_ntforeruoum3fsn3uud5i4wx2d [
 %00
   /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %10
   /I.sc /J.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /AE.sc /OE.sc /Oslash.sc /AE /OE /Oslash
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-BoldItalic.otf
-% Erewhon-BoldItalic-tlf-sc-ly1'
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-BoldItalic.otf Erewhon-BoldItalic-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ul5nhk.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nyil2z.enc
index fa07f6101e8..d71e676700f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ul5nhk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nyil2z.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ul5nhkafzs7oitxiydo7pedlug
-% Encoding created by otftotfm on Sun Jan 13 15:35:59 2019
+%%AutoEnc_nyil2zlprdnfize7jgweukgzyc
+% Encoding created by otftotfm on Mon May  4 13:29:43 2020
 % Command line follows encoding
-/AutoEnc_ul5nhkafzs7oitxiydo7pedlug [
+/AutoEnc_nyil2zlprdnfize7jgweukgzyc [
 %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 /afii61664
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,12 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf Erewhon-Bold-lf-sc-t1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Bold.otf Erewhon-Bold-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hvww67.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nzqzmy.enc
index bdb4b3f96cd..4fa0ce2e9bc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hvww67.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_nzqzmy.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_hvww67zy6szialmmzy2zik4jsh
-% Encoding created by otftotfm on Sun Jan 13 15:37:16 2019
+%%AutoEnc_nzqzmyipmihjkliby7tbb5wm6f
+% Encoding created by otftotfm on Mon May  4 13:30:47 2020
 % Command line follows encoding
-/AutoEnc_hvww67zy6szialmmzy2zik4jsh [
+/AutoEnc_nzqzmyipmihjkliby7tbb5wm6f [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf
-% Erewhon-Bold-osf-sc-t2c'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Bold.otf Erewhon-Bold-osf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_yvwvqh.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_o6jmxn.enc
index a7ff875f79c..c521919b919 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_yvwvqh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_o6jmxn.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_yvwvqhezuidahjbo6gvyu577ga
-% Encoding created by otftotfm on Sun Jan 13 15:36:40 2019
+%%AutoEnc_o6jmxnaukpk4q5qrziiitmyi6g
+% Encoding created by otftotfm on Mon May  4 13:30:16 2020
 % Command line follows encoding
-/AutoEnc_yvwvqhezuidahjbo6gvyu577ga [
+/AutoEnc_o6jmxnaukpk4q5qrziiitmyi6g [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
 %10
-  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /fi
-  /perthousandzero /dotlessi /uni0237 /ffi /ff /fl /ffl /T_h
+  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=onum --feature=pnum
-% Erewhon-Bold.otf Erewhon-Bold-osf-t2a'
+% --feature=kern --feature=liga --feature=onum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-osf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5jyhbz.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_oxlhzq.enc
index 7aaef59a9f4..9eed483d9c6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5jyhbz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_oxlhzq.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_5jyhbzsmd6qigh4r37tqijdqgd
-% Encoding created by otftotfm on Sun Jan 13 15:37:16 2019
+%%AutoEnc_oxlhzqzukjqatlaon6ypt3xv7c
+% Encoding created by otftotfm on Mon May  4 13:30:47 2020
 % Command line follows encoding
-/AutoEnc_5jyhbzsmd6qigh4r37tqijdqgd [
+/AutoEnc_oxlhzqzukjqatlaon6ypt3xv7c [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
 %10
-  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /fi
-  /perthousandzero /dotlessi /uni0237 /ffi /ff /fl /ffl /T_h
+  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
-% --feature=kern --feature=liga --feature=onum --feature=pnum
-% Erewhon-Bold.otf Erewhon-Bold-osf-t2c'
+% --feature=kern --feature=liga --feature=onum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-osf-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_472lj2.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_p5bs7v.enc
index f06a25affa2..44c5ffc98ba 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_472lj2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_p5bs7v.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_472lj27mp36hq2zswdduaq6mqg
-% Encoding created by otftotfm on Sun Jan 13 15:36:52 2019
+%%AutoEnc_p5bs7v6wtyt5axz54jlkmrlxrh
+% Encoding created by otftotfm on Mon May  4 13:30:26 2020
 % Command line follows encoding
-/AutoEnc_472lj27mp36hq2zswdduaq6mqg [
+/AutoEnc_p5bs7v6wtyt5axz54jlkmrlxrh [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
-% Erewhon-Italic-tlf-sc-t2a'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Italic.otf Erewhon-Italic-tlf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_h5cath.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_prrnsj.enc
index af84b332a59..43127207de1 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_h5cath.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_prrnsj.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_h5cathsj6ppsgliul6i6blzo5e
-% Encoding created by otftotfm on Sun Jan 13 15:37:08 2019
+%%AutoEnc_prrnsj4klzb5v4a7htehdcw77e
+% Encoding created by otftotfm on Mon May  4 13:30:40 2020
 % Command line follows encoding
-/AutoEnc_h5cathsj6ppsgliul6i6blzo5e [
+/AutoEnc_prrnsj4klzb5v4a7htehdcw77e [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
-% Erewhon-Italic-lf-sc-t2b'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Italic.otf Erewhon-Italic-lf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zvhc7q.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_q3ctgn.enc
index 1090cd03c09..116cc4618f0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zvhc7q.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_q3ctgn.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_zvhc7qfe4befkigdnbizqv2leb
-% Encoding created by otftotfm on Sun Jan 13 15:36:53 2019
+%%AutoEnc_q3ctgnbplpzanleyjeq2qhenwg
+% Encoding created by otftotfm on Mon May  4 13:30:27 2020
 % Command line follows encoding
-/AutoEnc_zvhc7qfe4befkigdnbizqv2leb [
+/AutoEnc_q3ctgnbplpzanleyjeq2qhenwg [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft.superior /parenright.superior /asterisk /plus /comma.superior /hyphen /period.superior /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=sups --ligkern=* {KL} *
-% Erewhon-Regular.otf Erewhon-Regular-sup-t2a'
+% --feature=kern --feature=liga --feature=sups --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-Regular.otf Erewhon-Regular-sup-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2phnm5.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_q5l3se.enc
index ff764730949..a3b57bdda71 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2phnm5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_q5l3se.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_2phnm5pxzuxxdsziany6siuwxb
-% Encoding created by otftotfm on Sun Jan 13 15:37:18 2019
+%%AutoEnc_q5l3set7ebqfuxqwgyja47cdpg
+% Encoding created by otftotfm on Mon May  4 13:30:49 2020
 % Command line follows encoding
-/AutoEnc_2phnm5pxzuxxdsziany6siuwxb [
+/AutoEnc_q5l3set7ebqfuxqwgyja47cdpg [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
 %10
-  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /fi
-  /perthousandzero /dotlessi /uni0237 /ffi /ff /fl /ffl /T_h
+  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
-% --feature=kern --feature=liga --feature=lnum --feature=tnum
-% Erewhon-Bold.otf Erewhon-Bold-tlf-t2c'
+% --feature=kern --feature=liga --feature=lnum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-tlf-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_e6jkx2.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_q6o7po.enc
index 35cecd100a3..deb36ac8f81 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_e6jkx2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_q6o7po.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_e6jkx2fi225eomq7wovyp5s3hg
-% Encoding created by otftotfm on Sun Jan 13 15:36:29 2019
+%%AutoEnc_q6o7poza2jprqhmfvsu2r56nrf
+% Encoding created by otftotfm on Mon May  4 13:30:07 2020
 % Command line follows encoding
-/AutoEnc_e6jkx2fi225eomq7wovyp5s3hg [
+/AutoEnc_q6o7poza2jprqhmfvsu2r56nrf [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
 %10
   /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /afii61664
-  /perthousandzero /dotlessi /uni0237 /S.sc /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
@@ -33,7 +33,7 @@
   /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
 %90
   /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /Dcroat.sc /section
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /S.sc /Idotaccent /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 /ohungarumlaut /Racute.sc
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Regular.otf
-% Erewhon-Regular-lf-sc-t1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Regular.otf Erewhon-Regular-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jv4prf.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qduv2i.enc
index 17488a1e121..d367779da84 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jv4prf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qduv2i.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_jv4prfk47wyaiyd3snmbfebltb
-% Encoding created by otftotfm on Sun Jan 13 15:37:26 2019
+%%AutoEnc_qduv2imv4effqtded2yxsnxffa
+% Encoding created by otftotfm on Mon May  4 13:30:55 2020
 % Command line follows encoding
-/AutoEnc_jv4prfk47wyaiyd3snmbfebltb [
+/AutoEnc_qduv2imv4effqtded2yxsnxffa [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
-% Erewhon-Italic-lf-sc-t2c'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Italic.otf Erewhon-Italic-lf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hih73f.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qr6pdo.enc
index 9a5a3a8d87d..952ebeb8710 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hih73f.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qr6pdo.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_hih73f2cpxeb57yxtdu2bf3fre
-% Encoding created by otftotfm on Sun Jan 13 15:37:32 2019
+%%AutoEnc_qr6pdouwhppexjaxt3hkbrptef
+% Encoding created by otftotfm on Mon May  4 13:31:01 2020
 % Command line follows encoding
-/AutoEnc_hih73f2cpxeb57yxtdu2bf3fre [
+/AutoEnc_qr6pdouwhppexjaxt3hkbrptef [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-RegularSlanted.otf
-% Erewhon-RegularSlanted-tlf-sc-t2c'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-RegularSlanted.otf Erewhon-RegularSlanted-tlf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jyfbou.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qvhtbp.enc
index 974b74ebb72..6e94262ec75 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_jyfbou.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qvhtbp.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_jyfbouxteazafggc7prf5yh5pb
-% Encoding created by otftotfm on Sun Jan 13 15:36:01 2019
+%%AutoEnc_qvhtbpqajgj4rodxnjbihk4ieg
+% Encoding created by otftotfm on Mon May  4 13:29:42 2020
 % Command line follows encoding
-/AutoEnc_jyfbouxteazafggc7prf5yh5pb [
+/AutoEnc_qvhtbpqajgj4rodxnjbihk4ieg [
 %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 /afii61664
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,12 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf Erewhon-Bold-osf-sc-t1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Bold.otf Erewhon-Bold-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_472w4h.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qyrste.enc
index 22c5e1d64f6..0f108172575 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_472w4h.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_qyrste.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_472w4h7gxtrxhynfzyo32al25c
-% Encoding created by otftotfm on Sun Jan 13 15:36:54 2019
+%%AutoEnc_qyrsteolcwl5ngxvnbdi74lb3d
+% Encoding created by otftotfm on Mon May  4 13:30:28 2020
 % Command line follows encoding
-/AutoEnc_472w4h7gxtrxhynfzyo32al25c [
+/AutoEnc_qyrsteolcwl5ngxvnbdi74lb3d [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Regular.otf
-% Erewhon-Regular-tosf-sc-t2a'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Regular.otf Erewhon-Regular-tosf-sc-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_z6mg7i.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_r35fsd.enc
index affc109a9f7..0ead6831260 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_z6mg7i.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_r35fsd.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_z6mg7ilclga2ceozz5nsq46w2e
-% Encoding created by otftotfm on Sun Jan 13 15:36:23 2019
+%%AutoEnc_r35fsd3773ph6ckj5ltyfc562b
+% Encoding created by otftotfm on Mon May  4 13:30:00 2020
 % Command line follows encoding
-/AutoEnc_z6mg7ilclga2ceozz5nsq46w2e [
+/AutoEnc_r35fsd3773ph6ckj5ltyfc562b [
 %00
   /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %10
   /I.sc /J.sc /grave.sc /acute.sc /caron.sc /breve.sc /macron.sc /ring
   /cedilla /.notdef /AE.sc /oe /Oslash.sc /AE /OE /Oslash
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
+% --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
 % Erewhon-Italic-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ld54a3.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rf456a.enc
index a3d00ea3b93..824787aeedd 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ld54a3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rf456a.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ld54a3rsg7tccu3sxjm6xp2tqg
-% Encoding created by otftotfm on Sun Jan 13 15:37:09 2019
+%%AutoEnc_rf456axpgtu6ipqxkca2fcbwbc
+% Encoding created by otftotfm on Mon May  4 13:30:39 2020
 % Command line follows encoding
-/AutoEnc_ld54a3rsg7tccu3sxjm6xp2tqg [
+/AutoEnc_rf456axpgtu6ipqxkca2fcbwbc [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
-% Erewhon-Italic-osf-sc-t2b'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Italic.otf Erewhon-Italic-osf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_duporo.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rlrhvn.enc
index f929da85402..9b3e466e18d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_duporo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rlrhvn.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_duporovakbqtxvur2wotkamzfg
-% Encoding created by otftotfm on Sun Jan 13 15:37:13 2019
+%%AutoEnc_rlrhvn52u4ukljtjpfounvpdtg
+% Encoding created by otftotfm on Mon May  4 13:30:45 2020
 % Command line follows encoding
-/AutoEnc_duporovakbqtxvur2wotkamzfg [
+/AutoEnc_rlrhvn52u4ukljtjpfounvpdtg [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-RegularSlanted.otf
-% Erewhon-RegularSlanted-lf-sc-t2b'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-RegularSlanted.otf Erewhon-RegularSlanted-lf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5nl5xc.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rorgcs.enc
index dbc055c8a5d..27dec33c845 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5nl5xc.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rorgcs.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_5nl5xcgg7pcofsdggtlx5hikua
-% Encoding created by otftotfm on Sun Jan 13 15:37:27 2019
+%%AutoEnc_rorgcsorvtcm7ahzweh64ce6xg
+% Encoding created by otftotfm on Mon May  4 13:30:57 2020
 % Command line follows encoding
-/AutoEnc_5nl5xcgg7pcofsdggtlx5hikua [
+/AutoEnc_rorgcsorvtcm7ahzweh64ce6xg [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Regular.otf
-% Erewhon-Regular-osf-sc-t2c'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Regular.otf Erewhon-Regular-osf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hdz6bj.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rru6gy.enc
index 5e49eec069c..f6201c72a50 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_hdz6bj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rru6gy.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_hdz6bjxysw4aubty53tcbdzshh
-% Encoding created by otftotfm on Sun Jan 13 15:37:00 2019
+%%AutoEnc_rru6gyevkz2yeevhcwshztm3nh
+% Encoding created by otftotfm on Mon May  4 13:30:31 2020
 % Command line follows encoding
-/AutoEnc_hdz6bjxysw4aubty53tcbdzshh [
+/AutoEnc_rru6gyevkz2yeevhcwshztm3nh [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
 %10
-  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /fi
-  /perthousandzero /dotlessi /uni0237 /ffi /ff /fl /ffl /T_h
+  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
-% --feature=kern --feature=liga --feature=onum --feature=pnum
-% Erewhon-Bold.otf Erewhon-Bold-osf-t2b'
+% --feature=kern --feature=liga --feature=onum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-osf-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uk5nxi.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rvwfgp.enc
index 01511ed2262..781a471aafa 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uk5nxi.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_rvwfgp.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_uk5nxigzparxur3a7ux7wxmvtb
-% Encoding created by otftotfm on Sun Jan 13 15:35:59 2019
+%%AutoEnc_rvwfgpxo352f536z6hvjjtw57a
+% Encoding created by otftotfm on Mon May  4 13:29:43 2020
 % Command line follows encoding
-/AutoEnc_uk5nxigzparxur3a7ux7wxmvtb [
+/AutoEnc_rvwfgpxo352f536z6hvjjtw57a [
 %00
   /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %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,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf Erewhon-Bold-lf-sc-ly1'
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall Erewhon-Bold.otf
+% Erewhon-Bold-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_73itje.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_sawcbj.enc
index fb0ac24d056..98a1f762e36 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_73itje.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_sawcbj.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_73itjez6oa5xecu2prsxt7wrje
-% Encoding created by otftotfm on Sun Jan 13 15:37:18 2019
+%%AutoEnc_sawcbjtwgcwmecttj7gfrpdcda
+% Encoding created by otftotfm on Mon May  4 13:30:49 2020
 % Command line follows encoding
-/AutoEnc_73itjez6oa5xecu2prsxt7wrje [
+/AutoEnc_sawcbjtwgcwmecttj7gfrpdcda [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf
-% Erewhon-Bold-tlf-sc-t2c'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Bold.otf Erewhon-Bold-tlf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_6zkwdq.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_sawuiy.enc
index f244732e9db..e93109f4a7f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_6zkwdq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_sawuiy.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_6zkwdqieafmfzsfatvcva7r5lh
-% Encoding created by otftotfm on Sun Jan 13 15:37:27 2019
+%%AutoEnc_sawuiyrsdjgryspywwbyrfx2xd
+% Encoding created by otftotfm on Mon May  4 13:30:57 2020
 % Command line follows encoding
-/AutoEnc_6zkwdqieafmfzsfatvcva7r5lh [
+/AutoEnc_sawuiyrsdjgryspywwbyrfx2xd [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Regular.otf
-% Erewhon-Regular-tosf-sc-t2c'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Regular.otf Erewhon-Regular-tosf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2sunpf.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_siihhb.enc
index 6a73cbe55ed..b72b5aad9ae 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2sunpf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_siihhb.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_2sunpfjrvuutujfde77cbk7psc
-% Encoding created by otftotfm on Sun Jan 13 15:35:57 2019
+%%AutoEnc_siihhbrexvbbfofdsq3mfvvyeh
+% Encoding created by otftotfm on Mon May  4 13:29:44 2020
 % Command line follows encoding
-/AutoEnc_2sunpfjrvuutujfde77cbk7psc [
+/AutoEnc_siihhbrexvbbfofdsq3mfvvyeh [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=numr --ligkern=* {KL} * Erewhon-Bold.otf
-% Erewhon-Bold-numr-ly1'
+% --feature=liga --feature=numr --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-numr-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_6xnyxb.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_sim7pz.enc
index ea604ae50e5..724f0280b22 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_6xnyxb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_sim7pz.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_6xnyxbta4dahse6hhefpziy7he
-% Encoding created by otftotfm on Sun Jan 13 15:36:02 2019
+%%AutoEnc_sim7pz7qkzoxw2u7iew664kxdb
+% Encoding created by otftotfm on Mon May  4 13:29:40 2020
 % Command line follows encoding
-/AutoEnc_6xnyxbta4dahse6hhefpziy7he [
+/AutoEnc_sim7pz7qkzoxw2u7iew664kxdb [
 %00
-  /fi /Euro /ffi /ff /fraction /dotaccent /hungarumlaut /ogonek
-  /fl /ffl /afii61664 /f_b /f_h /f_j /f_k /T_h
+  /f_b /Euro /f_h /f_j /fraction /dotaccent /hungarumlaut /ogonek
+  /f_k /T_h /afii61664 /ff /fi /fl /ffi /ffl
 %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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=tnum Erewhon-Bold.otf
-% Erewhon-Bold-tlf-ly1'
+% --feature=liga --feature=lnum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Erewhon-Bold.otf Erewhon-Bold-tlf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_omykmw.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_stg3em.enc
index 5196e9c0bb5..fa45b577244 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_omykmw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_stg3em.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_omykmw5c5lpgx6fmgethe44fqh
-% Encoding created by otftotfm on Sun Jan 13 15:37:17 2019
+%%AutoEnc_stg3emqawv4rqfwrsxkucvctoh
+% Encoding created by otftotfm on Mon May  4 13:30:48 2020
 % Command line follows encoding
-/AutoEnc_omykmw5c5lpgx6fmgethe44fqh [
+/AutoEnc_stg3emqawv4rqfwrsxkucvctoh [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
 %10
-  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /fi
-  /perthousandzero /dotlessi /uni0237 /ffi /ff /fl /ffl /T_h
+  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
-% --feature=kern --feature=liga --feature=lnum --feature=pnum
-% Erewhon-Bold.otf Erewhon-Bold-lf-t2c'
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-lf-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_knq7bi.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_su4wdy.enc
index d493ad53c14..1e5c44d17d0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_knq7bi.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_su4wdy.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_knq7bi2mhkvxwrmtvayeums7ee
-% Encoding created by otftotfm on Sun Jan 13 15:36:03 2019
+%%AutoEnc_su4wdyudgqaudqmzs76ycvrhkc
+% Encoding created by otftotfm on Mon May  4 13:29:46 2020
 % Command line follows encoding
-/AutoEnc_knq7bi2mhkvxwrmtvayeums7ee [
+/AutoEnc_su4wdyudgqaudqmzs76ycvrhkc [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=sinf --ligkern=* {KL} * Erewhon-BoldItalic.otf
-% Erewhon-BoldItalic-inf-ly1'
+% --feature=liga --feature=sinf --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --ligkern=* {KL} * Erewhon-BoldItalic.otf Erewhon-BoldItalic-inf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xwtzaw.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_tjqwnw.enc
index 92615de95c9..e3220d7f4f2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xwtzaw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_tjqwnw.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_xwtzawaibyfawtbh6upzsrtwxa
-% Encoding created by otftotfm on Sun Jan 13 15:36:43 2019
+%%AutoEnc_tjqwnwknmph5mu6f4i4h7q6omd
+% Encoding created by otftotfm on Mon May  4 13:30:18 2020
 % Command line follows encoding
-/AutoEnc_xwtzawaibyfawtbh6upzsrtwxa [
+/AutoEnc_tjqwnwknmph5mu6f4i4h7q6omd [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
 %10
-  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /fi
-  /perthousandzero /dotlessi /uni0237 /ffi /ff /fl /ffl /T_h
+  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=lnum --feature=tnum
-% Erewhon-Bold.otf Erewhon-Bold-tlf-t2a'
+% --feature=kern --feature=liga --feature=lnum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-tlf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fxczch.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_totpyl.enc
index 9bc8d9e5b28..5fa9b65df94 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fxczch.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_totpyl.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_fxczch2utlmdxswoaiowjt6apg
-% Encoding created by otftotfm on Sun Jan 13 15:35:59 2019
+%%AutoEnc_totpyloaf2wbjqqcgoudrzdz6a
+% Encoding created by otftotfm on Mon May  4 13:29:42 2020
 % Command line follows encoding
-/AutoEnc_fxczch2utlmdxswoaiowjt6apg [
+/AutoEnc_totpyloaf2wbjqqcgoudrzdz6a [
 %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 /afii61664
-  /perthousandzero /dotlessi /uni0237 /fi /ffi /ff /fl /ffl
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=lnum --feature=pnum
-% Erewhon-Bold.otf Erewhon-Bold-lf-t1'
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-lf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mieo7u.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_u22hib.enc
index accf64a83e4..36b893eda57 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mieo7u.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_u22hib.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_mieo7ugaj7dqshi2pcglhzik7c
-% Encoding created by otftotfm on Sun Jan 13 15:36:03 2019
+%%AutoEnc_u22hibunhycltgwfoykmcmd4ca
+% Encoding created by otftotfm on Mon May  4 13:29:50 2020
 % Command line follows encoding
-/AutoEnc_mieo7ugaj7dqshi2pcglhzik7c [
+/AutoEnc_u22hibunhycltgwfoykmcmd4ca [
 %00
   /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dnom
-% --feature=kern --feature=liga --ligkern=* {KL} * Erewhon-BoldItalic.otf
-% Erewhon-BoldItalic-dnom-ly1'
+% --feature=kern --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% --ligkern=* {KL} * Erewhon-BoldItalic.otf Erewhon-BoldItalic-dnom-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ilhygg.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ubwvkh.enc
index 16e06eb90e0..ac7d42b4573 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ilhygg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ubwvkh.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ilhygg7uplynmf7essge6uj2wa
-% Encoding created by otftotfm on Sun Jan 13 15:36:25 2019
+%%AutoEnc_ubwvkhyjxb2fhdzriy6igvhlsg
+% Encoding created by otftotfm on Mon May  4 13:29:59 2020
 % Command line follows encoding
-/AutoEnc_ilhygg7uplynmf7essge6uj2wa [
+/AutoEnc_ubwvkhyjxb2fhdzriy6igvhlsg [
 %00
   /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %10
   /I.sc /J.sc /grave.sc /acute.sc /caron.sc /breve.sc /macron.sc /ring
   /cedilla /.notdef /AE.sc /oe /Oslash.sc /AE /OE /Oslash
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
 % Erewhon-Italic-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cbfxpb.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uimsyn.enc
index b5a896793e3..8dcac0312f8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_cbfxpb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uimsyn.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_cbfxpbexahpflmd6t3qncagoqh
-% Encoding created by otftotfm on Sun Jan 13 15:37:26 2019
+%%AutoEnc_uimsynkwud3ro2ca46ibeh6rwa
+% Encoding created by otftotfm on Mon May  4 13:30:56 2020
 % Command line follows encoding
-/AutoEnc_cbfxpbexahpflmd6t3qncagoqh [
+/AutoEnc_uimsynkwud3ro2ca46ibeh6rwa [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /I.sc /J.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
-% Erewhon-Italic-tlf-sc-t2c'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Italic.otf Erewhon-Italic-tlf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mrzttx.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uofugq.enc
index c84b0e2e7cf..43f694a15f7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mrzttx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uofugq.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_mrzttxq5vqcnzn6lccgxtcbn7c
-% Encoding created by otftotfm on Sun Jan 13 15:36:59 2019
+%%AutoEnc_uofugqx3rtk534nq264dlwp5be
+% Encoding created by otftotfm on Mon May  4 13:30:32 2020
 % Command line follows encoding
-/AutoEnc_mrzttxq5vqcnzn6lccgxtcbn7c [
+/AutoEnc_uofugqx3rtk534nq264dlwp5be [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
 %10
-  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /fi
-  /perthousandzero /dotlessi /uni0237 /ffi /ff /fl /ffl /T_h
+  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
-% --feature=kern --feature=liga --feature=lnum --feature=pnum
-% Erewhon-Bold.otf Erewhon-Bold-lf-t2b'
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-lf-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_yndsjy.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_upydia.enc
index 982e2060c38..49bee75767d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_yndsjy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_upydia.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_yndsjyzrlpfz47cy7iw32zzq7h
-% Encoding created by otftotfm on Sun Jan 13 15:37:11 2019
+%%AutoEnc_upydia7fwx4oywv2b4w7c37cxf
+% Encoding created by otftotfm on Mon May  4 13:30:42 2020
 % Command line follows encoding
-/AutoEnc_yndsjyzrlpfz47cy7iw32zzq7h [
+/AutoEnc_upydia7fwx4oywv2b4w7c37cxf [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Regular.otf
-% Erewhon-Regular-lf-sc-t2b'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Regular.otf Erewhon-Regular-lf-sc-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_q4j5e2.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_urpqqz.enc
index 34ae2aeb16d..8c3ef3a92af 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_q4j5e2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_urpqqz.enc
@@ -1,9 +1,9 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_q4j5e2y3vfos4iqrhj7dklytjd
-% Encoding created by otftotfm on Sun Jan 13 15:36:28 2019
+%%AutoEnc_urpqqzeuxufbm3zupl43bblfvd
+% Encoding created by otftotfm on Mon May  4 13:30:05 2020
 % Command line follows encoding
-/AutoEnc_q4j5e2y3vfos4iqrhj7dklytjd [
+/AutoEnc_urpqqzeuxufbm3zupl43bblfvd [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
@@ -11,7 +11,7 @@
   /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
 %20
-  /.notdef /zero.denominator /zero.numerator /endash /dollar /.notdef /.notdef /quotesingle
+  /.notdef /endash /zero.denominator /zero.numerator /dollar /.notdef /.notdef /quotesingle
   /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
 %30
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -20,7 +20,7 @@
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %50
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni03A9
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
 %60
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
@@ -54,13 +54,12 @@
   /ffl /ffi /ff /fl /l /fi /i /f
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_ts1
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.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
-% Erewhon-Regular.otf Erewhon-Regular-tosf-ts1'
+% Erewhon-Regular.otf Erewhon-Regular-tlf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ffkvvu.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uvvoxh.enc
index f0ebeb4f962..1538de0cf46 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ffkvvu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_uvvoxh.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ffkvvueqm6q2v2y7ropufvmewb
-% Encoding created by otftotfm on Sun Jan 13 15:37:02 2019
+%%AutoEnc_uvvoxhn5cjrj237gv3a3hdnvma
+% Encoding created by otftotfm on Mon May  4 13:30:36 2020
 % Command line follows encoding
-/AutoEnc_ffkvvueqm6q2v2y7ropufvmewb [
+/AutoEnc_uvvoxhn5cjrj237gv3a3hdnvma [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -54,12 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
-% --feature=kern --feature=liga --feature=sups --ligkern=* {KL} *
-% Erewhon-BoldItalic.otf Erewhon-BoldItalic-sup-t2b'
+% --feature=kern --feature=liga --feature=sups --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-BoldItalic.otf
+% Erewhon-BoldItalic-sup-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_64ilkf.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_v2pu2l.enc
index 8a51aeb4a4b..1ec30a1a8d5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_64ilkf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_v2pu2l.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_64ilkfkzsagr4oi4clpy5t73yf
-% Encoding created by otftotfm on Sun Jan 13 15:36:04 2019
+%%AutoEnc_v2pu2lsfusvhedmkn7jrhjmcpg
+% Encoding created by otftotfm on Mon May  4 13:29:51 2020
 % Command line follows encoding
-/AutoEnc_64ilkfkzsagr4oi4clpy5t73yf [
+/AutoEnc_v2pu2lsfusvhedmkn7jrhjmcpg [
 %00
-  /fi /Euro /ffi /ff /fraction /dotaccent /hungarumlaut /ogonek
-  /fl /ffl /afii61664 /f_b /f_h /f_j /f_k /T_h
+  /f_b /Euro /f_h /f_j /fraction /dotaccent /hungarumlaut /ogonek
+  /f_k /T_h /afii61664 /ff /fi /fl /ffi /ffl
 %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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=tnum Erewhon-BoldItalic.otf
-% Erewhon-BoldItalic-tosf-ly1'
+% --feature=liga --feature=onum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Erewhon-BoldItalic.otf Erewhon-BoldItalic-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_iwqvab.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vcw2hi.enc
index 96267156c2c..3f7e0bf1f82 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_iwqvab.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vcw2hi.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_iwqvab2xvlp5cksa2exaltlb3b
-% Encoding created by otftotfm on Sun Jan 13 15:36:02 2019
+%%AutoEnc_vcw2hi6zo6akmvjgiqiqhhqrwc
+% Encoding created by otftotfm on Mon May  4 13:29:40 2020
 % Command line follows encoding
-/AutoEnc_iwqvab2xvlp5cksa2exaltlb3b [
+/AutoEnc_vcw2hi6zo6akmvjgiqiqhhqrwc [
 %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 /afii61664
-  /perthousandzero /dotlessi /uni0237 /fi /ffi /ff /fl /ffl
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=lnum --feature=tnum
-% Erewhon-Bold.otf Erewhon-Bold-tlf-t1'
+% --feature=kern --feature=liga --feature=lnum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-tlf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fszbg4.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vijwok.enc
index ddd62eb775b..a1e60351f64 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fszbg4.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vijwok.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_fszbg4cks6eklhynec6a5aqnvc
-% Encoding created by otftotfm on Sun Jan 13 15:37:19 2019
+%%AutoEnc_vijwoksn5vsbqtewc3h4gcvh7b
+% Encoding created by otftotfm on Mon May  4 13:30:51 2020
 % Command line follows encoding
-/AutoEnc_fszbg4cks6eklhynec6a5aqnvc [
+/AutoEnc_vijwoksn5vsbqtewc3h4gcvh7b [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -54,12 +54,13 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
-% --feature=kern --feature=liga --feature=sups --ligkern=* {KL} *
-% Erewhon-BoldItalic.otf Erewhon-BoldItalic-sup-t2c'
+% --feature=kern --feature=liga --feature=sups --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-BoldItalic.otf
+% Erewhon-BoldItalic-sup-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_k2pzfk.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vlikpx.enc
index 367f8eb1eb3..fb4e5684c2e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_k2pzfk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vlikpx.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_k2pzfkz46aca2hwshcioro2kdh
-% Encoding created by otftotfm on Sun Jan 13 15:36:01 2019
+%%AutoEnc_vlikpxnr3fj2cw2epxr4g7pjxc
+% Encoding created by otftotfm on Mon May  4 13:29:41 2020
 % Command line follows encoding
-/AutoEnc_k2pzfkz46aca2hwshcioro2kdh [
+/AutoEnc_vlikpxnr3fj2cw2epxr4g7pjxc [
 %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 /afii61664
-  /perthousandzero /dotlessi /uni0237 /fi /ffi /ff /fl /ffl
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=kern --feature=liga --feature=onum --feature=pnum
-% Erewhon-Bold.otf Erewhon-Bold-osf-t1'
+% --feature=kern --feature=liga --feature=onum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5aq3nb.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vwspja.enc
index 5457e200f2e..4a9b327677d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_5aq3nb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_vwspja.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_5aq3nb2sjqylh4dgmbp6wakype
-% Encoding created by otftotfm on Sun Jan 13 15:36:32 2019
+%%AutoEnc_vwspjaw5an66qamjzq6n3zybhe
+% Encoding created by otftotfm on Mon May  4 13:30:05 2020
 % Command line follows encoding
-/AutoEnc_5aq3nb2sjqylh4dgmbp6wakype [
+/AutoEnc_vwspjaw5an66qamjzq6n3zybhe [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
 %10
   /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /afii61664
-  /perthousandzero /dotlessi /uni0237 /S.sc /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
@@ -33,7 +33,7 @@
   /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
 %90
   /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /Dcroat.sc /section
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /S.sc /Idotaccent /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 /ohungarumlaut /Racute.sc
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Regular.otf
-% Erewhon-Regular-tlf-sc-t1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Regular.otf Erewhon-Regular-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_n7r4zn.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wapm72.enc
index 106c9b96677..b3974820270 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_n7r4zn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wapm72.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_n7r4znnc5f6q7n7chyhgonvbda
-% Encoding created by otftotfm on Sun Jan 13 15:37:00 2019
+%%AutoEnc_wapm722w76gldj56rdzrbyeiqf
+% Encoding created by otftotfm on Mon May  4 13:30:33 2020
 % Command line follows encoding
-/AutoEnc_n7r4znnc5f6q7n7chyhgonvbda [
+/AutoEnc_wapm722w76gldj56rdzrbyeiqf [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
 %10
-  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /fi
-  /perthousandzero /dotlessi /uni0237 /ffi /ff /fl /ffl /T_h
+  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
-% --feature=kern --feature=liga --feature=onum --feature=tnum
-% Erewhon-Bold.otf Erewhon-Bold-tosf-t2b'
+% --feature=kern --feature=liga --feature=onum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-tosf-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_l7a6jh.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wjwjxt.enc
index 0bda1c21c98..26b2b0e50fc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_l7a6jh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wjwjxt.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_l7a6jhvcspxjefv4nraohkktya
-% Encoding created by otftotfm on Sun Jan 13 15:37:29 2019
+%%AutoEnc_wjwjxtguevnfdb3dvtly6wsszg
+% Encoding created by otftotfm on Mon May  4 13:30:58 2020
 % Command line follows encoding
-/AutoEnc_l7a6jhvcspxjefv4nraohkktya [
+/AutoEnc_wjwjxtguevnfdb3dvtly6wsszg [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
@@ -54,13 +54,13 @@
   /afii10042.sc /afii10043.sc /afii10044.sc /afii10045.sc /afii10046.sc /afii10047.sc /afii10048.sc /afii10049.sc
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Regular.otf
-% Erewhon-Regular-lf-sc-t2c'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Regular.otf Erewhon-Regular-lf-sc-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_t5o7pg.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wrgbks.enc
index a5d1ab3b178..1b55ed70a65 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_t5o7pg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wrgbks.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_t5o7pg4pfildppiysaoy3x746f
-% Encoding created by otftotfm on Sun Jan 13 15:35:57 2019
+%%AutoEnc_wrgbkswccz6m4mr7voizaxhylg
+% Encoding created by otftotfm on Mon May  4 13:29:45 2020
 % Command line follows encoding
-/AutoEnc_t5o7pg4pfildppiysaoy3x746f [
+/AutoEnc_wrgbkswccz6m4mr7voizaxhylg [
 %00
-  /fi /Euro /ffi /ff /fraction /dotaccent /hungarumlaut /ogonek
-  /fl /ffl /afii61664 /f_b /f_h /f_j /f_k /T_h
+  /f_b /Euro /f_h /f_j /fraction /dotaccent /hungarumlaut /ogonek
+  /f_k /T_h /afii61664 /ff /fi /fl /ffi /ffl
 %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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=tnum Erewhon-Bold.otf
-% Erewhon-Bold-tosf-ly1'
+% --feature=liga --feature=onum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Erewhon-Bold.otf Erewhon-Bold-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_r3uc5w.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wyd53g.enc
index bf9411d85f9..f26f04c7eb9 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_r3uc5w.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wyd53g.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_r3uc5w7zbbqgqc3wqsitfmq2ub
-% Encoding created by otftotfm on Sun Jan 13 15:35:58 2019
+%%AutoEnc_wyd53grb7xa4a5j6nmccqesozh
+% Encoding created by otftotfm on Mon May  4 13:29:45 2020
 % Command line follows encoding
-/AutoEnc_r3uc5w7zbbqgqc3wqsitfmq2ub [
+/AutoEnc_wyd53grb7xa4a5j6nmccqesozh [
 %00
   /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %10
   /I.sc /J.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /AE.sc /OE.sc /Oslash.sc /AE /OE /Oslash
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf
+% --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall Erewhon-Bold.otf
 % Erewhon-Bold-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lx3hec.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wznnjs.enc
index 5cb201ed00c..73bc7c529a8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_lx3hec.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_wznnjs.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_lx3heceevqoorgfpc2n436v4ub
-% Encoding created by otftotfm on Sun Jan 13 15:36:28 2019
+%%AutoEnc_wznnjsmzev744tmsm4e5jwp6ah
+% Encoding created by otftotfm on Mon May  4 13:30:10 2020
 % Command line follows encoding
-/AutoEnc_lx3heceevqoorgfpc2n436v4ub [
+/AutoEnc_wznnjsmzev744tmsm4e5jwp6ah [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
 %10
   /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /afii61664
-  /perthousandzero /dotlessi /uni0237 /S.sc /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /FI.sc /FL.sc /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft.sc /parenright.sc /asterisk /plus /comma /hyphen.sc /period /slash
@@ -33,7 +33,7 @@
   /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
 %90
   /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /Dcroat.sc /section
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /S.sc /Idotaccent /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 /ohungarumlaut /Racute.sc
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Regular.otf
-% Erewhon-Regular-tosf-sc-t1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Regular.otf Erewhon-Regular-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2yn6hi.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xarqe6.enc
index 759c8c227b2..838b72fde43 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2yn6hi.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xarqe6.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_2yn6hiv467qmdlkaie4fhzyimf
-% Encoding created by otftotfm on Sun Jan 13 15:36:38 2019
+%%AutoEnc_xarqe6i5ddfkq3fwr2df3fpisg
+% Encoding created by otftotfm on Mon May  4 13:30:12 2020
 % Command line follows encoding
-/AutoEnc_2yn6hiv467qmdlkaie4fhzyimf [
+/AutoEnc_xarqe6i5ddfkq3fwr2df3fpisg [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
 %10
   /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /afii61664
-  /perthousandzero /I.sc /J.sc /S.sc /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -33,7 +33,7 @@
   /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
 %90
   /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /Dcroat.sc /section
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /S.sc /Idotaccent /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 /ohungarumlaut /Racute.sc
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=onum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-RegularSlanted.otf
-% Erewhon-RegularSlanted-osf-sc-t1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-RegularSlanted.otf Erewhon-RegularSlanted-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2tgaob.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xbmmsr.enc
index 4d85ea3d261..f9f6db6af5d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_2tgaob.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xbmmsr.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_2tgaobsrmnsezpg36cmfaseq3b
-% Encoding created by otftotfm on Sun Jan 13 15:36:42 2019
+%%AutoEnc_xbmmsrlfkg7t4pxev73nnk2gvc
+% Encoding created by otftotfm on Mon May  4 13:30:17 2020
 % Command line follows encoding
-/AutoEnc_2tgaobsrmnsezpg36cmfaseq3b [
+/AutoEnc_xbmmsrlfkg7t4pxev73nnk2gvc [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.superior /hyphen /period.superior /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=sups --ligkern=* {KL} *
-% Erewhon-Bold.otf Erewhon-Bold-sup-t2a'
+% --feature=kern --feature=liga --feature=sups --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-sup-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_h3ilkd.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xdsmvt.enc
index 57cb7d465a5..345cf72ea0a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_h3ilkd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xdsmvt.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_h3ilkd7pugkw2owio7mr64wcxb
-% Encoding created by otftotfm on Sun Jan 13 15:36:41 2019
+%%AutoEnc_xdsmvtptl77l3aeuq3zclxjv3b
+% Encoding created by otftotfm on Mon May  4 13:30:17 2020
 % Command line follows encoding
-/AutoEnc_h3ilkd7pugkw2owio7mr64wcxb [
+/AutoEnc_xdsmvtptl77l3aeuq3zclxjv3b [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.denominator /hyphen /period.denominator /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=dnom --feature=kern --feature=liga --ligkern=* {KL} *
-% Erewhon-Bold.otf Erewhon-Bold-dnom-t2a'
+% --feature=dnom --feature=kern --feature=liga --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-dnom-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_75hzbe.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xfwnyy.enc
index cd5a0814999..e7d6ccf2848 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_75hzbe.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xfwnyy.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_75hzbeiisgxg2vprfasre3ysdb
-% Encoding created by otftotfm on Sun Jan 13 15:37:17 2019
+%%AutoEnc_xfwnyyjqlirj2esp5o5kskzl5d
+% Encoding created by otftotfm on Mon May  4 13:30:49 2020
 % Command line follows encoding
-/AutoEnc_75hzbeiisgxg2vprfasre3ysdb [
+/AutoEnc_xfwnyyjqlirj2esp5o5kskzl5d [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.superior /hyphen /period.superior /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2c
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C
-% --feature=kern --feature=liga --feature=sups --ligkern=* {KL} *
-% Erewhon-Bold.otf Erewhon-Bold-sup-t2c'
+% --feature=kern --feature=liga --feature=sups --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-sup-t2c'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3nkqlm.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xlud6l.enc
index a0dd1fe3036..e00c60d4ee7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_3nkqlm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xlud6l.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_3nkqlmaiirxnj6gwx7fjhoayke
-% Encoding created by otftotfm on Sun Jan 13 15:35:59 2019
+%%AutoEnc_xlud6l36grnnehisddby2u7hue
+% Encoding created by otftotfm on Mon May  4 13:29:42 2020
 % Command line follows encoding
-/AutoEnc_3nkqlmaiirxnj6gwx7fjhoayke [
+/AutoEnc_xlud6l36grnnehisddby2u7hue [
 %00
-  /fi /Euro /ffi /ff /fraction /dotaccent /hungarumlaut /ogonek
-  /fl /ffl /afii61664 /f_b /f_h /f_j /f_k /T_h
+  /f_b /Euro /f_h /f_j /fraction /dotaccent /hungarumlaut /ogonek
+  /f_k /T_h /afii61664 /ff /fi /fl /ffi /ffl
 %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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=pnum Erewhon-Bold.otf
-% Erewhon-Bold-lf-ly1'
+% --feature=liga --feature=lnum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl Erewhon-Bold.otf Erewhon-Bold-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ecgehq.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xwkviq.enc
index a2a2232b954..93c2b2dd027 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_ecgehq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_xwkviq.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_ecgehqbu6ytmpjiyoakpzcqq2d
-% Encoding created by otftotfm on Sun Jan 13 15:36:32 2019
+%%AutoEnc_xwkviq3nqzsjwrqqg7j7n462ig
+% Encoding created by otftotfm on Mon May  4 13:30:05 2020
 % Command line follows encoding
-/AutoEnc_ecgehqbu6ytmpjiyoakpzcqq2d [
+/AutoEnc_xwkviq3nqzsjwrqqg7j7n462ig [
 %00
   /S.sc /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /FI.sc /FL.sc /ffi /ffl
 %10
   /dotlessi /uni0237 /grave.sc /acute.sc /caron.sc /breve.sc /macron.sc /ring
   /cedilla /.notdef /AE.sc /oe.sc /Oslash.sc /AE /OE /Oslash
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Regular.otf
-% Erewhon-Regular-tlf-sc-ly1'
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Regular.otf Erewhon-Regular-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7xxsa3.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_y46t2n.enc
index 4e11d819783..f8e9f5c6fb0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_7xxsa3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_y46t2n.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_7xxsa3al42d3onvivrhepproba
-% Encoding created by otftotfm on Sun Jan 13 15:35:57 2019
+%%AutoEnc_y46t2njdm3uvtk5ns42dvxrgag
+% Encoding created by otftotfm on Mon May  4 13:29:44 2020
 % Command line follows encoding
-/AutoEnc_7xxsa3al42d3onvivrhepproba [
+/AutoEnc_y46t2njdm3uvtk5ns42dvxrgag [
 %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 /afii61664
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.denominator /hyphen /period.denominator /slash
@@ -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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
-% --feature=dnom --feature=kern --feature=liga --ligkern=* {KL} *
-% Erewhon-Bold.otf Erewhon-Bold-dnom-t1'
+% --feature=dnom --feature=kern --feature=liga --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-dnom-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_viikjf.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_yicjml.enc
index 1a29ca00652..05644f8c648 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_viikjf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_yicjml.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_viikjfcq5pm73abnx6hfkh7kih
-% Encoding created by otftotfm on Sun Jan 13 15:36:22 2019
+%%AutoEnc_yicjmlovwuvujqgkmjw77kadeg
+% Encoding created by otftotfm on Mon May  4 13:30:02 2020
 % Command line follows encoding
-/AutoEnc_viikjfcq5pm73abnx6hfkh7kih [
+/AutoEnc_yicjmlovwuvujqgkmjw77kadeg [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
 %10
   /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /afii61664
-  /perthousandzero /I.sc /J.sc /S.sc /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -33,7 +33,7 @@
   /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
 %90
   /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /dcroat /section
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /S.sc /Idotaccent /dcroat /section
 %A0
   /Abreve.sc /aogonek /cacute /Ccaron.sc /Dcaron.sc /Ecaron.sc /eogonek /gbreve
   /Lacute.sc /Lcaron.sc /lslash /Nacute.sc /Ncaron.sc /eng /ohungarumlaut /Racute.sc
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-Italic.otf
-% Erewhon-Italic-lf-sc-t1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-Italic.otf Erewhon-Italic-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fqlf3s.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_yllr7z.enc
index 7af7326f2f5..2c27dceefa8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_fqlf3s.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_yllr7z.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_fqlf3sn2uge7xkjecfsghu6jje
-% Encoding created by otftotfm on Sun Jan 13 15:36:02 2019
+%%AutoEnc_yllr7zdoqzyeim2u24cw2cv7qf
+% Encoding created by otftotfm on Mon May  4 13:29:40 2020
 % Command line follows encoding
-/AutoEnc_fqlf3sn2uge7xkjecfsghu6jje [
+/AutoEnc_yllr7zdoqzyeim2u24cw2cv7qf [
 %00
   /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %10
   /I.sc /J.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /AE.sc /OE.sc /Oslash.sc /AE /OE /Oslash
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-Bold.otf
+% --feature=liga --feature=lnum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall Erewhon-Bold.otf
 % Erewhon-Bold-tlf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mtgz5m.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_z3cf52.enc
index 62372c9d629..fce2bae36e5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_mtgz5m.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_z3cf52.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_mtgz5mpqbymzrcwii65r7n2nyd
-% Encoding created by otftotfm on Sun Jan 13 15:37:01 2019
+%%AutoEnc_z3cf52npu6vvz7i4zqa2o77zad
+% Encoding created by otftotfm on Mon May  4 13:30:34 2020
 % Command line follows encoding
-/AutoEnc_mtgz5mpqbymzrcwii65r7n2nyd [
+/AutoEnc_z3cf52npu6vvz7i4zqa2o77zad [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
 %10
-  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /fi
-  /perthousandzero /dotlessi /uni0237 /ffi /ff /fl /ffl /T_h
+  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
-% --feature=kern --feature=liga --feature=lnum --feature=tnum
-% Erewhon-Bold.otf Erewhon-Bold-tlf-t2b'
+% --feature=kern --feature=liga --feature=lnum --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-tlf-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_bo7t4a.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zdof4l.enc
index 4a54269c9e0..4916b869aeb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_bo7t4a.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zdof4l.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_bo7t4atj2spzj3tgf2gvxqz2xd
-% Encoding created by otftotfm on Sun Jan 13 15:36:39 2019
+%%AutoEnc_zdof4luj5lc5ukaa5udq2km3dc
+% Encoding created by otftotfm on Mon May  4 13:30:11 2020
 % Command line follows encoding
-/AutoEnc_bo7t4atj2spzj3tgf2gvxqz2xd [
+/AutoEnc_zdof4luj5lc5ukaa5udq2km3dc [
 %00
   /grave.sc /acute.sc /circumflex.sc /tilde /dieresis /hungarumlaut /ring /caron.sc
   /breve.sc /macron.sc /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
 %10
   /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /afii61664
-  /perthousandzero /I.sc /J.sc /S.sc /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /I.sc /J.sc /ff /fi /fl /ffi /ffl
 %20
   /space /exclam.sc /quotedbl /numbersign.sc /dollar.sc /percent.sc /ampersand.sc /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen.sc /period /slash
@@ -33,7 +33,7 @@
   /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute
 %90
   /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring
-  /Ydieresis /Zacute /Zcaron /Zdotaccent /.notdef /Idotaccent /Dcroat.sc /section
+  /Ydieresis /Zacute /Zcaron /Zdotaccent /S.sc /Idotaccent /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 /ohungarumlaut /Racute.sc
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN
 % --feature=kern --feature=liga --feature=lnum --feature=smcp --feature=tnum
-% --unicoding=germandbls =: SSsmall Erewhon-RegularSlanted.otf
-% Erewhon-RegularSlanted-tlf-sc-t1'
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-RegularSlanted.otf Erewhon-RegularSlanted-tlf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_w7c3xw.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zhuxl5.enc
index 79a15672669..b9f68957496 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_w7c3xw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zhuxl5.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_w7c3xwdrmqdvzxv5dx47fwfdcb
-% Encoding created by otftotfm on Sun Jan 13 15:36:42 2019
+%%AutoEnc_zhuxl5pbjfxufpyyt7xbeea5cc
+% Encoding created by otftotfm on Mon May  4 13:30:18 2020
 % Command line follows encoding
-/AutoEnc_w7c3xwdrmqdvzxv5dx47fwfdcb [
+/AutoEnc_zhuxl5pbjfxufpyyt7xbeea5cc [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
-  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_b /f_h
+  /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_h /f_j
 %10
-  /quotedblleft /quotedblright /f_j /f_k /cyrbreve /endash /emdash /fi
-  /perthousandzero /dotlessi /uni0237 /ffi /ff /fl /ffl /T_h
+  /quotedblleft /quotedblright /f_k /T_h /cyrbreve /endash /emdash /f_b
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2a
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A
-% --feature=kern --feature=liga --feature=lnum --feature=pnum
-% Erewhon-Bold.otf Erewhon-Bold-lf-t2a'
+% --feature=kern --feature=liga --feature=lnum --feature=pnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl Erewhon-Bold.otf Erewhon-Bold-lf-t2a'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kvikxc.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zk3pqy.enc
index ce3b22cd3ef..357d0c618f8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_kvikxc.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zk3pqy.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_kvikxc6rdlfz3mevkzkawxwiia
-% Encoding created by otftotfm on Sun Jan 13 15:36:59 2019
+%%AutoEnc_zk3pqy5fmfklmn4pk4jbbo3crc
+% Encoding created by otftotfm on Mon May  4 13:30:33 2020
 % Command line follows encoding
-/AutoEnc_kvikxc6rdlfz3mevkzkawxwiia [
+/AutoEnc_zk3pqy5fmfklmn4pk4jbbo3crc [
 %00
   /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
   /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef
 %10
   /quotedblleft /quotedblright /.notdef /.notdef /cyrbreve /endash /emdash /.notdef
-  /perthousandzero /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /perthousandzero /dotlessi /uni0237 /ff /fi /fl /ffi /ffl
 %20
   /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
   /parenleft /parenright /asterisk /plus /comma.superior /hyphen /period.superior /slash
@@ -54,12 +54,12 @@
   /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097
 ] def
 % Command line: 'otftotfm --automatic --encoding=fontools_t2b
-% --tfm-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B
-% --feature=kern --feature=liga --feature=sups --ligkern=* {KL} *
-% Erewhon-Bold.otf Erewhon-Bold-sup-t2b'
+% --feature=kern --feature=liga --feature=sups --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * Erewhon-Bold.otf Erewhon-Bold-sup-t2b'
diff --git a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_pj2kv6.enc b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zt7jvb.enc
index 4732de5ba28..812875b9cc5 100644
--- a/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_pj2kv6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/erewhon/zut1_zt7jvb.enc
@@ -1,12 +1,12 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_pj2kv6lbw2ld26yjxg3rz3woud
-% Encoding created by otftotfm on Sun Jan 13 15:36:06 2019
+%%AutoEnc_zt7jvbvq5xhs6jht5eh44awopb
+% Encoding created by otftotfm on Mon May  4 13:29:49 2020
 % Command line follows encoding
-/AutoEnc_pj2kv6lbw2ld26yjxg3rz3woud [
+/AutoEnc_zt7jvbvq5xhs6jht5eh44awopb [
 %00
   /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
-  /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef
+  /.notdef /.notdef /afii61664 /ff /fi /fl /ffi /ffl
 %10
   /I.sc /J.sc /grave /acute /caron /breve /macron /ring
   /cedilla /.notdef /AE.sc /OE.sc /Oslash.sc /AE /OE /Oslash
@@ -54,13 +54,13 @@
   /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/2018/texmf-config/fonts/tfm/public/erewhon
-% --vf-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/vf/public/erewhon
-% --type1-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/type1/public/erewhon
-% --truetype-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/truetype/public/erewhon
-% --encoding-directory=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/enc/dvips/erewhon
-% --map-file=/Users/msharpe/Library/texlive/2018/texmf-config/fonts/map/dvips/erewhon/erewhon.map
+% --tfm-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/tfm/public/erewhon
+% --vf-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/vf/public/erewhon
+% --type1-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/type1/public/erewhon
+% --encoding-directory=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/enc/dvips/erewhon
+% --map-file=/Users/msharpe/Library/texlive/2020/texmf-config/fonts/map/dvips/erewhon/erewhon.map
 % --no-updmap --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
-% --feature=liga --feature=lnum --feature=pnum --feature=smcp
-% --unicoding=germandbls =: SSsmall Erewhon-BoldItalic.otf
-% Erewhon-BoldItalic-lf-sc-ly1'
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall
+% Erewhon-BoldItalic.otf Erewhon-BoldItalic-lf-sc-ly1'